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

remove separate event filter, directly filter with plugin

This commit is contained in:
iyaz 2013-08-22 15:58:57 +03:00
parent 5c2ef6d32e
commit 44a225e0e2
1 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Polyhedron/demo/Polyhedron/Polyhedron_demo_hole_filling_plugin.cpp
View File

@ -36,22 +36,6 @@
#include <boost/function_output_iterator.hpp> #include <boost/function_output_iterator.hpp>
// To get close event from dock widget (close event in this case means pressing x button)
class Dock_widget_event_filter : public QObject
{
Q_OBJECT
public:
signals:
void dock_widget_closed();
protected:
bool eventFilter(QObject *, QEvent *event) {
if(event->type() == QEvent::Close) {
emit dock_widget_closed();
}
return false;
}
};
// Class for visualizing holes in a polyhedron // Class for visualizing holes in a polyhedron
// provides mouse selection functionality // provides mouse selection functionality
class Q_DECL_EXPORT Scene_polylines_collection : public Scene_item class Q_DECL_EXPORT Scene_polylines_collection : public Scene_item
@ -330,7 +314,13 @@ public slots:
void item_about_to_be_destroyed(Scene_item*); void item_about_to_be_destroyed(Scene_item*);
void item_changed_polylines_collection(); void item_changed_polylines_collection();
void dock_widget_closed(); void dock_widget_closed();
protected:
bool eventFilter(QObject *, QEvent *event) {
if(event->type() == QEvent::Close) {
dock_widget_closed();
}
return false;
}
private: private:
struct Nop_functor { struct Nop_functor {
template<class T> template<class T>
@ -345,7 +335,6 @@ private:
QDockWidget* dock_widget; QDockWidget* dock_widget;
Ui::HoleFilling ui_widget; Ui::HoleFilling ui_widget;
Dock_widget_event_filter filter;
// hold created facet for accept reject functionality // hold created facet for accept reject functionality
std::vector<Polyhedron::Facet_handle> new_facets; std::vector<Polyhedron::Facet_handle> new_facets;
@ -390,7 +379,7 @@ void Polyhedron_demo_hole_filling_plugin::init(QMainWindow* mainWindow,
dock_widget = new QDockWidget("Hole Filling", mw); dock_widget = new QDockWidget("Hole Filling", mw);
dock_widget->setVisible(false); dock_widget->setVisible(false);
dock_widget->installEventFilter(&filter); dock_widget->installEventFilter(this);
ui_widget.setupUi(dock_widget); ui_widget.setupUi(dock_widget);
ui_widget.Accept_button->setVisible(false); ui_widget.Accept_button->setVisible(false);
@ -398,7 +387,6 @@ void Polyhedron_demo_hole_filling_plugin::init(QMainWindow* mainWindow,
mw->addDockWidget(Qt::LeftDockWidgetArea, dock_widget); mw->addDockWidget(Qt::LeftDockWidgetArea, dock_widget);
connect(&filter, SIGNAL(dock_widget_closed()), this, SLOT(dock_widget_closed()));
connect(ui_widget.Visualize_holes_button, SIGNAL(clicked()), this, SLOT(on_Visualize_holes_button())); connect(ui_widget.Visualize_holes_button, SIGNAL(clicked()), this, SLOT(on_Visualize_holes_button()));
connect(ui_widget.Fill_selected_holes_button, SIGNAL(clicked()), this, SLOT(on_Fill_selected_holes_button())); connect(ui_widget.Fill_selected_holes_button, SIGNAL(clicked()), this, SLOT(on_Fill_selected_holes_button()));
connect(ui_widget.Fill_all_holes_button, SIGNAL(clicked()), this, SLOT(on_Fill_all_holes_button())); connect(ui_widget.Fill_all_holes_button, SIGNAL(clicked()), this, SLOT(on_Fill_all_holes_button()));