dxfngc

@@ -27,8 +27,10 @@ set_offset_y 0

 set_cut_z -2

 cut_pocket pocket

+set_layer_mode path_by_path

 set_cut_z -2

 cut_inside inner_test

+set_layer_mode level_by_level

 set_cut_z -2

 cut_outside outer_test

@@ -288,7 +288,8 @@ bool CmdParser::procCmd_set_cut_z_step(std::istream &strm)

     return false;

   }

   if (z <= 0.0) {

-    std::cerr << "invalid z cut step value (" << z << ")" << std::endl;

+    std::cerr << "invalid z cut step value (" << z

+              << ", expected > 0.0)" << std::endl;

     return false;

   }

@@ -312,7 +313,8 @@ bool CmdParser::procCmd_set_dwell_time(std::istream &strm)

     return false;

   }

   if (dwell_time < 0.0) {

-    std::cerr << "invalid dwell time (" << dwell_time << ")" << std::endl;

+    std::cerr << "invalid dwell time (" << dwell_time

+              << ", expected >= 0.0)" << std::endl;

     return false;

   }

@@ -336,7 +338,8 @@ bool CmdParser::procCmd_set_feed_drill(std::istream &strm)

     return false;

   }

   if (feed <= 0.0) {

-    std::cerr << "invalid feed rate (" << feed << ")" << std::endl;

+    std::cerr << "invalid feed rate (" << feed

+              << ", expected > 0.0)" << std::endl;

     return false;

   }

@@ -360,7 +363,8 @@ bool CmdParser::procCmd_set_feed_mill(std::istream &strm)

     return false;

   }

   if (feed <= 0.0) {

-    std::cerr << "invalid feed rate (" << feed << ")" << std::endl;

+    std::cerr << "invalid feed rate (" << feed

+              << ", expected > 0.0)" << std::endl;

     return false;

   }

@@ -369,6 +373,37 @@ bool CmdParser::procCmd_set_feed_mill(std::istream &strm)

   return true;

 }

+/**

+ * @brief process set_layer_mode command

+ * @param[in] strm stream to read command arguments from

+ * @return if processing command was successful

+ */

+bool CmdParser::procCmd_set_layer_mode(std::istream &strm)

+{

+  // get arguments

+  std::string layer_mode_str;

+  strm >> layer_mode_str;

+  if (strm.fail()) {

+    std::cerr << "missing layer mode (\"level_by_level\", \"path_by_path\")"

+              << std::endl;

+    return false;

+  }

+

+  // check argument and update settings

+  if (layer_mode_str == "level_by_level") {

+    mSettings.layer_mode = Settings::LevelByLevel;

+    return true;

+  } else if (layer_mode_str == "path_by_path") {

+    mSettings.layer_mode = Settings::PathByPath;

+    return true;

+  } else {

+    std::cerr << "invalid layer mode (\"" << layer_mode_str

+              << "\", expected: \"level_by_level\", \"path_by_path\")"

+              << std::endl;

+    return false;

+  }

+}

+

 /**

  * @brief process set_move_z command

  * @param[in] strm stream to read command arguments from

@@ -444,7 +479,8 @@ bool CmdParser::procCmd_set_precision(std::istream &strm)

     return false;

   }

   if (precision < 1.0e-8 || precision > 1.0) {

-    std::cerr << "invalid precision (" << precision << ")" << std::endl;

+    std::cerr << "invalid precision (" << precision

+              << ", expected 1.0e-8 ... 1.0)" << std::endl;

     return false;

   }

@@ -468,7 +504,8 @@ bool CmdParser::procCmd_set_tool_diameter(std::istream &strm)

     return false;

   }

   if (diameter < 0.0) {

-    std::cerr << "invalid tool diameter (" << diameter << ")" << std::endl;

+    std::cerr << "invalid tool diameter (" << diameter

+              << ", expected >= 0.0)" << std::endl;

     return false;

   }

@@ -548,6 +585,8 @@ bool CmdParser::procLine(const std::string &strLine)

     return procCmd_set_feed_drill(strm);

   else if (cmd == "set_feed_mill")

     return procCmd_set_feed_mill(strm);

+  else if (cmd == "set_layer_mode")

+    return procCmd_set_layer_mode(strm);

   else if (cmd == "set_move_z")

     return procCmd_set_move_z(strm);

   else if (cmd == "set_offset_x")

@@ -123,6 +123,13 @@ public:

    */

   bool procCmd_set_feed_mill(std::istream &strm);

+  /**

+   * @brief process set_layer_mode command

+   * @param[in] strm stream to read command arguments from

+   * @return if processing command was successful

+   */

+  bool procCmd_set_layer_mode(std::istream &strm);

+

   /**

    * @brief process set_move_z command

    * @param[in] strm stream to read command arguments from

@@ -124,18 +124,46 @@ void Layer::improvePaths(double eqDist)

  */

 void Layer::toGCode(const Settings &settings, GCode &gcode) const

 {

+  double z;

+  Paths::const_iterator path;

+

+  switch (settings.layer_mode) {

+

+    case Settings::LevelByLevel:

+

       // cut step-wise

-  double z = settings.base_z;

+      z = settings.base_z;

       do {

         z -= settings.cut_z_step;

         if (z < settings.cut_z)

           z = settings.cut_z;

-    // cut path at current z

-    Paths::const_iterator path;

+        // cut all paths at current z

         for (path = mPaths.begin(); path != mPaths.end(); ++path)

           path->toGCode(settings, z, gcode);

       } while (z > settings.cut_z);

+

+      break;

+

+    case Settings::PathByPath:

+

+      // cut each path

+      for (path = mPaths.begin(); path != mPaths.end(); ++path) {

+

+        // cut current path step-wise

+        z = settings.base_z;

+        do {

+          z -= settings.cut_z_step;

+          if (z < settings.cut_z)

+            z = settings.cut_z;

+          path->toGCode(settings, z, gcode);

+        } while (z > settings.cut_z);

+

+      } // for path

+

+      break;

+

+  } // switch (settings.layer_mode)

 }

@@ -13,6 +13,7 @@ Settings::Settings():

   dwell_time(0.0),

   feed_drill(10.0),

   feed_mill(10.0),

+  layer_mode(LevelByLevel),

   move_z(10.0),

   offset_x(0.0),

   offset_y(0.0),

@@ -9,15 +9,22 @@

 /// settings for creation of G-code

 class Settings {

 public:

+  /// layer mode

+  enum LayerMode {

+    LevelByLevel, ///< cut all paths at the each level (z), then next level

+    PathByPath,   ///< cut each path all the way down, then next path

+  };

+

   /// set some reasonable/safe default settings

   Settings();

   double    base_z;        ///< z coordinate of workpiece surface

   double    cut_z;         ///< z coordinate of maximum cutting

-  double cut_z_step;    ///< z coordinate difference to cut in one step, > 0.0

-  double dwell_time;    ///< dwell time before cutting each path (in seconds)

+  double    cut_z_step;    ///< z coordinate delta to cut in one step, > 0.0

+  double    dwell_time;    ///< dwell time before cutting each path (in sec)

   double    feed_drill;    ///< feed rate for drilling

   double    feed_mill;     ///< feed rate for milling

+  LayerMode layer_mode;    ///< layer cutting mode (see LayerMode)

   double    move_z;        ///< z coordinate for moving

   double    offset_x;      ///< offset to add to X coordinate

   double    offset_y;      ///< offset to add to Y coordinate