From 740d865f0944f4bde2ca0560a8862efacbf594ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Fri, 27 Jul 2012 10:53:31 +0000 Subject: [PATCH] remove local_spacing plugin that was needed for splatting --- .gitattributes | 1 - Polyhedron/demo/Polyhedron/CMakeLists.txt | 3 - ...on_demo_point_set_local_spacing_plugin.cpp | 80 ------------------- .../demo/Polyhedron/cgal_test_with_cmake | 1 - 4 files changed, 85 deletions(-) delete mode 100644 Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_local_spacing_plugin.cpp diff --git a/.gitattributes b/.gitattributes index 1b931877597..d51c153af75 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3183,7 +3183,6 @@ Polyhedron/demo/Polyhedron/Polyhedron_demo_corefinement_plugin.cpp -text Polyhedron/demo/Polyhedron/Polyhedron_demo_normal_estimation_plugin.cpp -text Polyhedron/demo/Polyhedron/Polyhedron_demo_normal_estimation_plugin.ui -text Polyhedron/demo/Polyhedron/Polyhedron_demo_off_to_xyz_plugin.cpp -text -Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_local_spacing_plugin.cpp -text Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_outliers_removal_plugin.cpp -text Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_outliers_removal_plugin.ui -text Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_simplification_plugin.ui -text diff --git a/Polyhedron/demo/Polyhedron/CMakeLists.txt b/Polyhedron/demo/Polyhedron/CMakeLists.txt index 1b6692fc0f1..f2de48b0f1f 100644 --- a/Polyhedron/demo/Polyhedron/CMakeLists.txt +++ b/Polyhedron/demo/Polyhedron/CMakeLists.txt @@ -359,9 +359,6 @@ if(CGAL_Qt4_FOUND AND QT4_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND) polyhedron_demo_plugin(point_set_smoothing_plugin Polyhedron_demo_point_set_smoothing_plugin) target_link_libraries(point_set_smoothing_plugin scene_points_with_normal_item) - polyhedron_demo_plugin(point_set_local_spacing_plugin Polyhedron_demo_point_set_local_spacing_plugin) - target_link_libraries(point_set_local_spacing_plugin scene_points_with_normal_item) - polyhedron_demo_plugin(point_set_average_spacing_plugin Polyhedron_demo_point_set_average_spacing_plugin) target_link_libraries(point_set_average_spacing_plugin scene_points_with_normal_item) diff --git a/Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_local_spacing_plugin.cpp b/Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_local_spacing_plugin.cpp deleted file mode 100644 index cd0066f7f52..00000000000 --- a/Polyhedron/demo/Polyhedron/Polyhedron_demo_point_set_local_spacing_plugin.cpp +++ /dev/null @@ -1,80 +0,0 @@ -#include "config.h" -#include "Scene_points_with_normal_item.h" -#include "Polyhedron_demo_plugin_helper.h" -#include "Polyhedron_demo_plugin_interface.h" - -#include -#include -#include -#include -#include -#include - -class Polyhedron_demo_point_set_local_spacing_plugin : - public QObject, - public Polyhedron_demo_plugin_helper -{ - Q_OBJECT - Q_INTERFACES(Polyhedron_demo_plugin_interface) - -public: - void init(QMainWindow* mainWindow, Scene_interface* scene_interface) { - actionRadiusFromDensity = new QAction(tr("Point set local spacing"), mainWindow); - actionRadiusFromDensity->setObjectName("actionRadiusFromDensity"); - - Polyhedron_demo_plugin_helper::init(mainWindow, scene_interface); - } - - QList actions() const { - return QList() << actionRadiusFromDensity; - } - - //! Applicable if the currently selected item is a - //! points_with_normal_item. - bool applicable() const { - return qobject_cast(scene->item(scene->mainSelectionIndex())); - } -public slots: - void on_actionRadiusFromDensity_triggered(); - -private: - QAction* actionRadiusFromDensity; -}; // end Polyhedron_demo_point_set_local_spacing_plugin - -void Polyhedron_demo_point_set_local_spacing_plugin::on_actionRadiusFromDensity_triggered() -{ - const Scene_interface::Item_id index = scene->mainSelectionIndex(); - - Scene_points_with_normal_item* item = - qobject_cast(scene->item(index)); - - if(item) - { - // Check there is a point set - if(item->point_set() == NULL) - return; - - // Gets options - bool ok; - const int k = - QInputDialog::getInteger((QWidget*)mw, - tr("Local spacing"), // dialog title - tr("Number of neighbors:"), // field label - 6, // default value = small - 1, // min - 1000, // max - 1, // step - &ok); - if(!ok) return; - - QApplication::setOverrideCursor(Qt::WaitCursor); - - item->computes_local_spacing(k); - - QApplication::restoreOverrideCursor(); - } -} - -Q_EXPORT_PLUGIN2(Polyhedron_demo_point_set_local_spacing_plugin, Polyhedron_demo_point_set_local_spacing_plugin) - -#include "Polyhedron_demo_point_set_local_spacing_plugin.moc" diff --git a/Polyhedron/demo/Polyhedron/cgal_test_with_cmake b/Polyhedron/demo/Polyhedron/cgal_test_with_cmake index 53f258dd9ab..66038a63f0f 100755 --- a/Polyhedron/demo/Polyhedron/cgal_test_with_cmake +++ b/Polyhedron/demo/Polyhedron/cgal_test_with_cmake @@ -135,7 +135,6 @@ else subdivision_methods_plugin \ triangulate_facets_plugin \ point_set_average_spacing_plugin \ - point_set_local_spacing_plugin \ point_set_outliers_removal_plugin \ point_set_simplification_plugin \ point_set_smoothing_plugin \