Zero arc precision settings fix.

Denvi · Nov 27, 2015 · e15634a · e15634a
1 parent 8b0b8f2
commit e15634a
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 7 deletions.
diff --git a/frmsettings.ui b/frmsettings.ui
@@ -84,7 +84,7 @@ QGroupBox {
          <rect>
           <x>0</x>
           <y>-274</y>
-          <width>386</width>
+          <width>399</width>
           <height>1184</height>
          </rect>
         </property>
@@ -503,6 +503,22 @@ padding-top: 3;</string>
                 </property>
                </widget>
               </item>
+              <item>
+               <spacer name="horizontalSpacer_15">
+                <property name="orientation">
+                 <enum>Qt::Horizontal</enum>
+                </property>
+                <property name="sizeType">
+                 <enum>QSizePolicy::Fixed</enum>
+                </property>
+                <property name="sizeHint" stdset="0">
+                 <size>
+                  <width>6</width>
+                  <height>20</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
               <item>
                <widget class="QRadioButton" name="radArcDegreeMode">
                 <property name="text">

diff --git a/gcodepreprocessorutils.cpp b/gcodepreprocessorutils.cpp
@@ -455,16 +455,15 @@ QList<QVector3D> GcodePreprocessorUtils::generatePointsAlongArcBDring(PointSegme
 
     int numPoints;
 
-    if (arcDegreeMode) numPoints = qMax(1.0, sweep / (M_PI * arcPrecision / 180));
-    else {
+    if (arcDegreeMode && arcPrecision > 0) {
+        numPoints = qMax(1.0, sweep / (M_PI * arcPrecision / 180));
+    } else {
         if (arcPrecision <= 0 && minArcLength > 0) {
-            arcPrecision = (sweep * radius) / minArcLength;
+            arcPrecision = minArcLength;
         }
         numPoints = (int)ceil(arcLength/arcPrecision);
     }
 
-    qDebug() << "arcPrecision" << arcPrecision << arcDegreeMode << numPoints;
-
     return generatePointsAlongArcBDring(plane, start, end, center, clockwise, radius, startAngle, sweep, numPoints);
 }
 

diff --git a/gcodeviewparse.cpp b/gcodeviewparse.cpp
@@ -80,7 +80,7 @@ QList<LineSegment *> GcodeViewParse::getLinesFromParser(GcodeParser *gp, double
 {
     QList<PointSegment*> psl = gp->getPointSegmentList();
     // For a line segment list ALL arcs must be converted to lines.
-    double minArcLength = 0;
+    double minArcLength = 0.1;
 
 //    Point3d start = null;
 //    Point3d end = null;