From fbf99e3a35b83ca1b38b0de60865eaa75f4abe5d Mon Sep 17 00:00:00 2001 From: Simon Giraudot Date: Fri, 14 Aug 2015 10:49:23 +0200 Subject: [PATCH] Fix testsuite error on Picasso: filename too long --- Polyhedron/demo/Polyhedron/CMakeLists.txt | 6 +++--- ...n.cpp => Polyhedron_demo_point_set_wlop_plugin.cpp} | 10 +++++----- ...gin.ui => Polyhedron_demo_point_set_wlop_plugin.ui} | 0 Polyhedron/demo/Polyhedron/cgal_test_with_cmake | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) rename Polyhedron/demo/Polyhedron/{Polyhedron_demo_point_set_wlop_simplification_and_regularization_plugin.cpp => Polyhedron_demo_point_set_wlop_plugin.cpp} (88%) rename Polyhedron/demo/Polyhedron/{Polyhedron_demo_point_set_wlop_simplification_and_regularization_plugin.ui => Polyhedron_demo_point_set_wlop_plugin.ui} (100%) diff --git a/Polyhedron/demo/Polyhedron/CMakeLists.txt b/Polyhedron/demo/Polyhedron/CMakeLists.txt index 275c2e17948..a147b6f7f16 100644 --- a/Polyhedron/demo/Polyhedron/CMakeLists.txt +++ b/Polyhedron/demo/Polyhedron/CMakeLists.txt @@ -449,9 +449,9 @@ if(CGAL_Qt5_FOUND AND Qt5_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND) polyhedron_demo_plugin(point_set_shape_detection_plugin Polyhedron_demo_point_set_shape_detection_plugin ${point_set_shape_detectionUI_FILES}) target_link_libraries(point_set_shape_detection_plugin scene_polyhedron_item scene_points_with_normal_item) - qt5_wrap_ui(point_set_wlop_simplification_and_regularizationUI_FILES Polyhedron_demo_point_set_wlop_simplification_and_regularization_plugin.ui) - polyhedron_demo_plugin(point_set_wlop_simplification_and_regularization_plugin Polyhedron_demo_point_set_wlop_simplification_and_regularization_plugin ${point_set_wlop_simplification_and_regularizationUI_FILES}) - target_link_libraries(point_set_wlop_simplification_and_regularization_plugin scene_points_with_normal_item) + qt5_wrap_ui(point_set_wlopFILES Polyhedron_demo_point_set_wlop_plugin.ui) + polyhedron_demo_plugin(point_set_wlop_plugin Polyhedron_demo_point_set_wlop_plugin ${point_set_wlopFILES}) + target_link_libraries(point_set_wlop_plugin scene_points_with_normal_item) qt5_wrap_ui(point_set_bilateral_smoothingUI_FILES Polyhedron_demo_point_set_bilateral_smoothing_plugin.ui) polyhedron_demo_plugin(point_set_bilateral_smoothing_plugin Polyhedron_demo_point_set_bilateral_smoothing_plugin ${point_set_bilateral_smoothingUI_FILES}) diff --git a/Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_wlop_simplification_and_regularization_plugin.cpp b/Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_wlop_plugin.cpp similarity index 88% rename from Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_wlop_simplification_and_regularization_plugin.cpp rename to Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_wlop_plugin.cpp index 294fd961811..f6718007691 100644 --- a/Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_wlop_simplification_and_regularization_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_wlop_plugin.cpp @@ -15,9 +15,9 @@ #include #include -#include "ui_Polyhedron_demo_point_set_wlop_simplification_and_regularization_plugin.h" +#include "ui_Polyhedron_demo_point_set_wlop_plugin.h" -class Polyhedron_demo_point_set_wlop_simplification_and_regularization_plugin : +class Polyhedron_demo_point_set_wlop_plugin : public QObject, public Polyhedron_demo_plugin_helper { @@ -46,7 +46,7 @@ public: public Q_SLOTS: void on_actionSimplifyAndRegularize_triggered(); -}; // end Polyhedron_demo_point_set_wlop_simplification_and_regularization_plugin +}; // end Polyhedron_demo_point_set_wlop_plugin class Point_set_demo_point_set_wlop_simplification_and_regularization_dialog : public QDialog, private Ui::WLOPRegularizationAndSimplificationDialog { @@ -61,7 +61,7 @@ class Point_set_demo_point_set_wlop_simplification_and_regularization_dialog : p double neighborhoodRadius() const { return m_neighborhoodRadius->value(); } }; -void Polyhedron_demo_point_set_wlop_simplification_and_regularization_plugin::on_actionSimplifyAndRegularize_triggered() +void Polyhedron_demo_point_set_wlop_plugin::on_actionSimplifyAndRegularize_triggered() { const Scene_interface::Item_id index = scene->mainSelectionIndex(); @@ -117,4 +117,4 @@ void Polyhedron_demo_point_set_wlop_simplification_and_regularization_plugin::on } } -#include "Polyhedron_demo_point_set_wlop_simplification_and_regularization_plugin.moc" +#include "Polyhedron_demo_point_set_wlop_plugin.moc" diff --git a/Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_wlop_simplification_and_regularization_plugin.ui b/Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_wlop_plugin.ui similarity index 100% rename from Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_wlop_simplification_and_regularization_plugin.ui rename to Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_wlop_plugin.ui diff --git a/Polyhedron/demo/Polyhedron/cgal_test_with_cmake b/Polyhedron/demo/Polyhedron/cgal_test_with_cmake index 42f37245c57..2f49750a143 100755 --- a/Polyhedron/demo/Polyhedron/cgal_test_with_cmake +++ b/Polyhedron/demo/Polyhedron/cgal_test_with_cmake @@ -136,7 +136,7 @@ else point_set_simplification_plugin \ point_set_smoothing_plugin \ point_set_upsampling_plugin \ - point_set_wlop_simplification_and_regularization_plugin \ + point_set_wlop_plugin \ poisson_plugin \ polyhedron_slicer_plugin \ polyhedron_stitching_plugin \