Change --optimize from bool to double

Updates pcb2gcodeGUI to work with latest pcb2gcode(v2.1.0)

Signed-off-by: Michael Brown <producer@holotronic.dk>

Author: the-snowwhite

mainwindow.cpp

@@ -80,7 +80,7 @@ MainWindow::MainWindow(QWidget *parent) :
     args[ COMMONARGS ].insert("vectorial", ui->vectorialCheckBox);
     args[ COMMONARGS ].insert("nog64", ui->nog64CheckBox);
     args[ COMMONARGS ].insert("tolerance", ui->toleranceDoubleSpinBox);
-    args[ COMMONARGS ].insert("optimise", ui->optimiseCheckBox);
+    args[ COMMONARGS ].insert("optimise", ui->optimiseDoubleSpinBox);
     args[ COMMONARGS ].insert("zero-start", ui->zerostartCheckBox);
     args[ COMMONARGS ].insert("dpi", ui->dpiSpinBox);
     args[ COMMONARGS ].insert("tile-x", ui->tilexSpinBox);
@@ -153,7 +153,6 @@ MainWindow::MainWindow(QWidget *parent) :
     connect(ui->vectorialCheckBox, SIGNAL(toggled(bool)), ui->voronoiCheckBox, SLOT(setEnabled(bool)));
     connect(ui->voronoiCheckBox, SIGNAL(toggled(bool)), this, SLOT(voronoiEnable(bool)));
     connect(ui->filloutlineCheckBox, SIGNAL(toggled(bool)), this, SLOT(fillOutlineEnable(bool)));
-    connect(ui->optimiseCheckBox, SIGNAL(toggled(bool)), this, SLOT(bridgesAvailable()));
     connect(ui->milldrillCheckBox, SIGNAL(toggled(bool)), ui->milldrilldiameterDoubleSpinBox, SLOT(setEnabled(bool)));
     connect(ui->softwareComboBox, SIGNAL(currentTextChanged(QString)), this, SLOT(updateAlCustomEnableState(QString)));
 
@@ -270,7 +269,7 @@ void MainWindow::fillOutlineEnable(bool enable)
 
 void MainWindow::bridgesAvailable()
 {
-    bool bridgesEnabled = ui->vectorialCheckBox->isChecked() || ui->optimiseCheckBox->isChecked();
+    bool bridgesEnabled = ui->vectorialCheckBox->isChecked();
 
     ui->bridgesDoubleSpinBox->setEnabled(bridgesEnabled);
     ui->zbridgesDoubleSpinBox->setEnabled(bridgesEnabled);
@@ -493,7 +492,7 @@ void MainWindow::changeMetricInputUnits(bool metric)
                                                   ui->zdrillDoubleSpinBox, ui->zchangeDoubleSpinBox, ui->cutterdiameterDoubleSpinBox,
                                                   ui->zcutDoubleSpinBox, ui->cutinfeedDoubleSpinBox, ui->outlinewidthDoubleSpinBox,
                                                   ui->bridgesDoubleSpinBox, ui->zbridgesDoubleSpinBox, ui->alxDoubleSpinBox,
-                                                  ui->alyDoubleSpinBox, ui->toleranceDoubleSpinBox };
+                                                  ui->alyDoubleSpinBox, ui->toleranceDoubleSpinBox, ui->optimiseDoubleSpinBox };
 
     QSpinBox *spinBoxes[] = { ui->millfeedSpinBox, ui->drillfeedSpinBox, ui->cutfeedSpinBox, ui->alprobefeedSpinBox };
 

mainwindow.ui

@@ -43,7 +43,7 @@
         <property name="minimumSize">
          <size>
           <width>545</width>
-          <height>485</height>
+          <height>500</height>
          </size>
         </property>
         <property name="toolTip">
@@ -408,6 +408,19 @@
              </property>
             </widget>
            </item>
+           <item row="8" column="0">
+            <widget class="QLabel" name="optimiseLabel">
+             <property name="toolTip">
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;--optimise&lt;/span&gt;&lt;/p&gt;&lt;p&gt;optimise output gcode, reducing its output size up to 95%, while accepting a very little loss of precision&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             </property>
+             <property name="text">
+              <string>optimise val</string>
+             </property>
+             <property name="buddy">
+              <cstring>optimiseDoubleSpinBox</cstring>
+             </property>
+            </widget>
+           </item>
            <item row="2" column="1">
             <widget class="QDoubleSpinBox" name="zsafeDoubleSpinBox">
              <property name="toolTip">
@@ -481,16 +494,31 @@
              </property>
             </widget>
            </item>
-           <item row="8" column="0">
-            <widget class="QCheckBox" name="optimiseCheckBox">
+           <item row="8" column="1">
+            <widget class="QDoubleSpinBox" name="optimiseDoubleSpinBox">
+             <property name="enabled">
+              <bool>true</bool>
+             </property>
              <property name="toolTip">
               <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;--optimise&lt;/span&gt;&lt;/p&gt;&lt;p&gt;optimise output gcode, reducing its output size up to 95%, while accepting a very little loss of precision&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
              </property>
-             <property name="text">
-              <string>Optimise toolpaths</string>
+             <property name="suffix">
+              <string> in</string>
              </property>
-             <property name="checked">
-              <bool>true</bool>
+             <property name="decimals">
+              <number>5</number>
+             </property>
+             <property name="minimum">
+              <double>0.000010000000000</double>
+             </property>
+             <property name="maximum">
+              <double>1.000000000000000</double>
+             </property>
+             <property name="singleStep">
+              <double>0.000010000000000</double>
+             </property>
+             <property name="value">
+              <double>0.000½00000000000</double>
              </property>
             </widget>
            </item>
@@ -2246,7 +2274,7 @@
   <tabstop>vectorialCheckBox</tabstop>
   <tabstop>nog64CheckBox</tabstop>
   <tabstop>toleranceDoubleSpinBox</tabstop>
-  <tabstop>optimiseCheckBox</tabstop>
+  <tabstop>optimiseDoubleSpinBox</tabstop>
   <tabstop>zerostartCheckBox</tabstop>
   <tabstop>dpiSpinBox</tabstop>
   <tabstop>tilexSpinBox</tabstop>