From 473c92c00cdbe1ec0ff8a86537ae81811cf28caa Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Tue, 10 May 2016 17:10:59 +0200 Subject: [PATCH] Remove the init() function without Messages_interface from the plugins API --- .../demo/Polyhedron/Plugins/AABB_tree/Cut_plugin.cpp | 3 --- .../Plugins/Camera_position/Camera_positions_plugin.cpp | 4 ++-- .../Plugins/Convex_decomposition/Nef_plugin.cpp | 3 ++- .../Plugins/Convex_hull/Convex_hull_plugin.cpp | 3 ++- .../Polyhedron/Plugins/Convex_hull/Kernel_plugin.cpp | 2 +- .../Plugins/IO/Implicit_function_io_plugin.cpp | 4 ++-- .../demo/Polyhedron/Plugins/IO/Polylines_io_plugin.cpp | 3 ++- Polyhedron/demo/Polyhedron/Plugins/IO/XYZ_io_plugin.cpp | 3 ++- .../demo/Polyhedron/Plugins/Mesh_2/Mesh_2_plugin.cpp | 3 ++- .../demo/Polyhedron/Plugins/Mesh_3/C3t3_io_plugin.cpp | 2 +- .../Plugins/Mesh_3/Detect_sharp_edges_plugin.cpp | 2 +- .../Plugins/Mesh_3/Io_implicit_function_plugin.cpp | 4 ++-- .../demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin.cpp | 3 --- .../Polyhedron/Plugins/Mesh_3/Optimization_plugin.cpp | 2 -- .../Polyhedron/Plugins/Mesh_3/Volume_planes_plugin.cpp | 2 +- .../Operations_on_polyhedra/Clip_polyhedron_plugin.cpp | 3 --- .../Operations_on_polyhedra/Corefinement_plugin.cpp | 2 +- .../Operations_on_polyhedra/Intersection_plugin.cpp | 2 +- .../Point_set_from_vertices_plugin.cpp | 5 +++-- .../Polyhedron/Plugins/PCA/Create_bbox_mesh_plugin.cpp | 4 ++-- Polyhedron/demo/Polyhedron/Plugins/PCA/Pca_plugin.cpp | 3 ++- .../Plugins/PCA/Transform_polyhedron_plugin.cpp | 2 +- .../demo/Polyhedron/Plugins/PCA/Trivial_plugin.cpp | 4 ++-- .../demo/Polyhedron/Plugins/PMP/Fairing_plugin.cpp | 1 - .../demo/Polyhedron/Plugins/PMP/Hole_filling_plugin.cpp | 1 - .../Plugins/PMP/Hole_filling_polyline_plugin.cpp | 3 --- .../demo/Polyhedron/Plugins/PMP/Inside_out_plugin.cpp | 3 ++- .../Plugins/PMP/Isotropic_remeshing_plugin.cpp | 2 +- .../demo/Polyhedron/Plugins/PMP/Jet_fitting_plugin.cpp | 3 ++- .../Plugins/PMP/Join_and_split_polyhedra_plugin.cpp | 1 - .../Plugins/PMP/Mean_curvature_flow_skeleton_plugin.cpp | 2 +- .../demo/Polyhedron/Plugins/PMP/Orient_soup_plugin.cpp | 2 -- .../Plugins/PMP/Point_inside_polyhedron_plugin.cpp | 1 - .../Polyhedron/Plugins/PMP/Polyhedron_slicer_plugin.cpp | 1 - .../Plugins/PMP/Polyhedron_stitching_plugin.cpp | 1 - .../Polyhedron/Plugins/PMP/Repair_polyhedron_plugin.cpp | 1 - .../demo/Polyhedron/Plugins/PMP/Selection_plugin.cpp | 1 - .../Polyhedron/Plugins/PMP/Self_intersection_plugin.cpp | 3 ++- .../Polyhedron/Plugins/PMP/Triangulate_facets_plugin.cpp | 2 -- .../Plugins/Point_set/Features_detection_plugin.cpp | 2 +- .../Plugins/Point_set/Merge_point_sets_plugin.cpp | 2 +- .../Point_set/Point_set_average_spacing_plugin.cpp | 2 +- .../Point_set/Point_set_bilateral_smoothing_plugin.cpp | 2 +- .../Point_set/Point_set_normal_estimation_plugin.cpp | 2 +- .../Point_set/Point_set_outliers_removal_plugin.cpp | 2 +- .../Plugins/Point_set/Point_set_selection_plugin.cpp | 1 - .../Point_set/Point_set_shape_detection_plugin.cpp | 2 +- .../Point_set/Point_set_simplification_plugin.cpp | 2 +- .../Plugins/Point_set/Point_set_smoothing_plugin.cpp | 2 +- .../Plugins/Point_set/Point_set_upsampling_plugin.cpp | 2 +- .../Plugins/Point_set/Point_set_wlop_plugin.cpp | 2 +- .../Plugins/Point_set/Surface_reconstruction_plugin.cpp | 2 +- .../Subdivision_methods/Subdivision_methods_plugin.cpp | 3 ++- .../Plugins/Surface_mesh/Mesh_segmentation_plugin.cpp | 2 +- .../Plugins/Surface_mesh/Mesh_simplification_plugin.cpp | 3 ++- .../Plugins/Surface_mesh/Parameterization_plugin.cpp | 3 ++- .../Polyhedron/Plugins/Surface_mesh/Remeshing_plugin.cpp | 2 +- .../Plugins/Surface_mesh/Shortest_path_plugin.cpp | 2 -- .../Surface_mesh_deformation/Edit_polyhedron_plugin.cpp | 4 ++-- .../CGAL/Three/Polyhedron_demo_plugin_interface.h | 9 +-------- 60 files changed, 63 insertions(+), 86 deletions(-) diff --git a/Polyhedron/demo/Polyhedron/Plugins/AABB_tree/Cut_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/AABB_tree/Cut_plugin.cpp index 4a27e41b416..e59be0613a3 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/AABB_tree/Cut_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/AABB_tree/Cut_plugin.cpp @@ -332,9 +332,6 @@ public: return (out && edges_item->save(out)); } - - - void init(QMainWindow*, CGAL::Three::Scene_interface*){} void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface* m); QList actions() const; diff --git a/Polyhedron/demo/Polyhedron/Plugins/Camera_position/Camera_positions_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Camera_position/Camera_positions_plugin.cpp index 0fb9dcdf1ba..2160f7155c8 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Camera_position/Camera_positions_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Camera_position/Camera_positions_plugin.cpp @@ -19,7 +19,7 @@ class Polyhedron_demo_camera_positions_plugin : Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.IOPluginInterface/1.0") public: - void init(QMainWindow* mainWindow, Scene_interface* scene_interface); + void init(QMainWindow* mainWindow, Scene_interface* scene_interface, Messages_interface* ); QList actions() const; QString name() const { return "camera_positions_plugin"; } @@ -34,7 +34,7 @@ private: Camera_positions_list* cpl; }; -void Polyhedron_demo_camera_positions_plugin::init(QMainWindow* mainWindow, Scene_interface*) +void Polyhedron_demo_camera_positions_plugin::init(QMainWindow* mainWindow, Scene_interface*, Messages_interface *) { cpl = new Camera_positions_list(mainWindow); diff --git a/Polyhedron/demo/Polyhedron/Plugins/Convex_decomposition/Nef_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Convex_decomposition/Nef_plugin.cpp index efc3ba5df20..8f4d3394626 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Convex_decomposition/Nef_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Convex_decomposition/Nef_plugin.cpp @@ -22,7 +22,8 @@ class Polyhedron_demo_nef_plugin : public: void init(QMainWindow* mw, - Scene_interface* scene_interface) + Scene_interface* scene_interface, + Messages_interface* ) { scene = scene_interface; this->mw = mw; diff --git a/Polyhedron/demo/Polyhedron/Plugins/Convex_hull/Convex_hull_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Convex_hull/Convex_hull_plugin.cpp index a4384c10417..54a2f58dc38 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Convex_hull/Convex_hull_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Convex_hull/Convex_hull_plugin.cpp @@ -24,7 +24,8 @@ class Polyhedron_demo_convex_hull_plugin : Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") public: void init(QMainWindow*mw, - Scene_interface* scene_interface) + Scene_interface* scene_interface, + Messages_interface*) { scene = scene_interface; QAction *actionConvexHull = new QAction("Convex Hull", mw); diff --git a/Polyhedron/demo/Polyhedron/Plugins/Convex_hull/Kernel_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Convex_hull/Kernel_plugin.cpp index 8be9ac1715c..afd07ddfadc 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Convex_hull/Kernel_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Convex_hull/Kernel_plugin.cpp @@ -40,7 +40,7 @@ public: return qobject_cast(scene->item(scene->mainSelectionIndex())); } - void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface) + void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface*) { scene = scene_interface; mw = mainWindow; diff --git a/Polyhedron/demo/Polyhedron/Plugins/IO/Implicit_function_io_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/IO/Implicit_function_io_plugin.cpp index 26fedb2f03a..c349f218d53 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/IO/Implicit_function_io_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/IO/Implicit_function_io_plugin.cpp @@ -65,7 +65,7 @@ public: typedef Polyhedron_demo_plugin_helper Plugin_helper; using Plugin_helper::init; - virtual void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface); + virtual void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface*); QList actions() const { @@ -93,7 +93,7 @@ Io_implicit_function_plugin() void Io_implicit_function_plugin:: -init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface) +init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface *) { this->scene = scene_interface; this->mw = mainWindow; diff --git a/Polyhedron/demo/Polyhedron/Plugins/IO/Polylines_io_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/IO/Polylines_io_plugin.cpp index 034d07f55ec..6c20bfd0b7f 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/IO/Polylines_io_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/IO/Polylines_io_plugin.cpp @@ -31,7 +31,8 @@ public: //! Adds an action to the menu and configures the widget void init(QMainWindow* mainWindow, - CGAL::Three::Scene_interface* scene_interface) { + CGAL::Three::Scene_interface* scene_interface, + Messages_interface*) { //get the references this->scene = scene_interface; this->mw = mainWindow; diff --git a/Polyhedron/demo/Polyhedron/Plugins/IO/XYZ_io_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/IO/XYZ_io_plugin.cpp index 7a7efe064e9..973e1b2c890 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/IO/XYZ_io_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/IO/XYZ_io_plugin.cpp @@ -28,7 +28,8 @@ public: //! Adds an action to the menu and configures the widget void init(QMainWindow* mainWindow, - CGAL::Three::Scene_interface* scene_interface) { + CGAL::Three::Scene_interface* scene_interface, + Messages_interface*) { //get the references this->scene = scene_interface; this->mw = mainWindow; diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_2/Mesh_2_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Mesh_2/Mesh_2_plugin.cpp index e7ecf3b5ebb..0cfc7e9e437 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Mesh_2/Mesh_2_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Mesh_2/Mesh_2_plugin.cpp @@ -146,7 +146,8 @@ class Polyhedron_demo_mesh_2_plugin : public: void init(QMainWindow* mainWindow, - CGAL::Three::Scene_interface* scene_interface) + CGAL::Three::Scene_interface* scene_interface, + Messages_interface*) { this->scene = scene_interface; this->mw = mainWindow; diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/C3t3_io_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/C3t3_io_plugin.cpp index 2cbadf94c08..488b8e1453c 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/C3t3_io_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/C3t3_io_plugin.cpp @@ -19,7 +19,7 @@ class Polyhedron_demo_c3t3_binary_io_plugin : Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") public: - void init(QMainWindow*, CGAL::Three::Scene_interface* sc ) + void init(QMainWindow*, CGAL::Three::Scene_interface* sc, Messages_interface*) { this->scene = sc; } diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Detect_sharp_edges_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Detect_sharp_edges_plugin.cpp index 75eb62e8735..75f9336769d 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Detect_sharp_edges_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Detect_sharp_edges_plugin.cpp @@ -23,7 +23,7 @@ class Polyhedron_demo_detect_sharp_edges_plugin : Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") public: - void init(QMainWindow* mainWindow, Scene_interface* scene_interface) { + void init(QMainWindow* mainWindow, Scene_interface* scene_interface, Messages_interface*) { this->scene = scene_interface; this->mw = mainWindow; actionSharEdges = new QAction("Detect Sharp Features", mw); diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Io_implicit_function_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Io_implicit_function_plugin.cpp index 3dbbba5faa7..bc7f00de93e 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Io_implicit_function_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Io_implicit_function_plugin.cpp @@ -64,7 +64,7 @@ public: typedef Polyhedron_demo_plugin_helper Plugin_helper; using Plugin_helper::init; - virtual void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface); + virtual void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface*); QList actions() const { @@ -92,7 +92,7 @@ Io_implicit_function_plugin() void Io_implicit_function_plugin:: -init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface) +init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface *) { this->scene = scene_interface; diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin.cpp index e6e98a26299..707131c62f0 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin.cpp @@ -46,9 +46,6 @@ class Mesh_3_plugin : Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") public: - void init(QMainWindow*, - CGAL::Three::Scene_interface*){} - void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface* msg_interface) diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Optimization_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Optimization_plugin.cpp index 169dcc392cf..e2643080333 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Optimization_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Optimization_plugin.cpp @@ -84,8 +84,6 @@ class Mesh_3_optimization_plugin : typedef Polyhedron_demo_plugin_interface Base; public: Mesh_3_optimization_plugin(); - - virtual void init(QMainWindow*, Scene_interface*){} virtual void init(QMainWindow*, Scene_interface*, Messages_interface*); inline virtual QList actions() const; diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Volume_planes_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Volume_planes_plugin.cpp index 126757d6699..c97e2673d45 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Volume_planes_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Volume_planes_plugin.cpp @@ -167,7 +167,7 @@ public: return qobject_cast(scene->item(scene->mainSelectionIndex())); } - void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface) { + void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface*) { this->scene = scene_interface; this->mw = mainWindow; x_control = NULL; diff --git a/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Clip_polyhedron_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Clip_polyhedron_plugin.cpp index 2e9a0876def..281266af727 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Clip_polyhedron_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Clip_polyhedron_plugin.cpp @@ -94,9 +94,6 @@ class Q_DECL_EXPORT Clip_polyhedron_plugin : Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") public : - - void init(QMainWindow*, - CGAL::Three::Scene_interface*) {} // Adds an action to the menu and configures the widget void init(QMainWindow* mw, CGAL::Three::Scene_interface* scene_interface, diff --git a/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Corefinement_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Corefinement_plugin.cpp index d5f3c32f475..085d5f630d3 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Corefinement_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Corefinement_plugin.cpp @@ -37,7 +37,7 @@ public: return QList() << actionPolyhedronCorefinement_3; } - void init(QMainWindow* mw, CGAL::Three::Scene_interface* scene_interface) { + void init(QMainWindow* mw, CGAL::Three::Scene_interface* scene_interface, Messages_interface*) { this->scene = scene_interface; actionPolyhedronCorefinement_3 = new QAction("Polyhedra Corefinement (A/B)", mw); actionPolyhedronCorefinement_3->setProperty("subMenuName", "Operations on Polyhedra"); diff --git a/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Intersection_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Intersection_plugin.cpp index 81b6e4da641..2d8080c8ba6 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Intersection_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Intersection_plugin.cpp @@ -42,7 +42,7 @@ public: return QList() << actionPolyhedronIntersection_3; } - void init(QMainWindow* mw, CGAL::Three::Scene_interface* scene_interface) { + void init(QMainWindow* mw, CGAL::Three::Scene_interface* scene_interface, Messages_interface*) { this->scene = scene_interface; actionPolyhedronIntersection_3 = new QAction("Intersect Polyhedra (A/B)", mw); actionPolyhedronIntersection_3->setProperty("subMenuName", "Operations on Polyhedra"); diff --git a/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Point_set_from_vertices_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Point_set_from_vertices_plugin.cpp index 8ef2aac4281..43deea2a9db 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Point_set_from_vertices_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Operations_on_polyhedra/Point_set_from_vertices_plugin.cpp @@ -23,7 +23,7 @@ class Polyhedron_demo_point_set_from_vertices_plugin : public: void init(QMainWindow* mainWindow, - CGAL::Three::Scene_interface* scene_interface); + CGAL::Three::Scene_interface* scene_interface, Messages_interface*); bool applicable(QAction*) const { const CGAL::Three::Scene_interface::Item_id index = scene->mainSelectionIndex(); @@ -44,7 +44,8 @@ private: }; // end Polyhedron_demo_point_set_from_vertices_plugin void Polyhedron_demo_point_set_from_vertices_plugin::init(QMainWindow* mainWindow, - CGAL::Three::Scene_interface* scene_interface) + CGAL::Three::Scene_interface* scene_interface, + Messages_interface*) { scene = scene_interface; actionPointSetFromPolyhedronVertices = new QAction(tr("&Create Point Set from Vertices"), mainWindow); diff --git a/Polyhedron/demo/Polyhedron/Plugins/PCA/Create_bbox_mesh_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PCA/Create_bbox_mesh_plugin.cpp index d0e2a6350dd..1d8390eb283 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PCA/Create_bbox_mesh_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/PCA/Create_bbox_mesh_plugin.cpp @@ -70,7 +70,7 @@ class Create_bbox_mesh_plugin : Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") public: - void init(QMainWindow* mainWindow, Scene_interface* scene_interface); + void init(QMainWindow* mainWindow, Scene_interface* scene_interface, Messages_interface*); QList actions() const; bool applicable(QAction*) const { if(scene->mainSelectionIndex() != -1) @@ -91,7 +91,7 @@ private: }; // end Create_bbox_mesh_plugin -void Create_bbox_mesh_plugin::init(QMainWindow* mainWindow, Scene_interface* scene_interface) +void Create_bbox_mesh_plugin::init(QMainWindow* mainWindow, Scene_interface* scene_interface, Messages_interface*) { scene = scene_interface; actionBbox = new QAction(tr("Create &Bbox Mesh"), mainWindow); diff --git a/Polyhedron/demo/Polyhedron/Plugins/PCA/Pca_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PCA/Pca_plugin.cpp index 0b37dd5b912..86c62d84f14 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PCA/Pca_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/PCA/Pca_plugin.cpp @@ -40,7 +40,8 @@ public: } void init(QMainWindow* mw, - Scene_interface* scene_interface) + Scene_interface* scene_interface, + Messages_interface*) { scene = scene_interface; QAction *actionFitPlane = new QAction("Fit Plane", mw); diff --git a/Polyhedron/demo/Polyhedron/Plugins/PCA/Transform_polyhedron_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PCA/Transform_polyhedron_plugin.cpp index b2918542524..42713fe9e9a 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PCA/Transform_polyhedron_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/PCA/Transform_polyhedron_plugin.cpp @@ -35,7 +35,7 @@ public: qobject_cast(scene->item(scene->mainSelectionIndex())); } - void init(QMainWindow* mw, CGAL::Three::Scene_interface* scene_interface) { + void init(QMainWindow* mw, CGAL::Three::Scene_interface* scene_interface, Messages_interface*) { this->scene = scene_interface; actionTransformPolyhedron = new QAction("Affine Transformation", mw); if(actionTransformPolyhedron) { diff --git a/Polyhedron/demo/Polyhedron/Plugins/PCA/Trivial_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PCA/Trivial_plugin.cpp index ee8d6f399ca..70311f13ca9 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PCA/Trivial_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/PCA/Trivial_plugin.cpp @@ -145,7 +145,7 @@ class Polyhedron_demo_trivial_plugin : Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") public: - void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface); + void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface*); QList actions() const { return QList() << actionBbox; } @@ -165,7 +165,7 @@ private: }; // end Polyhedron_demo_trivial_plugin -void Polyhedron_demo_trivial_plugin::init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface) +void Polyhedron_demo_trivial_plugin::init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface*) { scene = scene_interface; actionBbox = new QAction(tr("Create Bbox"), mainWindow); diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Fairing_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PMP/Fairing_plugin.cpp index bf108aad90a..83f0e7a7e00 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Fairing_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/PMP/Fairing_plugin.cpp @@ -42,7 +42,6 @@ public: QList actions() const { return QList() << actionFairing; } - void init(QMainWindow*, CGAL::Three::Scene_interface*) {} void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface* m) { mw = mainWindow; scene = scene_interface; diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Hole_filling_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PMP/Hole_filling_plugin.cpp index 212534f811d..30438e7848b 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Hole_filling_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/PMP/Hole_filling_plugin.cpp @@ -304,7 +304,6 @@ public: QList actions() const { return QList() << actionHoleFilling; } - void init(QMainWindow*, CGAL::Three::Scene_interface*){} void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface* m); virtual void closure() diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Hole_filling_polyline_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PMP/Hole_filling_polyline_plugin.cpp index b225b868cf0..0db565935c8 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Hole_filling_polyline_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/PMP/Hole_filling_polyline_plugin.cpp @@ -74,9 +74,6 @@ public: bool applicable(QAction *) const { return qobject_cast(scene->item(scene->mainSelectionIndex())); } void print_message(QString message) { messages->information(message); } QList actions() const { return QList() << actionHoleFillingPolyline; } - void init(QMainWindow*, CGAL::Three::Scene_interface*) - { - } void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface* m){ mw = mainWindow; diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Inside_out_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PMP/Inside_out_plugin.cpp index c574265f543..ef2b83aa50a 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Inside_out_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/PMP/Inside_out_plugin.cpp @@ -24,7 +24,8 @@ public: } void init(QMainWindow* mw, - Scene_interface* scene_interface) + Scene_interface* scene_interface, + Messages_interface*) { scene = scene_interface; QAction* actionInsideOut = new QAction(tr("Inside Out"), mw); diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Isotropic_remeshing_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PMP/Isotropic_remeshing_plugin.cpp index 2a63b2d37b0..b02cbc9cd63 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Isotropic_remeshing_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/PMP/Isotropic_remeshing_plugin.cpp @@ -171,7 +171,7 @@ class Polyhedron_demo_isotropic_remeshing_plugin : typedef Scene_polyhedron_selection_item::Is_constrained_map Edge_constrained_pmap; public: - void init(QMainWindow* mainWindow, Scene_interface* scene_interface) + void init(QMainWindow* mainWindow, Scene_interface* scene_interface, Messages_interface*) { this->scene = scene_interface; this->mw = mainWindow; diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Jet_fitting_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PMP/Jet_fitting_plugin.cpp index 34e27f551ea..4b207b7a6e3 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Jet_fitting_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/PMP/Jet_fitting_plugin.cpp @@ -26,7 +26,8 @@ public: return _actions; } void init(QMainWindow* mw, - Scene_interface* scene_interface) + Scene_interface* scene_interface, + Messages_interface*) { scene = scene_interface; QAction *actionEstimateCurvature = new QAction(tr("Curvature Estimation"), mw); diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Join_and_split_polyhedra_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PMP/Join_and_split_polyhedra_plugin.cpp index f636e5985ae..187ea9a2b30 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Join_and_split_polyhedra_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/PMP/Join_and_split_polyhedra_plugin.cpp @@ -27,7 +27,6 @@ class Polyhedron_demo_join_and_split_polyhedra_plugin: public: QList actions() const { return QList() << actionJoinPolyhedra << actionSplitPolyhedra << actionColorConnectedComponents; } - void init(QMainWindow*, CGAL::Three::Scene_interface*){} void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface* m) { scene = scene_interface; diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Mean_curvature_flow_skeleton_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PMP/Mean_curvature_flow_skeleton_plugin.cpp index 998f87d5c60..89196f832a4 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Mean_curvature_flow_skeleton_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/PMP/Mean_curvature_flow_skeleton_plugin.cpp @@ -103,7 +103,7 @@ class Polyhedron_demo_mean_curvature_flow_skeleton_plugin : public: - void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface) { + void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface*) { this->mw = mainWindow; this->scene = scene_interface; diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Orient_soup_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PMP/Orient_soup_plugin.cpp index 1cf2701a410..89c80bf42fd 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Orient_soup_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/PMP/Orient_soup_plugin.cpp @@ -23,8 +23,6 @@ public: void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface* m); - void init(QMainWindow*, - CGAL::Three::Scene_interface*){} bool applicable(QAction* action) const { Q_FOREACH(CGAL::Three::Scene_interface::Item_id index, scene->selectionIndices()) { if(qobject_cast(scene->item(index))) diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Point_inside_polyhedron_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PMP/Point_inside_polyhedron_plugin.cpp index c0f99068bb8..1e5406e6e3e 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Point_inside_polyhedron_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/PMP/Point_inside_polyhedron_plugin.cpp @@ -56,7 +56,6 @@ public: QList actions() const { return QList() << actionPointInsidePolyhedron; } - void init(QMainWindow*, CGAL::Three::Scene_interface* ){} void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface* m) { mw = mainWindow; diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Polyhedron_slicer_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PMP/Polyhedron_slicer_plugin.cpp index 16c20f2b71f..9d929f0a3e7 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Polyhedron_slicer_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/PMP/Polyhedron_slicer_plugin.cpp @@ -39,7 +39,6 @@ public: bool applicable(QAction*) const { return qobject_cast(scene->item(scene->mainSelectionIndex())); } void print_message(QString message) { messages->information(message);} - void init(QMainWindow*, CGAL::Three::Scene_interface*){} void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface* m); virtual void closure() { diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Polyhedron_stitching_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PMP/Polyhedron_stitching_plugin.cpp index 59c99b409cf..eb0e685a146 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Polyhedron_stitching_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/PMP/Polyhedron_stitching_plugin.cpp @@ -47,7 +47,6 @@ class Polyhedron_demo_polyhedron_stitching_plugin : QAction* actionStitchBorders; public: QList actions() const { return QList() << actionDetectBorders << actionStitchBorders; } - void init(QMainWindow*, CGAL::Three::Scene_interface*){} void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface* /* m */) { scene = scene_interface; diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Repair_polyhedron_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PMP/Repair_polyhedron_plugin.cpp index 95d4199e56c..5f266ce86dd 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Repair_polyhedron_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/PMP/Repair_polyhedron_plugin.cpp @@ -26,7 +26,6 @@ class Polyhedron_demo_repair_polyhedron_plugin : public: - void init(QMainWindow*, Scene_interface*){} void init(QMainWindow* mainWindow, Scene_interface* scene_interface, Messages_interface* m) diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Selection_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PMP/Selection_plugin.cpp index 4d53a2a98e2..f9dd05f958a 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Selection_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/PMP/Selection_plugin.cpp @@ -69,7 +69,6 @@ public: void print_message(QString message) { messages->information(message); } QList actions() const { return QList() << actionSelection; } - void init(QMainWindow*, CGAL::Three::Scene_interface*) {} void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface* m) { mw = mainWindow; scene = scene_interface; diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Self_intersection_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PMP/Self_intersection_plugin.cpp index 5a3c0689be9..7a43688fe49 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Self_intersection_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/PMP/Self_intersection_plugin.cpp @@ -34,7 +34,8 @@ public: } void init(QMainWindow* mainWindow, - Scene_interface* scene_interface) + Scene_interface* scene_interface, + Messages_interface*) { mw = mainWindow; scene = scene_interface; diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Triangulate_facets_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PMP/Triangulate_facets_plugin.cpp index 8a833d37db6..04c101b0d02 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Triangulate_facets_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/PMP/Triangulate_facets_plugin.cpp @@ -18,8 +18,6 @@ class Polyhedron_demo_triangulate_facets_plugin : public: - void init(QMainWindow*, - CGAL::Three::Scene_interface*){} void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface* m) { diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Features_detection_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Point_set/Features_detection_plugin.cpp index 2a400e0a3b7..7e9ffe9a9d8 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Features_detection_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Point_set/Features_detection_plugin.cpp @@ -22,7 +22,7 @@ class Polyhedron_demo_features_detection_plugin : QAction* actionDetectFeatures; public: QList actions() const { return QList() << actionDetectFeatures; } - void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface) + void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface*) { scene = scene_interface; actionDetectFeatures= new QAction(tr("VCM Features Estimation"), mainWindow); diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Merge_point_sets_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Point_set/Merge_point_sets_plugin.cpp index 219b7798bc3..fd92426562c 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Merge_point_sets_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Point_set/Merge_point_sets_plugin.cpp @@ -24,7 +24,7 @@ private: QAction* actionMergePointSets; public: - void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface) { + void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface*) { scene = scene_interface; actionMergePointSets = new QAction(tr("Merge"), mainWindow); actionMergePointSets->setObjectName("actionMergePointSets"); diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_average_spacing_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_average_spacing_plugin.cpp index 803f7315f19..1b1a254f82f 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_average_spacing_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_average_spacing_plugin.cpp @@ -34,7 +34,7 @@ private: QAction* actionAverageSpacing; public: - void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface) { + void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface*) { scene = scene_interface; mw = mainWindow; actionAverageSpacing = new QAction(tr("Point Set Average Spacing"), mainWindow); diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_bilateral_smoothing_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_bilateral_smoothing_plugin.cpp index 67bde82b548..7b01c916f14 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_bilateral_smoothing_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_bilateral_smoothing_plugin.cpp @@ -36,7 +36,7 @@ class Polyhedron_demo_point_set_bilateral_smoothing_plugin : QAction* actionBilateralSmoothing; public: - void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface) { + void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface*) { scene = scene_interface; actionBilateralSmoothing = new QAction(tr("Point Set Bilateral Smoothing"), mainWindow); actionBilateralSmoothing->setObjectName("actionBilateralSmoothing"); diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_normal_estimation_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_normal_estimation_plugin.cpp index b3adf39ceb5..d51e71cf613 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_normal_estimation_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_normal_estimation_plugin.cpp @@ -46,7 +46,7 @@ class Polyhedron_demo_point_set_normal_estimation_plugin : QAction* actionNormalInversion; public: - void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface) { + void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface*) { scene = scene_interface; actionNormalEstimation = new QAction(tr("Point Set Normal Estimation"), mainWindow); diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_outliers_removal_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_outliers_removal_plugin.cpp index b8ea57e7a53..5ebdda6fffb 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_outliers_removal_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_outliers_removal_plugin.cpp @@ -29,7 +29,7 @@ private: QAction* actionOutlierRemoval; public: - void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface) { + void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface*) { scene = scene_interface; actionOutlierRemoval = new QAction(tr("Point Set Outliers Selection"), mainWindow); actionOutlierRemoval->setObjectName("actionOutlierRemoval"); diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_selection_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_selection_plugin.cpp index d1c9dc1cfe5..bf5a598d598 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_selection_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_selection_plugin.cpp @@ -192,7 +192,6 @@ public: void print_message(QString message) { messages->information(message); } QList actions() const { return QList() << actionPointSetSelection; } - void init(QMainWindow*, CGAL::Three::Scene_interface*) {} void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface* m) { mw = mainWindow; scene = scene_interface; diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_shape_detection_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_shape_detection_plugin.cpp index 7aaef8b32d9..9d7c40ed1e3 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_shape_detection_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_shape_detection_plugin.cpp @@ -46,7 +46,7 @@ class Polyhedron_demo_point_set_shape_detection_plugin : typedef CGAL::Shape_detection_3::Efficient_RANSAC Shape_detection; public: - void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface) { + void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface*) { scene = scene_interface; actionDetect = new QAction(tr("Point Set Shape Detection"), mainWindow); actionDetect->setObjectName("actionDetect"); diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_simplification_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_simplification_plugin.cpp index 1866dcf22e2..dd2a9d3e0af 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_simplification_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_simplification_plugin.cpp @@ -39,7 +39,7 @@ class Polyhedron_demo_point_set_simplification_plugin : QAction* actionSimplify; public: - void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface) { + void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface,Messages_interface*) { scene = scene_interface; actionSimplify = new QAction(tr("Point Set Simplification Selection"), mainWindow); actionSimplify->setObjectName("actionSimplify"); diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_smoothing_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_smoothing_plugin.cpp index db766a9f30c..17acc95c9a9 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_smoothing_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_smoothing_plugin.cpp @@ -31,7 +31,7 @@ class Polyhedron_demo_point_set_smoothing_plugin : QAction* actionJetSmoothing; public: - void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface) { + void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface*) { scene = scene_interface; actionJetSmoothing = new QAction(tr("Point Set Jet Smoothing"), mainWindow); actionJetSmoothing->setObjectName("actionJetSmoothing"); diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_upsampling_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_upsampling_plugin.cpp index 8333e0799ef..ca0bc9ccbe5 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_upsampling_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_upsampling_plugin.cpp @@ -35,7 +35,7 @@ class Polyhedron_demo_point_set_upsampling_plugin : QAction* actionEdgeAwareUpsampling; public: - void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface) { + void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface*) { scene = scene_interface; actionEdgeAwareUpsampling = new QAction(tr("Point Set Edge Aware Upsampling"), mainWindow); actionEdgeAwareUpsampling->setObjectName("actionEdgeAwareUpsampling"); diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_wlop_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_wlop_plugin.cpp index 5f08023af33..2671fbb4cc4 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_wlop_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Point_set/Point_set_wlop_plugin.cpp @@ -36,7 +36,7 @@ class Polyhedron_demo_point_set_wlop_plugin : QAction* actionSimplifyAndRegularize; public: - void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface) { + void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface*) { scene = scene_interface; actionSimplifyAndRegularize = new QAction(tr("Point Set WLOP Simplification and Regularization Selection"), mainWindow); actionSimplifyAndRegularize->setObjectName("actionSimplifyAndRegularize"); diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Surface_reconstruction_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Point_set/Surface_reconstruction_plugin.cpp index 4abcf0b92cb..06bf286ea33 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Point_set/Surface_reconstruction_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Point_set/Surface_reconstruction_plugin.cpp @@ -468,7 +468,7 @@ class Polyhedron_demo_surface_reconstruction_plugin : QAction* actionSurfaceReconstruction; public: - void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface) { + void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface*) { scene = scene_interface; actionSurfaceReconstruction = new QAction(tr("Surface Reconstruction"), mainWindow); actionSurfaceReconstruction->setObjectName("actionSurfaceReconstruction"); diff --git a/Polyhedron/demo/Polyhedron/Plugins/Subdivision_methods/Subdivision_methods_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Subdivision_methods/Subdivision_methods_plugin.cpp index c10b2b31263..be167802baa 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Subdivision_methods/Subdivision_methods_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Subdivision_methods/Subdivision_methods_plugin.cpp @@ -24,7 +24,8 @@ public: } void init(QMainWindow* mw, - Scene_interface* scene_interface) + Scene_interface* scene_interface, + Messages_interface*) { scene = scene_interface; QAction *actionLoop = new QAction("Loop", mw); diff --git a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Mesh_segmentation_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Mesh_segmentation_plugin.cpp index 03bac66da14..ea61c954d98 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Mesh_segmentation_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Mesh_segmentation_plugin.cpp @@ -64,7 +64,7 @@ public: qobject_cast(scene->item(scene->mainSelectionIndex())); } - void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface) { + void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface*) { this->scene = scene_interface; this->mw = mainWindow; actionSegmentation = new QAction("Mesh Segmentation", mw); diff --git a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Mesh_simplification_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Mesh_simplification_plugin.cpp index 663fdc74081..696ff2f3130 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Mesh_simplification_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Mesh_simplification_plugin.cpp @@ -28,7 +28,8 @@ public: } void init(QMainWindow* mainWindow, - Scene_interface* scene_interface) + Scene_interface* scene_interface, + Messages_interface*) { mw = mainWindow; scene = scene_interface; diff --git a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Parameterization_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Parameterization_plugin.cpp index 460bf9609e3..77ae4c0c205 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Parameterization_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Parameterization_plugin.cpp @@ -40,7 +40,8 @@ public: } void init(QMainWindow* mainWindow, - Scene_interface* scene_interface) + Scene_interface* scene_interface, + Messages_interface*) { mw = mainWindow; scene = scene_interface; diff --git a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Remeshing_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Remeshing_plugin.cpp index be5d51c2cc8..110d7279d5e 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Remeshing_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Remeshing_plugin.cpp @@ -30,7 +30,7 @@ class Polyhedron_demo_remeshing_plugin : Q_PLUGIN_METADATA(IID "com.geometryfactory.PolyhedronDemo.PluginInterface/1.0") public: - void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface) { + void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface*) { this->scene = scene_interface; this->mw = mainWindow; actionRemeshing = new QAction(tr("Remeshing"), mw); diff --git a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Shortest_path_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Shortest_path_plugin.cpp index 064bc742a68..2a7bef1363f 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Shortest_path_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh/Shortest_path_plugin.cpp @@ -71,8 +71,6 @@ public: return qobject_cast(scene->item(scene->mainSelectionIndex())); } - - void init(QMainWindow*, CGAL::Three::Scene_interface*){} void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface* messages) { this->scene = scene_interface; diff --git a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_deformation/Edit_polyhedron_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_deformation/Edit_polyhedron_plugin.cpp index bc6af2a590e..6ea57651e7a 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_deformation/Edit_polyhedron_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/Surface_mesh_deformation/Edit_polyhedron_plugin.cpp @@ -26,7 +26,7 @@ public: ~Polyhedron_demo_edit_polyhedron_plugin() { } - void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface); + void init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface*); virtual void closure() { dock_widget->hide(); @@ -87,7 +87,7 @@ bool Polyhedron_demo_edit_polyhedron_plugin::applicable(QAction*) const { return false; } -void Polyhedron_demo_edit_polyhedron_plugin::init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface) +void Polyhedron_demo_edit_polyhedron_plugin::init(QMainWindow* mainWindow, CGAL::Three::Scene_interface* scene_interface, Messages_interface*) { mw = mainWindow; scene = scene_interface; diff --git a/Three/include/CGAL/Three/Polyhedron_demo_plugin_interface.h b/Three/include/CGAL/Three/Polyhedron_demo_plugin_interface.h index 0570ee69120..2f10186cf30 100644 --- a/Three/include/CGAL/Three/Polyhedron_demo_plugin_interface.h +++ b/Three/include/CGAL/Three/Polyhedron_demo_plugin_interface.h @@ -39,17 +39,10 @@ class Scene_interface; class Polyhedron_demo_plugin_interface { public: - //!Initializes the plugin. - //! This acts like a constructor for a plugin. Do all you want to do when the plugin is created : - //! get the references to the mainwindow and the scene, connect your signals and slots, etc. - virtual void init(QMainWindow*, CGAL::Three::Scene_interface*) = 0; - //!This is an overloaded function. //! Initializes the plugin and gives access to a Message interface, that //! can be used to display messages in the console dock widget. //! @see init(QMainWindow*, CGAL::Three::Scene_interface*) - virtual void init(QMainWindow* mw, CGAL::Three::Scene_interface* sc, Messages_interface*) { - init(mw, sc); - } + virtual void init(QMainWindow* , CGAL::Three::Scene_interface* , Messages_interface*) = 0; //! Decides if the plugin's actions will be displayed or not. //! @returns \c true, if the plugin is applicable, \c false