Merge branch 'dev' into dspielman/update/boost_plugin_loader_0_4_2

Author: DavidSpielman

noether_gui/CMakeLists.txt

@@ -69,12 +69,13 @@ add_library(
   src/widgets/tool_path_modifiers/uniform_spacing_spline_modifier_widget.cpp
   src/widgets/tool_path_modifiers/uniform_spacing_linear_modifier_widget.cpp
   # Mesh Modifiers
-  src/widgets/mesh_modifiers/cylinder_projection_modifier_widget.cpp
   src/widgets/mesh_modifiers/euclidean_clustering_modifier_widget.cpp
   src/widgets/mesh_modifiers/fill_holes_modifier_widget.cpp
   src/widgets/mesh_modifiers/normal_estimation_pcl_widget.cpp
   src/widgets/mesh_modifiers/normals_from_mesh_faces_modifier_widget.cpp
-  src/widgets/mesh_modifiers/plane_projection_modifier_widget.cpp
+  src/widgets/mesh_modifiers/ransac_primitive_fit_modifier_widget.cpp
+  src/widgets/mesh_modifiers/ransac_cylinder_fit_modifier_widget.cpp
+  src/widgets/mesh_modifiers/ransac_plane_fit_modifier_widget.cpp
   # Resources
   resources/resource.qrc
 )

noether_gui/include/noether_gui/widgets/mesh_modifiers/plane_projection_modifier_widget.h

@@ -0,0 +1,42 @@
+#pragma once
+
+#include <noether_gui/widgets/mesh_modifiers/ransac_primitive_fit_modifier_widget.h>
+
+class QSpinBox;
+class QCheckBox;
+
+namespace Ui
+{
+class RansacCylinderProjection;
+class Vector3dEditor;
+}  // namespace Ui
+
+namespace noether
+{
+class RansacCylinderProjectionMeshModifierWidget : public RansacPrimitiveFitMeshModifierWidget
+{
+public:
+  RansacCylinderProjectionMeshModifierWidget(QWidget* parent = nullptr);
+
+  void configure(const YAML::Node& config) override;
+  void save(YAML::Node& config) const override;
+
+protected:
+  Ui::RansacCylinderProjection* model_ui_;
+  Ui::Vector3dEditor* axis_;
+};
+
+class RansacCylinderFitMeshModifierWidget : public RansacCylinderProjectionMeshModifierWidget
+{
+public:
+  RansacCylinderFitMeshModifierWidget(QWidget* parent);
+
+  void configure(const YAML::Node& config) override;
+  void save(YAML::Node& config) const override;
+
+protected:
+  QSpinBox* resolution_;
+  QCheckBox* include_caps_;
+};
+
+}  // namespace noether

noether_gui/include/noether_gui/widgets/mesh_modifiers/ransac_cylinder_fit_modifier_widget.h

@@ -0,0 +1,18 @@
+#pragma once
+
+#include <noether_gui/widgets/mesh_modifiers/ransac_primitive_fit_modifier_widget.h>
+
+namespace noether
+{
+/**
+ * @ingroup gui_widgets_mesh_modifiers
+ */
+class RansacPlaneProjectionMeshModifierWidget : public RansacPrimitiveFitMeshModifierWidget
+{
+public:
+  using RansacPrimitiveFitMeshModifierWidget::RansacPrimitiveFitMeshModifierWidget;
+
+  void save(YAML::Node&) const override;
+};
+
+}  // namespace noether

noether_gui/include/noether_gui/widgets/mesh_modifiers/ransac_plane_fit_modifier_widget.h

@@ -4,22 +4,22 @@
 
 namespace Ui
 {
-class CylinderSegmentation;
+class RansacPrimitiveFit;
 class Vector3dEditor;
 }  // namespace Ui
 
 namespace noether
 {
-class CylinderProjectionModifierWidget : public BaseWidget
+class RansacPrimitiveFitMeshModifierWidget : public BaseWidget
 {
 public:
-  CylinderProjectionModifierWidget(QWidget* parent = nullptr);
+  RansacPrimitiveFitMeshModifierWidget(QWidget* parent = nullptr);
 
   void configure(const YAML::Node& config) override;
   void save(YAML::Node& config) const override;
 
 protected:
-  Ui::CylinderSegmentation* ui_;
+  Ui::RansacPrimitiveFit* ui_;
   Ui::Vector3dEditor* axis_;
 };
 

noether_gui/include/noether_gui/widgets/mesh_modifiers/cylinder_projection_modifier_widget.h renamed to noether_gui/include/noether_gui/widgets/mesh_modifiers/ransac_primitive_fit_modifier_widget.h

@@ -32,12 +32,12 @@
 #include <noether_gui/widgets/tool_path_modifiers/uniform_spacing_spline_modifier_widget.h>
 #include <noether_gui/widgets/tool_path_modifiers/uniform_spacing_linear_modifier_widget.h>
 // Mesh Modifiers
-#include <noether_gui/widgets/mesh_modifiers/cylinder_projection_modifier_widget.h>
-#include <noether_gui/widgets/mesh_modifiers/plane_projection_modifier_widget.h>
 #include <noether_gui/widgets/mesh_modifiers/euclidean_clustering_modifier_widget.h>
+#include <noether_gui/widgets/mesh_modifiers/fill_holes_modifier_widget.h>
 #include <noether_gui/widgets/mesh_modifiers/normal_estimation_pcl_widget.h>
 #include <noether_gui/widgets/mesh_modifiers/normals_from_mesh_faces_modifier_widget.h>
-#include <noether_gui/widgets/mesh_modifiers/fill_holes_modifier_widget.h>
+#include <noether_gui/widgets/mesh_modifiers/ransac_cylinder_fit_modifier_widget.h>
+#include <noether_gui/widgets/mesh_modifiers/ransac_plane_fit_modifier_widget.h>
 
 #include <QWidget>
 #include <QMessageBox>
@@ -46,13 +46,14 @@
 namespace noether
 {
 // Mesh Modifiers
-EXPORT_SIMPLE_MESH_MODIFIER_WIDGET_PLUGIN(CylinderProjectionModifierWidget, CylinderSegmentation)
 EXPORT_SIMPLE_MESH_MODIFIER_WIDGET_PLUGIN(EuclideanClusteringMeshModifierWidget, EuclideanClustering)
 EXPORT_SIMPLE_MESH_MODIFIER_WIDGET_PLUGIN(FillHolesModifierWidget, FillHoles)
 EXPORT_SIMPLE_MESH_MODIFIER_WIDGET_PLUGIN(NormalEstimationPCLMeshModifierWidget, NormalEstimationPCL)
 EXPORT_SIMPLE_MESH_MODIFIER_WIDGET_PLUGIN(NormalsFromMeshFacesMeshModifierWidget, NormalsFromMeshFaces)
+EXPORT_SIMPLE_MESH_MODIFIER_WIDGET_PLUGIN(RansacCylinderFitMeshModifierWidget, RansacCylinderFit)
+EXPORT_SIMPLE_MESH_MODIFIER_WIDGET_PLUGIN(RansacCylinderProjectionMeshModifierWidget, RansacCylinderProjection)
 //! [GUI Plugin Alias Correspondence]
-EXPORT_SIMPLE_MESH_MODIFIER_WIDGET_PLUGIN(PlaneProjectionMeshModifierWidget, PlaneProjection)
+EXPORT_SIMPLE_MESH_MODIFIER_WIDGET_PLUGIN(RansacPlaneProjectionMeshModifierWidget, RansacPlaneProjection)
 //! [GUI Plugin Alias Correspondence]
 
 // Direction Generators