dxfngc

@@ -18,6 +18,12 @@ read_dxf millme.dxf

 set_cut_z -1

 cut text

+set_offset_x 0.5

+set_offset_y 0.3

+cut text

+set_offset_x 0

+set_offset_y 0

+

 set_cut_z -2

 cut_pocket pocket

@@ -365,6 +365,46 @@ bool CmdParser::procCmd_set_move_z(std::istream &strm)

   return true;

 }

+/**

+ * @brief process set_offset_x command

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

+ * @return if processing command was successful

+ */

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

+{

+  // get arguments

+  double x;

+  strm >> x;

+  if (strm.fail()) {

+    std::cerr << "missing x coordinate" << std::endl;

+    return false;

+  }

+

+  // update settings

+  mSettings.offset_x = x;

+  return true;

+}

+

+/**

+ * @brief process set_offset_y command

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

+ * @return if processing command was successful

+ */

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

+{

+  // get arguments

+  double y;

+  strm >> y;

+  if (strm.fail()) {

+    std::cerr << "missing y coordinate" << std::endl;

+    return false;

+  }

+

+  // update settings

+  mSettings.offset_y = y;

+  return true;

+}

+

 /**

  * @brief process set_precision command

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

@@ -484,6 +524,10 @@ bool CmdParser::procLine(const std::string &strLine)

     return procCmd_set_feed_mill(strm);

   else if (cmd == "set_move_z")

     return procCmd_set_move_z(strm);

+  else if (cmd == "set_offset_x")

+    return procCmd_set_offset_x(strm);

+  else if (cmd == "set_offset_y")

+    return procCmd_set_offset_y(strm);

   else if (cmd == "set_precision")

     return procCmd_set_precision(strm);

   else if (cmd == "set_tool_diameter")

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

    */

   bool procCmd_set_move_z(std::istream &strm);

+  /**

+   * @brief process set_offset_x command

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

+   * @return if processing command was successful

+   */

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

+

+  /**

+   * @brief process set_offset_y command

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

+   * @return if processing command was successful

+   */

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

+

   /**

    * @brief process set_precision command

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

@@ -93,6 +93,8 @@ void Path::removeEqPoints(double eqDist)

  */

 void Path::toGCode(const Settings &settings, double z, GCode &gcode) const

 {

+  Point offset(settings.offset_x, settings.offset_y);

+

   // leave if no points

   if (mPoints.empty())

     return;

@@ -101,7 +103,7 @@ void Path::toGCode(const Settings &settings, double z, GCode &gcode) const

   gcode.appendUp(settings.move_z);

   // move to start

-  gcode.appendFast(mPoints.front());

+  gcode.appendFast(mPoints.front() + offset);

   // cut down

   gcode.appendFeed(settings.feed_drill);

@@ -111,7 +113,7 @@ void Path::toGCode(const Settings &settings, double z, GCode &gcode) const

   gcode.appendFeed(settings.feed_mill);

   Points::const_iterator pt = mPoints.begin();

   for (++pt; pt != mPoints.end(); ++pt)

-    gcode.appendLinear(*pt);

+    gcode.appendLinear(*pt + offset);

   // move up

   gcode.appendUp(settings.move_z);

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

   feed_drill(10.0),

   feed_mill(10.0),

   move_z(10.0),

+  offset_x(0.0),

+  offset_y(0.0),

   precision(0.001),

   tool_diameter(1.0)

 {

@@ -18,6 +18,8 @@ public:

   double feed_drill;    ///< feed rate for drilling

   double feed_mill;     ///< feed rate for milling

   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

   double precision;     ///< precision, >= 1.0e-8 , <= 1.0

   double tool_diameter; ///< diameter of cutting tool, >= 0.0

 };