first sorting of actions into directories corresponding to CGAL packages

This commit is contained in:
Jane Tournois 2015-10-20 12:38:25 +02:00
parent 94f3fa7210
commit d5e32479a1
26 changed files with 51 additions and 38 deletions

View File

@ -30,7 +30,8 @@ public:
mw = mainWindow; mw = mainWindow;
scene = scene_interface; scene = scene_interface;
actions_map["actionConvexHull"] = getActionFromMainWindow(mw, "actionConvexHull"); actions_map["actionConvexHull"] = getActionFromMainWindow(mw, "actionConvexHull");
actions_map["actionConvexHull"]->setProperty("subMenuName", "Object creation"); actions_map["actionConvexHull"]->setProperty("subMenuName",
"3D Convex Hulls");
autoConnectActions(); autoConnectActions();
} }

View File

@ -41,7 +41,7 @@ public:
this->scene = scene_interface; this->scene = scene_interface;
this->mw = mainWindow; this->mw = mainWindow;
actionPolyhedronCorefinement_3 = new QAction("Polyhedra corefinement (A/B)", mw); actionPolyhedronCorefinement_3 = new QAction("Polyhedra corefinement (A/B)", mw);
actionPolyhedronCorefinement_3->setProperty("subMenuName", "Operation on multiple polyhedra"); actionPolyhedronCorefinement_3->setProperty("subMenuName", "Operations on polyhedra");
if(actionPolyhedronCorefinement_3) { if(actionPolyhedronCorefinement_3) {
connect(actionPolyhedronCorefinement_3, SIGNAL(triggered()), connect(actionPolyhedronCorefinement_3, SIGNAL(triggered()),
this, SLOT(corefinement())); this, SLOT(corefinement()));

View File

@ -85,7 +85,7 @@ void Polyhedron_demo_edit_polyhedron_plugin::init(QMainWindow* mainWindow, CGAL:
mw = mainWindow; mw = mainWindow;
scene = scene_interface; scene = scene_interface;
actionDeformation = new QAction("Surface Mesh Deformation", mw); actionDeformation = new QAction("Surface Mesh Deformation", mw);
actionDeformation->setProperty("subMenuName", "Action on mesh"); actionDeformation->setProperty("subMenuName", "Triangulated Surface Mesh Deformation");
actionDeformation->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_E)); actionDeformation->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_E));
connect(actionDeformation, SIGNAL(triggered()), this, SLOT(on_actionDeformation_triggered())); connect(actionDeformation, SIGNAL(triggered()), this, SLOT(on_actionDeformation_triggered()));

View File

@ -47,7 +47,7 @@ public:
scene = scene_interface; scene = scene_interface;
messages = m; messages = m;
actionFairing = new QAction(tr("Fairing"), mw); actionFairing = new QAction(tr("Fairing"), mw);
actionFairing->setProperty("subMenuName", "Action on mesh"); actionFairing->setProperty("subMenuName", "Polygon Mesh Processing");
connect(actionFairing, SIGNAL(triggered()), this, SLOT(fairing_action())); connect(actionFairing, SIGNAL(triggered()), this, SLOT(fairing_action()));

View File

@ -396,7 +396,7 @@ void Polyhedron_demo_hole_filling_plugin::init(QMainWindow* mainWindow,
messages = m; messages = m;
actionHoleFilling = new QAction(tr("Hole Filling"), mw); actionHoleFilling = new QAction(tr("Hole Filling"), mw);
actionHoleFilling->setProperty("subMenuName", "Action on mesh"); actionHoleFilling->setProperty("subMenuName", "Polygon Mesh Processing");
connect(actionHoleFilling, SIGNAL(triggered()), this, SLOT(hole_filling_action())); connect(actionHoleFilling, SIGNAL(triggered()), this, SLOT(hole_filling_action()));
dock_widget = new QDockWidget("Hole Filling", mw); dock_widget = new QDockWidget("Hole Filling", mw);

View File

@ -30,7 +30,7 @@ public:
mw = mainWindow; mw = mainWindow;
scene = scene_interface; scene = scene_interface;
actions_map["actionInsideOut"] = getActionFromMainWindow(mw, "actionInsideOut"); actions_map["actionInsideOut"] = getActionFromMainWindow(mw, "actionInsideOut");
actions_map["actionInsideOut"]->setProperty("subMenuName", "Action on normals"); actions_map["actionInsideOut"]->setProperty("subMenuName", "Polygon Mesh Processing");
autoConnectActions(); autoConnectActions();
} }

View File

@ -46,7 +46,7 @@ public:
this->scene = scene_interface; this->scene = scene_interface;
this->mw = mainWindow; this->mw = mainWindow;
actionPolyhedronIntersection_3 = new QAction("Intersect polyhedra (A/B)", mw); actionPolyhedronIntersection_3 = new QAction("Intersect polyhedra (A/B)", mw);
actionPolyhedronIntersection_3->setProperty("subMenuName", "Operation on multiple polyhedra"); actionPolyhedronIntersection_3->setProperty("subMenuName", "Operations on polyhedra");
if(actionPolyhedronIntersection_3) { if(actionPolyhedronIntersection_3) {
connect(actionPolyhedronIntersection_3, SIGNAL(triggered()), connect(actionPolyhedronIntersection_3, SIGNAL(triggered()),
this, SLOT(intersection())); this, SLOT(intersection()));

View File

@ -31,7 +31,8 @@ public:
mw = mainWindow; mw = mainWindow;
scene = scene_interface; scene = scene_interface;
actions_map["actionEstimateCurvature"] = getActionFromMainWindow(mw, "actionEstimateCurvature"); actions_map["actionEstimateCurvature"] = getActionFromMainWindow(mw, "actionEstimateCurvature");
actions_map["actionEstimateCurvature"]->setProperty("subMenuName", "Object creation"); actions_map["actionEstimateCurvature"]->setProperty("subMenuName",
"Estimation of Local Differential Properties");
autoConnectActions(); autoConnectActions();
} }

View File

@ -32,13 +32,15 @@ public:
{ {
msg_interface = m; msg_interface = m;
actionJoinPolyhedra= new QAction(tr("Join selected polyhedra"), mainWindow); actionJoinPolyhedra= new QAction(tr("Join selected polyhedra"), mainWindow);
actionJoinPolyhedra->setProperty("subMenuName", "Operation on multiple polyhedra"); actionJoinPolyhedra->setProperty("subMenuName", "Operations on polyhedra");
actionJoinPolyhedra->setObjectName("actionJoinPolyhedra"); actionJoinPolyhedra->setObjectName("actionJoinPolyhedra");
actionSplitPolyhedra= new QAction(tr("Split selected polyhedra"), mainWindow); actionSplitPolyhedra= new QAction(tr("Split selected polyhedra"), mainWindow);
actionSplitPolyhedra->setProperty("subMenuName", "Operation on multiple polyhedra"); actionSplitPolyhedra->setProperty("subMenuName", "Operations on polyhedra");
actionSplitPolyhedra->setObjectName("actionSplitPolyhedra"); actionSplitPolyhedra->setObjectName("actionSplitPolyhedra");
actionColorConnectedComponents = new QAction(tr("Color each connected component of selected polyhedra"), mainWindow); actionColorConnectedComponents = new QAction(tr("Color each connected component of selected polyhedra"), mainWindow);
actionColorConnectedComponents ->setProperty("subMenuName", "Color alteration"); actionColorConnectedComponents ->setProperty("subMenuName", "Polygon Mesh Processing");
actionColorConnectedComponents->setObjectName("actionColorConnectedComponents"); actionColorConnectedComponents->setObjectName("actionColorConnectedComponents");
Polyhedron_demo_plugin_helper::init(mainWindow, scene_interface); Polyhedron_demo_plugin_helper::init(mainWindow, scene_interface);
} }

View File

@ -119,12 +119,11 @@ public:
ui = NULL; ui = NULL;
actionMCFSkeleton = new QAction(tr("Mean Curvature Skeleton (Advanced)"), mainWindow); actionMCFSkeleton = new QAction(tr("Mean Curvature Skeleton (Advanced)"), mainWindow);
actionMCFSkeleton->setProperty("subMenuName", "Object creation"); actionMCFSkeleton->setProperty("subMenuName", "Triangulated Surface Mesh Skeletonization");
actionMCFSkeleton->setObjectName("actionMCFSkeleton"); actionMCFSkeleton->setObjectName("actionMCFSkeleton");
actionConvert_to_medial_skeleton = new QAction(tr("Extract Medial Skeleton"), mainWindow); actionConvert_to_medial_skeleton = new QAction(tr("Extract Medial Skeleton"), mainWindow);
actionConvert_to_medial_skeleton->setProperty("subMenuName", "Object creation"); actionConvert_to_medial_skeleton->setProperty("subMenuName", "Triangulated Surface Mesh Skeletonization");
actionConvert_to_medial_skeleton->setObjectName("actionConvert_to_medial_skeleton"); actionConvert_to_medial_skeleton->setObjectName("actionConvert_to_medial_skeleton");
Polyhedron_demo_plugin_helper::init(mainWindow, scene_interface); Polyhedron_demo_plugin_helper::init(mainWindow, scene_interface);

View File

@ -39,7 +39,7 @@ public:
this->mw = mainWindow; this->mw = mainWindow;
actionMesh_3 = new QAction("Create a tetrahedral mesh", mw); actionMesh_3 = new QAction("Create a tetrahedral mesh", mw);
if(actionMesh_3) { if(actionMesh_3) {
actionMesh_3->setProperty("subMenuName", "Operations with plane"); actionMesh_3->setProperty("subMenuName", "3D Mesh Generation");
connect(actionMesh_3, SIGNAL(triggered()), connect(actionMesh_3, SIGNAL(triggered()),
this, SLOT(mesh_3())); this, SLOT(mesh_3()));
} }

View File

@ -68,7 +68,7 @@ public:
this->scene = scene_interface; this->scene = scene_interface;
this->mw = mainWindow; this->mw = mainWindow;
actionSegmentation = new QAction("Mesh Segmentation", mw); actionSegmentation = new QAction("Mesh Segmentation", mw);
actionSegmentation->setProperty("subMenuName", "Color alteration"); actionSegmentation->setProperty("subMenuName", "Triangulated Surface Mesh Segmentation");
connect(actionSegmentation, SIGNAL(triggered()),this, SLOT(on_actionSegmentation_triggered())); connect(actionSegmentation, SIGNAL(triggered()),this, SLOT(on_actionSegmentation_triggered()));
// adding slot for itemAboutToBeDestroyed signal, aim is removing item from item-functor map. // adding slot for itemAboutToBeDestroyed signal, aim is removing item from item-functor map.

View File

@ -34,7 +34,8 @@ public:
mw = mainWindow; mw = mainWindow;
scene = scene_interface; scene = scene_interface;
actions_map["actionSimplify"] = getActionFromMainWindow(mw, "actionSimplify"); actions_map["actionSimplify"] = getActionFromMainWindow(mw, "actionSimplify");
actions_map["actionSimplify"]->setProperty("subMenuName", "Action on mesh"); actions_map["actionSimplify"]->setProperty("subMenuName",
"Triangulated Surface Mesh Simplification");
autoConnectActions(); autoConnectActions();
} }

View File

@ -37,7 +37,8 @@ public:
mw = mainWindow; mw = mainWindow;
scene = scene_interface; scene = scene_interface;
actions_map["actionConvexDecomposition"] = getActionFromMainWindow(mw, "actionConvexDecomposition"); actions_map["actionConvexDecomposition"] = getActionFromMainWindow(mw, "actionConvexDecomposition");
actions_map["actionConvexDecomposition"]->setProperty("subMenuName", "Object creation"); actions_map["actionConvexDecomposition"]->setProperty("subMenuName",
"Convex Decomposition of Polyhedra");
actions_map["actionToNef"] = getActionFromMainWindow(mw, "actionToNef"); actions_map["actionToNef"] = getActionFromMainWindow(mw, "actionToNef");
actions_map["actionToPoly"] = getActionFromMainWindow(mw, "actionToPoly"); actions_map["actionToPoly"] = getActionFromMainWindow(mw, "actionToPoly");

View File

@ -62,18 +62,18 @@ void Polyhedron_demo_orient_soup_plugin::init(QMainWindow* mainWindow,
messages = m; messages = m;
actionOrient = new QAction(tr("&Orient polygon soup"), mainWindow); actionOrient = new QAction(tr("&Orient polygon soup"), mainWindow);
actionOrient->setObjectName("actionOrient"); actionOrient->setObjectName("actionOrient");
actionOrient->setProperty("subMenuName", "Action on normals"); actionOrient->setProperty("subMenuName", "Polygon Mesh Processing");
connect(actionOrient, SIGNAL(triggered()), connect(actionOrient, SIGNAL(triggered()),
this, SLOT(orient())); this, SLOT(orient()));
actionShuffle = new QAction(tr("&Shuffle polygon soup"), mainWindow); actionShuffle = new QAction(tr("&Shuffle polygon soup"), mainWindow);
actionShuffle->setProperty("subMenuName", "Action on normals"); actionShuffle->setProperty("subMenuName", "Polygon Mesh Processing");
connect(actionShuffle, SIGNAL(triggered()), connect(actionShuffle, SIGNAL(triggered()),
this, SLOT(shuffle())); this, SLOT(shuffle()));
actionDisplayNonManifoldEdges = new QAction(tr("Display non manifold edges"), actionDisplayNonManifoldEdges = new QAction(tr("Display non manifold edges"),
mainWindow); mainWindow);
actionDisplayNonManifoldEdges->setProperty("subMenuName", "Detection"); actionDisplayNonManifoldEdges->setProperty("subMenuName", "View");
connect(actionDisplayNonManifoldEdges, SIGNAL(triggered()), connect(actionDisplayNonManifoldEdges, SIGNAL(triggered()),
this, SLOT(displayNonManifoldEdges())); this, SLOT(displayNonManifoldEdges()));
} }

View File

@ -47,16 +47,23 @@ public:
mw = mainWindow; mw = mainWindow;
scene = scene_interface; scene = scene_interface;
actions_map["actionMVC"] = new QAction("MVC", mw); actions_map["actionMVC"] = new QAction("MVC", mw);
actions_map["actionMVC"]->setProperty("subMenuName", "Color alteration/Parametrization"); actions_map["actionMVC"]->setProperty("subMenuName",
"Planar Parameterization of Triangulated Surface Meshes");
actions_map["actionDCP"] = new QAction ("DCP", mw); actions_map["actionDCP"] = new QAction ("DCP", mw);
actions_map["actionDCP"]->setProperty("subMenuName", "Color alteration/Parametrization"); actions_map["actionDCP"]->setProperty("subMenuName",
"Planar Parameterization of Triangulated Surface Meshes");
actions_map["actionLSC"] = new QAction("LSC", mw);
actions_map["actionLSC"]->setProperty("subMenuName",
"Planar Parameterization of Triangulated Surface Meshes");
connect(actions_map["actionMVC"], SIGNAL(triggered()), connect(actions_map["actionMVC"], SIGNAL(triggered()),
this, SLOT(on_actionMVC_triggered())); this, SLOT(on_actionMVC_triggered()));
connect(actions_map["actionDCP"], SIGNAL(triggered()), connect(actions_map["actionDCP"], SIGNAL(triggered()),
this, SLOT(on_actionDCP_triggered())); this, SLOT(on_actionDCP_triggered()));
connect(actions_map["actionLSC"], SIGNAL(triggered()),
this, SLOT(on_actionLSC_triggered()));
} }
bool applicable(QAction*) const { bool applicable(QAction*) const {

View File

@ -47,10 +47,10 @@ public:
mw = mainWindow; mw = mainWindow;
scene = scene_interface; scene = scene_interface;
actions_map["actionFitPlane"] = new QAction("Fit Plane", mw); actions_map["actionFitPlane"] = new QAction("Fit Plane", mw);
actions_map["actionFitPlane"]->setProperty("subMenuName", "Object creation/PCA"); actions_map["actionFitPlane"]->setProperty("subMenuName", "Principal Component Analysis");
actions_map["actionFitLine"] = new QAction("Fit Line", mw); actions_map["actionFitLine"] = new QAction("Fit Line", mw);
actions_map["actionFitLine"]->setProperty("subMenuName", "Object creation/PCA"); actions_map["actionFitLine"]->setProperty("subMenuName", "Principal Component Analysis");
connect(actions_map["actionFitPlane"], SIGNAL(triggered()), connect(actions_map["actionFitPlane"], SIGNAL(triggered()),
this, SLOT(on_actionFitPlane_triggered())); this, SLOT(on_actionFitPlane_triggered()));

View File

@ -63,7 +63,7 @@ public:
messages = m; messages = m;
actionPointInsidePolyhedron = new QAction(tr("Point Inside Polyhedron"), mw); actionPointInsidePolyhedron = new QAction(tr("Point Inside Polyhedron"), mw);
actionPointInsidePolyhedron->setProperty("subMenuName", "Object creation"); actionPointInsidePolyhedron->setProperty("subMenuName", "Polygon Mesh Processing");
connect(actionPointInsidePolyhedron, SIGNAL(triggered()), this, SLOT(point_inside_polyhedron_action())); connect(actionPointInsidePolyhedron, SIGNAL(triggered()), this, SLOT(point_inside_polyhedron_action()));
dock_widget = new QDockWidget("Point Inside Polyhedron", mw); dock_widget = new QDockWidget("Point Inside Polyhedron", mw);

View File

@ -97,7 +97,7 @@ void Polyhedron_demo_polyhedron_slicer_plugin::init(QMainWindow* mainWindow,
plane_item = NULL; plane_item = NULL;
actionSlicerWidget = new QAction(tr("Polyhedron Slicer"), mw); actionSlicerWidget = new QAction(tr("Polyhedron Slicer"), mw);
actionSlicerWidget->setProperty("subMenuName", "Operations with plane"); actionSlicerWidget->setProperty("subMenuName", "Polygon Mesh Processing");
connect(actionSlicerWidget, SIGNAL(triggered()), this, SLOT(slicer_widget_action())); connect(actionSlicerWidget, SIGNAL(triggered()), this, SLOT(slicer_widget_action()));
dock_widget = new QDockWidget("Polyhedron Slicer", mw); dock_widget = new QDockWidget("Polyhedron Slicer", mw);

View File

@ -54,7 +54,8 @@ public:
actionStitchBorders= new QAction(tr("Stitch polyhedron duplicated boundaries"), mainWindow); actionStitchBorders= new QAction(tr("Stitch polyhedron duplicated boundaries"), mainWindow);
actionDetectBorders->setObjectName("actionDetectBorders"); actionDetectBorders->setObjectName("actionDetectBorders");
actionStitchBorders->setObjectName("actionStitchBorders"); actionStitchBorders->setObjectName("actionStitchBorders");
actionDetectBorders->setProperty("subMenuName", "Detection operations"); actionStitchBorders->setProperty("subMenuName", "Polygon Mesh Processing");
actionDetectBorders->setProperty("subMenuName", "Polygon Mesh Processing");
Polyhedron_demo_plugin_helper::init(mainWindow, scene_interface); Polyhedron_demo_plugin_helper::init(mainWindow, scene_interface);
} }

View File

@ -35,7 +35,7 @@ public:
this->scene = scene_interface; this->scene = scene_interface;
this->mw = mainWindow; this->mw = mainWindow;
actionRemeshing = this->getActionFromMainWindow(mw, "actionRemeshing"); actionRemeshing = this->getActionFromMainWindow(mw, "actionRemeshing");
actionRemeshing->setProperty("subMenuName", "Action on mesh"); actionRemeshing->setProperty("subMenuName", "3D Surface Mesh Generation");
if(actionRemeshing) { if(actionRemeshing) {
connect(actionRemeshing, SIGNAL(triggered()), connect(actionRemeshing, SIGNAL(triggered()),
this, SLOT(remesh())); this, SLOT(remesh()));

View File

@ -40,7 +40,7 @@ public:
mw = mainWindow; mw = mainWindow;
scene = scene_interface; scene = scene_interface;
actions_map["actionSelfIntersection"] = getActionFromMainWindow(mw, "actionSelfIntersection"); actions_map["actionSelfIntersection"] = getActionFromMainWindow(mw, "actionSelfIntersection");
actions_map["actionSelfIntersection"]->setProperty("subMenuName", "Detection operations"); actions_map["actionSelfIntersection"]->setProperty("subMenuName", "Polygon Mesh Processing");
autoConnectActions(); autoConnectActions();
} }

View File

@ -89,7 +89,7 @@ public:
connect(ui_widget.Primitives_type_combo_box, SIGNAL(currentIndexChanged(int)), this, SLOT(on_Primitives_type_combo_box_changed(int))); connect(ui_widget.Primitives_type_combo_box, SIGNAL(currentIndexChanged(int)), this, SLOT(on_Primitives_type_combo_box_changed(int)));
actionMakeShortestPaths = new QAction("Make Shortest Path", this->mw); actionMakeShortestPaths = new QAction("Make Shortest Path", this->mw);
actionMakeShortestPaths->setProperty("subMenuName", "Object creation"); actionMakeShortestPaths->setProperty("subMenuName", "Triangulated Surface Mesh Shortest Paths");
connect(actionMakeShortestPaths, SIGNAL(triggered()), this, SLOT(on_actionMakeShortestPaths_triggered())); connect(actionMakeShortestPaths, SIGNAL(triggered()), this, SLOT(on_actionMakeShortestPaths_triggered()));

View File

@ -31,13 +31,13 @@ public:
mw = mainWindow; mw = mainWindow;
scene = scene_interface; scene = scene_interface;
actions_map["actionLoop"] = new QAction("Loop", mw); actions_map["actionLoop"] = new QAction("Loop", mw);
actions_map["actionLoop"]->setProperty("subMenuName", "Action on mesh/Subdivisions"); actions_map["actionLoop"]->setProperty("subMenuName", "3D Surface Subdivision Methods");
actions_map["actionCatmullClark"] = new QAction("Catmull Clark", mw); actions_map["actionCatmullClark"] = new QAction("Catmull Clark", mw);
actions_map["actionCatmullClark"]->setProperty("subMenuName", "Action on mesh/Subdivisions"); actions_map["actionCatmullClark"]->setProperty("subMenuName", "3D Surface Subdivision Methods");
actions_map["actionSqrt3"] = new QAction("Sqrt3", mw); actions_map["actionSqrt3"] = new QAction("Sqrt3", mw);
actions_map["actionSqrt3"]->setProperty("subMenuName", "Action on mesh/Subdivisions"); actions_map["actionSqrt3"]->setProperty("subMenuName", "3D Surface Subdivision Methods");
//autoConnectActions(); //autoConnectActions();
connect(actions_map["actionLoop"], SIGNAL(triggered()), connect(actions_map["actionLoop"], SIGNAL(triggered()),

View File

@ -28,13 +28,13 @@ public:
this->mw = mainWindow; this->mw = mainWindow;
this->messages = m; this->messages = m;
actionTriangulateFacets = new QAction("Triangulate facets", mw); actionTriangulateFacets = new QAction("Triangulate facets", mw);
actionTriangulateFacets->setProperty("subMenuName","Action on mesh"); actionTriangulateFacets->setProperty("subMenuName","Polygon Mesh Processing");
if(actionTriangulateFacets) { if(actionTriangulateFacets) {
connect(actionTriangulateFacets, SIGNAL(triggered()), connect(actionTriangulateFacets, SIGNAL(triggered()),
this, SLOT(triangulate())); this, SLOT(triangulate()));
} }
actionUnTriangulateFacets = new QAction("Untriangulate facets", mw); actionUnTriangulateFacets = new QAction("Untriangulate facets", mw);
actionUnTriangulateFacets->setProperty("subMenuName","Action on mesh"); actionUnTriangulateFacets->setProperty("subMenuName","Polygon Mesh Processing");
if(actionUnTriangulateFacets) { if(actionUnTriangulateFacets) {
connect(actionUnTriangulateFacets, SIGNAL(triggered()), connect(actionUnTriangulateFacets, SIGNAL(triggered()),
this, SLOT(untriangulate())); this, SLOT(untriangulate()));

View File

@ -168,7 +168,7 @@ void Polyhedron_demo_trivial_plugin::init(QMainWindow* mainWindow, CGAL::Three::
{ {
scene = scene_interface; scene = scene_interface;
actionBbox = new QAction(tr("Create bbox"), mainWindow); actionBbox = new QAction(tr("Create bbox"), mainWindow);
actionBbox->setProperty("subMenuName", "Object creation"); //actionBbox->setProperty("subMenuName", "Object creation");
connect(actionBbox, SIGNAL(triggered()), connect(actionBbox, SIGNAL(triggered()),
this, SLOT(bbox())); this, SLOT(bbox()));
} }