dxfngc

@@ -5,6 +5,7 @@ cmd G17

 cmd G40

 cmd G49

+set_precision 0.01

 set_tool_diameter 3

 set_move_z 3

 set_base_z 0

@@ -5,6 +5,7 @@

 #include <fstream>

 #include <iostream>

+#include <math.h>

 #include <sstream>

 #include <string>

@@ -220,6 +221,30 @@ bool CmdParser::procCmd_set_move_z(std::istream &strm)

   return true;

 }

+/**

+ * @brief process set_precision command

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

+ * @return if processing command was successful

+ */

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

+{

+  // get arguments and check them

+  double precision;

+  strm >> precision;

+  if (strm.fail()) {

+    std::cerr << "missing precision" << std::endl;

+    return false;

+  }

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

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

+    return false;

+  }

+

+  // update settings

+  mSettings.precision = precision;

+  return true;

+}

+

 /**

  * @brief process set_tool_diameter command

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

@@ -262,8 +287,11 @@ bool CmdParser::procCmd_write_ngc(std::istream &strm)

   // re-base NGC file name

   fileName = filename_rebase(fileName, mBaseDir);

+  // calculate number of digits after decimal point

+  unsigned int digits = (unsigned int)ceil(-log10(mSettings.precision));

+

   // write NGC file

-  if (!mGCode.toFile(fileName)) {

+  if (!mGCode.toFile(fileName, digits)) {

     std::cerr << "could not write NGC file \"" << fileName << "\""

               << std::endl;

     return false;

@@ -306,6 +334,8 @@ 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_precision")

+    return procCmd_set_precision(strm);

   else if (cmd == "set_tool_diameter")

     return procCmd_set_tool_diameter(strm);

   else if (cmd == "write_ngc")

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

    */

   bool procCmd_set_move_z(std::istream &strm);

+  /**

+   * @brief process set_precision command

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

+   * @return if processing command was successful

+   */

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

+

   /**

    * @brief process set_tool_diameter command

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

@@ -100,9 +100,13 @@ void GCode::appendCustom(const std::string &cmd)

 /**

  * @brief output G-code to stream

  * @param[in] strm stream to write G-code to

+ * @param[in] digits number of digits to output after decimal point

  */

-void GCode::toStrm(std::ostream &strm) const

+void GCode::toStrm(std::ostream &strm, unsigned int digits) const

 {

+  strm.precision(digits);

+  strm << std::fixed;

+

   GCmds::const_iterator gcmd;

   for (gcmd = mGCmds.begin(); gcmd != mGCmds.end(); ++gcmd)

     (*gcmd)->toStrm(strm);

@@ -111,9 +115,10 @@ void GCode::toStrm(std::ostream &strm) const

 /**

  * @brief output G-code to file

  * @param[in] strFileName name of file to write G-code to

+   * @param[in] digits number of digits to output after decimal point

  * @return if writing G-code was successful

  */

-bool GCode::toFile(const std::string &strFileName) const

+bool GCode::toFile(const std::string &strFileName, unsigned int digits) const

 {

   std::ofstream ofstrm(strFileName.c_str(), std::ios::out);

   if (!ofstrm.is_open()) {

@@ -122,7 +127,7 @@ bool GCode::toFile(const std::string &strFileName) const

     return false;

   }

-  toStrm(ofstrm);

+  toStrm(ofstrm, digits);

   return true;

 }

@@ -72,15 +72,17 @@ public:

   /**

    * @brief output G-code to stream

    * @param[in] strm stream to write G-code to

+   * @param[in] digits number of digits to output after decimal point

    */

-  void toStrm(std::ostream &strm) const;

+  void toStrm(std::ostream &strm, unsigned int digits) const;

   /**

    * @brief output G-code to file

    * @param[in] strFileName name of file to write G-code to

+   * @param[in] digits number of digits to output after decimal point

    * @return if writing G-code was successful

    */

-  bool toFile(const std::string &strFileName) const;

+  bool toFile(const std::string &strFileName, unsigned int digits) const;

   /// G-code commands

   GCmds mGCmds;

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

   feed_drill(10.0),

   feed_mill(10.0),

   move_z(10.0),

+  precision(0.001),

   tool_diameter(0.0)

 {

 }

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

   double feed_drill;    ///< feed rate for drilling

   double feed_mill;     ///< feed rate for milling

   double move_z;        ///< z coordinate for moving

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

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

 };