dxfngc

@@ -489,6 +489,26 @@ bool CmdParser::procCmd_set_precision(std::istream &strm)

   return true;

 }

+/**

+ * @brief process set_rotation_z command

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

+ * @return if processing command was successful

+ */

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

+{

+  // get arguments

+  double z_angle;

+  strm >> z_angle;

+  if (strm.fail()) {

+    std::cerr << "missing Z axis rotation angle" << std::endl;

+    return false;

+  }

+

+  // update settings

+  mSettings.rotation_z = z_angle;

+  return true;

+}

+

 /**

  * @brief process set_tool_diameter command

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

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

     return procCmd_set_layer_mode(strm);

   else if (cmd == "set_move_z")

     return procCmd_set_move_z(strm);

+  else if (cmd == "set_rotation_z")

+    return procCmd_set_rotation_z(strm);

   else if (cmd == "set_offset_x")

     return procCmd_set_offset_x(strm);

   else if (cmd == "set_offset_y")

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

    */

   bool procCmd_set_precision(std::istream &strm);

+  /**

+   * @brief process set_rotation_z command

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

+   * @return if processing command was successful

+   */

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

+

   /**

    * @brief process set_tool_diameter command

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

@@ -3,6 +3,7 @@

  * Copyleft: CC-BY-SA http://creativecommons.org/licenses/by-sa/3.0/

  */

+#include <math.h>

 #include <vector>

 #include "gcode.h"

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

  */

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

 {

+  double rot =  settings.rotation_z * M_PI / 180.0;

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

   // leave if no points

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

   gcode.appendUp(settings.move_z);

   // move to start

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

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

   // dwell

   if (settings.dwell_time > 0.0)

@@ -117,7 +119,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 + offset);

+    gcode.appendLinear(pt->rotate(rot) + offset);

   // move up

   gcode.appendUp(settings.move_z);

@@ -92,3 +92,17 @@ bool Point::equals(const Point &that, double eqDist) const

   return (*this - that).abs_sq() <= eqDist * eqDist;

 }

+/**

+ * @brief rotate around origin

+ * @param[in] rad angle in radians

+ * @return rotated point

+ */

+Point Point::rotate(double rad) const

+{

+  double c = cos(rad);

+  double s = sin(rad);

+  double rx = mX * c - mY * s;

+  double ry = mY * c + mX * s;

+  return Point(rx, ry);

+}

+

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

    */

   bool equals(const Point &that, double eqDist) const;

+  /**

+   * @brief rotate around origin

+   * @param[in] rad angle in radians

+   * @return rotated point

+   */

+  Point rotate(double rad) const;

+

   double mX; ///< x coordinate

   double mY; ///< y coordinate

 };

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

   offset_x(0.0),

   offset_y(0.0),

   precision(0.001),

+  rotation_z(00.0),

   tool_diameter(1.0)

 {

 }

@@ -29,6 +29,7 @@ public:

   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    rotation_z;    ///< rotation around Z axis in degrees

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

 };