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

fixes and clean-up

This commit is contained in:
Maxime Gimeno 2017-07-04 15:38:15 +02:00
parent 4454047702
commit 9582ce1c5f
5 changed files with 4 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Polyhedron/demo/Polyhedron/MainWindow.cpp
View File

@ -241,10 +241,8 @@ MainWindow::MainWindow(QWidget* parent)
// can easily copy-paste its text.
// connect(ui->infoLabel, SIGNAL(customContextMenuRequested(const QPoint & )),
// this, SLOT(showSceneContextMenu(const QPoint &)));
connect(ui->actionRecenterScene, SIGNAL(triggered()),
viewer, SLOT(update()));
connect(ui->actionAntiAliasing, SIGNAL(toggled(bool)),
viewer, SLOT(setAntiAliasing(bool)));

1
Polyhedron/demo/Polyhedron/MainWindow.h
View File

@ -347,7 +347,6 @@ protected Q_SLOTS:
void filterOperations();
//!Updates the bounding box and moves the camera to fits the scene.
void on_actionRecenterScene_triggered();
//!Resizes the header of the scene view
void resetHeader();

168
Polyhedron/demo/Polyhedron/MainWindow.ui
View File

@ -346,60 +346,6 @@
<string>Ctrl+Q</string>
</property>
</action>
<action name="actionSimplify">
<property name="text">
<string>&amp;Simplification</string>
</property>
</action>
<action name="actionCatmullClark">
<property name="text">
<string>&amp;Catmull-Clark</string>
</property>
</action>
<action name="actionKernel">
<property name="text">
<string>&amp;Kernel</string>
</property>
</action>
<action name="actionUnion">
<property name="text">
<string>&amp;Union (A/B)</string>
</property>
<property name="shortcut">
<string>Ctrl+O, U</string>
</property>
</action>
<action name="actionIntersection">
<property name="text">
<string>&amp;Intersection (A/B)</string>
</property>
<property name="shortcut">
<string>Ctrl+O, I</string>
</property>
</action>
<action name="actionDifference">
<property name="text">
<string>&amp;Difference (A/B)</string>
</property>
<property name="shortcut">
<string>Ctrl+O, D</string>
</property>
</action>
<action name="actionFitPlane">
<property name="text">
<string>Fit &amp;Plane</string>
</property>
</action>
<action name="actionFitLine">
<property name="text">
<string>Fit &amp;Line</string>
</property>
</action>
<action name="actionEstimateCurvature">
<property name="text">
<string>&amp;Curvature Estimation</string>
</property>
</action>
<action name="actionLoad">
<property name="icon">
<iconset resource="Polyhedron_3.qrc">
@ -436,11 +382,6 @@
<string>Ctrl+D</string>
</property>
</action>
<action name="actionSqrt3">
<property name="text">
<string>&amp;Sqrt3</string>
</property>
</action>
<action name="actionAntiAliasing">
<property name="checkable">
<bool>true</bool>
@ -454,71 +395,16 @@
<string>n/a</string>
</property>
</action>
<action name="actionConvexHull">
<property name="text">
<string>&amp;Convex Hull</string>
</property>
</action>
<action name="actionEraseAll">
<property name="text">
<string>&amp;Erase All</string>
</property>
</action>
<action name="actionOptions">
<property name="text">
<string>&amp;Options...</string>
</property>
</action>
<action name="actionLoop">
<property name="text">
<string>&amp;Loop</string>
</property>
</action>
<action name="actionSaveAs">
<property name="text">
<string>Save &amp;as...</string>
</property>
</action>
<action name="actionSave">
<property name="text">
<string>&amp;Save</string>
</property>
</action>
<action name="actionSaveAll">
<property name="text">
<string>Save A&amp;ll</string>
</property>
</action>
<action name="actionMergeAll">
<property name="text">
<string>Mer&amp;ge All</string>
</property>
</action>
<action name="actionMerge">
<property name="text">
<string>&amp;Merge</string>
</property>
</action>
<action name="actionSelfIntersection">
<property name="text">
<string>Self-&amp;intersection</string>
</property>
</action>
<action name="actionSelectAll">
<property name="text">
<string>Select &amp;All</string>
</property>
</action>
<action name="actionSelectNone">
<property name="text">
<string>Select &amp;None</string>
</property>
</action>
<action name="actionSelectInvert">
<property name="text">
<string>&amp;Invert Selection</string>
</property>
</action>
<action name="actionShowHide">
<property name="text">
<string>Show/Hide</string>
@ -537,46 +423,6 @@
<string>Set Polyhedron B</string>
</property>
</action>
<action name="actionInsideOut">
<property name="text">
<string>&amp;Inside-Out</string>
</property>
</action>
<action name="actionRemeshing">
<property name="text">
<string>&amp;Remeshing</string>
</property>
</action>
<action name="actionConvexDecomposition">
<property name="text">
<string>Convex Decomposition</string>
</property>
</action>
<action name="actionMVC">
<property name="text">
<string>Mean &amp;Value Coordinates</string>
</property>
</action>
<action name="actionDCP">
<property name="text">
<string>Discrete &amp;Conformal Maps</string>
</property>
</action>
<action name="actionExplode">
<property name="text">
<string>Explode</string>
</property>
</action>
<action name="actionToNef">
<property name="text">
<string>Convert to Nef Polyhedron</string>
</property>
</action>
<action name="actionToPoly">
<property name="text">
<string>Convert to Normal Polyhedron</string>
</property>
</action>
<action name="actionDrawTwoSides">
<property name="checkable">
<bool>true</bool>
@ -601,14 +447,6 @@
<string>Change &amp;Background Color...</string>
</property>
</action>
<action name="actionMinkowskiSum">
<property name="text">
<string>&amp;Minkowski Sum (A/B)</string>
</property>
<property name="shortcut">
<string>Ctrl+O, M</string>
</property>
</action>
<action name="actionLookAt">
<property name="text">
<string>&amp;Look at...</string>
@ -652,11 +490,6 @@
<string>&amp;Preferences</string>
</property>
</action>
<action name="actionLSC">
<property name="text">
<string>Least Square Conformal Maps</string>
</property>
</action>
<action name="actionLoadPlugin">
<property name="text">
<string>Load Plugin</string>
@ -705,7 +538,6 @@
<string>In Polyhedron Mode, the default type for facegraphs is Polyhedron, by opposition to Surface_mesh.</string>
</property>
</action>
</widget>
<customwidgets>
<customwidget>

8
Polyhedron/demo/Polyhedron/Plugins/PMP/Mean_curvature_flow_skeleton_plugin.cpp
View File

@ -144,8 +144,8 @@ public:
this, SLOT(on_actionSkeletonize()));
connect(ui->pushButton_converge, SIGNAL(clicked()),
this, SLOT(on_actionConverge()));
connect(dynamic_cast<Scene*>(scene), SIGNAL(updated_bbox()),
this, SLOT(on_actionUpdateBBox()));
connect(dynamic_cast<Scene*>(scene), SIGNAL(updated_bbox(bool)),
this, SLOT(on_actionUpdateBBox(bool)));
connect(ui->pushButton_segment, SIGNAL(clicked()),
this, SLOT(on_actionSegment()));
@ -361,7 +361,7 @@ public Q_SLOTS:
void on_actionRun();
void on_actionSkeletonize();
void on_actionConverge();
void on_actionUpdateBBox();
void on_actionUpdateBBox(bool);
void on_actionSegment();
void on_actionItemAboutToBeDestroyed(CGAL::Three::Scene_item*);
@ -408,7 +408,7 @@ void Polyhedron_demo_mean_curvature_flow_skeleton_plugin::on_actionMCFSkeleton_t
}
}
void Polyhedron_demo_mean_curvature_flow_skeleton_plugin::on_actionUpdateBBox()
void Polyhedron_demo_mean_curvature_flow_skeleton_plugin::on_actionUpdateBBox(bool)
{
double diag = scene->len_diagonal();
ui->min_edge_length->setValue(0.002 * diag);

2
Polyhedron/demo/Polyhedron/Scene.cpp
View File

@ -923,8 +923,6 @@ void Scene::itemVisibilityChanged()
void Scene::itemVisibilityChanged(CGAL::Three::Scene_item* item)
{
Bbox bbox_before = bbox();
if(item->isFinite()
&& !item->isEmpty())
{