songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'CGAL-Qt5_support-GF'

This commit is contained in:
Laurent Rineau 2015-07-31 14:30:18 +02:00
parent 70c08ae2bf bc21fe6ad7
commit 56cecfaec2
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Mesh_3/demo/Mesh_3/MainWindow.h
View File

@ -33,8 +33,6 @@ public:
MainWindow(QWidget* parent = 0);
~MainWindow();
Viewer* getViewer() { return viewer; }
public Q_SLOTS:
void updateViewerBBox();
void open(QString filename);

8
Mesh_3/demo/Mesh_3/Volume_planes_plugin.cpp
View File

@ -13,7 +13,6 @@
#include <CGAL_demo/Scene_interface.h>
#include <CGAL_demo/Scene_item.h>
#include <CGAL_demo/Viewer.h>
#include "MainWindow.h"
#include <QAction>
#include <QMenu>
@ -173,11 +172,8 @@ public:
connect(planeSwitch, SIGNAL(triggered()), this, SLOT(selectPlanes()));
// evil
MainWindow* mwTmp;
if( !(mwTmp = dynamic_cast<MainWindow*>(mw)) ) {
std::cerr << "Volume_planes_plugin cannot init mousegrabber" << std::endl;
}
Viewer* v = mwTmp->getViewer();
Viewer* v = mw->findChild<Viewer*>("viewer");
CGAL_assertion(v != 0);
pxr_.setViewer(v);
connect(v, SIGNAL(pointSelected(QPoint)), &pxr_, SLOT(update(QPoint)));

1
Polyhedron/demo/Polyhedron/Scene_edit_polyhedron_item.cpp
View File

@ -109,6 +109,7 @@ Scene_edit_polyhedron_item::Scene_edit_polyhedron_item
Scene_edit_polyhedron_item::~Scene_edit_polyhedron_item()
{
setVisible(false);
while(is_there_any_ctrl_vertices_group())
{
delete_ctrl_vertices_group(false);