Added Concatenate Toolpath Modifier

noether_gui/CMakeLists.txt

@@ -36,6 +36,7 @@ qt5_wrap_cpp(${PROJECT_NAME}_widget_mocs
   # Tool Path Modifiers
   include/${PROJECT_NAME}/widgets/tool_path_modifiers/circular_lead_in_modifier_widget.h
   include/${PROJECT_NAME}/widgets/tool_path_modifiers/circular_lead_out_modifier_widget.h
+  include/${PROJECT_NAME}/widgets/tool_path_modifiers/concatenate_modifier_widget.h
   include/${PROJECT_NAME}/widgets/tool_path_modifiers/direction_of_travel_orientation_modifier_widget.h
   include/${PROJECT_NAME}/widgets/tool_path_modifiers/fixed_orientation_modifier_widget.h
   include/${PROJECT_NAME}/widgets/tool_path_modifiers/moving_average_orientation_smoothing_modifier_widget.h
@@ -82,6 +83,7 @@ add_library(${PROJECT_NAME} SHARED
   # Tool Path Modifiers
   src/widgets/tool_path_modifiers/circular_lead_in_modifier_widget.cpp
   src/widgets/tool_path_modifiers/circular_lead_out_modifier_widget.cpp
+  src/widgets/tool_path_modifiers/concatenate_modifier_widget.cpp
   src/widgets/tool_path_modifiers/direction_of_travel_orientation_modifier_widget.cpp
   src/widgets/tool_path_modifiers/fixed_orientation_modifier_widget.cpp
   src/widgets/tool_path_modifiers/moving_average_orientation_smoothing_modifier_widget.cpp

noether_gui/include/noether_gui/widgets/tool_path_modifiers/concatenate_modifier_widget.h

@@ -0,0 +1,18 @@
+#pragma once
+
+#include <noether_gui/widgets.h>
+
+#include <noether_tpp/core/tool_path_modifier.h>
+
+namespace noether
+{
+struct ConcatenateModifierWidget : public ToolPathModifierWidget
+{
+  Q_OBJECT
+public:
+  using ToolPathModifierWidget::ToolPathModifierWidget;
+
+  ToolPathModifier::ConstPtr create() const override;
+};
+
+}  // namespace noether

noether_gui/src/plugins.cpp

@@ -14,6 +14,7 @@
 // Tool Path Modifiers
 #include <noether_gui/widgets/tool_path_modifiers/circular_lead_in_modifier_widget.h>
 #include <noether_gui/widgets/tool_path_modifiers/circular_lead_out_modifier_widget.h>
+#include <noether_gui/widgets/tool_path_modifiers/concatenate_modifier_widget.h>
 #include <noether_gui/widgets/tool_path_modifiers/direction_of_travel_orientation_modifier_widget.h>
 #include <noether_gui/widgets/tool_path_modifiers/fixed_orientation_modifier_widget.h>
 #include <noether_gui/widgets/tool_path_modifiers/moving_average_orientation_smoothing_modifier_widget.h>
@@ -97,6 +98,8 @@ using LinearApproachToolPathModifierWidgetPlugin =
 using LinearDepartureToolPathModifierWidgetPlugin =
     WidgetPluginImpl<LinearDepartureToolPathModifierWidget, ToolPathModifierWidget>;
 
+using ConcatenateModifierWidgetPlugin = WidgetPluginImpl<ConcatenateModifierWidget, ToolPathModifierWidget>;
+
 // Raster Tool Path Planners
 struct PlaneSlicerRasterPlannerWidgetPlugin : ToolPathPlannerWidgetPlugin
 {
@@ -146,6 +149,7 @@ EXPORT_TOOL_PATH_MODIFIER_WIDGET_PLUGIN(noether::CircularLeadInToolPathModifierW
 EXPORT_TOOL_PATH_MODIFIER_WIDGET_PLUGIN(noether::CircularLeadOutToolPathModifierWidgetPlugin, CircularLeadOutModifier)
 EXPORT_TOOL_PATH_MODIFIER_WIDGET_PLUGIN(noether::LinearApproachToolPathModifierWidgetPlugin, LinearApproachModifier)
 EXPORT_TOOL_PATH_MODIFIER_WIDGET_PLUGIN(noether::LinearDepartureToolPathModifierWidgetPlugin, LinearDepartureModifier)
+EXPORT_TOOL_PATH_MODIFIER_WIDGET_PLUGIN(noether::ConcatenateModifierWidgetPlugin, ConcatenateModifier)
 
 EXPORT_TPP_WIDGET_PLUGIN(noether::PlaneSlicerRasterPlannerWidgetPlugin, PlaneSlicerRasterPlanner)
 

noether_gui/src/widgets/tool_path_modifiers/concatenate_modifier_widget.cpp

@@ -0,0 +1,9 @@
+#include <noether_gui/widgets/tool_path_modifiers/concatenate_modifier_widget.h>
+
+#include <noether_tpp/tool_path_modifiers/concatenate_modifier.h>
+
+namespace noether
+{
+ToolPathModifier::ConstPtr ConcatenateModifierWidget::create() const { return std::make_unique<ConcatenateModifier>(); }
+
+}  // namespace noether

noether_tpp/CMakeLists.txt

@@ -42,6 +42,7 @@ add_library(${PROJECT_NAME} SHARED
   src/tool_path_modifiers/circular_lead_in_modifier.cpp
   src/tool_path_modifiers/circular_lead_out_modifier.cpp
   src/tool_path_modifiers/compound_modifier.cpp
+  src/tool_path_modifiers/concatenate_modifier.cpp
   src/tool_path_modifiers/direction_of_travel_orientation_modifier.cpp
   src/tool_path_modifiers/fixed_orientation_modifier.cpp
   src/tool_path_modifiers/moving_average_orientation_smoothing_modifier.cpp

noether_tpp/include/noether_tpp/tool_path_modifiers/concatenate_modifier.h

@@ -0,0 +1,19 @@
+#pragma once
+
+#include <noether_tpp/core/tool_path_modifier.h>
+
+namespace noether
+{
+/**
+ * @brief Combines existing toolpaths into one toolpath
+ * @details A RasterOrganizationModifier is first used to organize the tool paths into a raster pattern. The tool paths
+ * are then looped through to create a single concatenated toolpath.
+ */
+struct ConcatenateModifier : OneTimeToolPathModifier
+{
+  using OneTimeToolPathModifier::OneTimeToolPathModifier;
+
+  ToolPaths modify(ToolPaths) const override;
+};
+
+}  // namespace noether

noether_tpp/src/tool_path_modifiers/concatenate_modifier.cpp

@@ -0,0 +1,32 @@
+#include <noether_tpp/tool_path_modifiers/concatenate_modifier.h>
+#include <noether_tpp/tool_path_modifiers/raster_organization_modifier.h>
+#include <noether_tpp/utils.h>
+
+#include <numeric>
+
+namespace noether
+{
+ToolPaths ConcatenateModifier::modify(ToolPaths tool_paths) const
+{
+  // Create a raster
+  RasterOrganizationModifier raster;
+  tool_paths = raster.modify(tool_paths);
+  ToolPath combined_tool_path;
+  ToolPaths combined_tool_paths;
+
+  // Loop through the existing toolpaths to create a single combined toolpath
+  for (std::size_t i = 0; i < tool_paths.size(); i += 1)
+  {
+    ToolPath& tool_path = tool_paths.at(i);
+
+    for (ToolPathSegment& segment : tool_path)
+    {
+      combined_tool_path.push_back(segment);
+    }
+  }
+  combined_tool_paths.push_back(combined_tool_path);
+
+  return combined_tool_paths;
+}
+
+}  // namespace noether