Merge branch 'master' of https://github.com/Corna/pcb2gcodeGUI

Author: corna

README.md

@@ -2,7 +2,8 @@
 A simple GUI for pcb2gcode. 
 The minimum required Qt's version is 5.0.2.
 After building it, download and install pcb2gcode
-from https://github.com/patkan/pcb2gcode
+from http://sourceforge.net/projects/pcb2gcode/ (use the
+git version)
 
 ## Build
 ### Build on Debian Jessie/Sid, Ubuntu Trusty/Utopic/Vivid
@@ -27,3 +28,10 @@ and do an apt-update
 	sudo apt-get update
 
 then follow the instructions for Debian Jessie
+
+### Build on Windows
+The easiest way to build pcb2gcodeGUI on windows is by downloading
+the Qt SDK from here http://www.qt.io/download-open-source/ and
+building it within Qt Creator. After that, download a pcb2gcode
+Windows build and put it in a pcb2gcode/ subfolder of the pcb2gcodeGUI
+binary

mainwindow.cpp

@@ -69,7 +69,7 @@ MainWindow::MainWindow(QWidget *parent) :
     args[ COMMONARGS ].insert("optimise", ui->optimiseCheckBox);
     args[ COMMONARGS ].insert("zero-start", ui->zerostartCheckBox);
     args[ COMMONARGS ].insert("mirror-absolute", ui->mirrorabsoluteCheckBox);
-    args[ COMMONARGS ].insert("svg", ui->svgCheckBox);
+    args[ COMMONARGS ].insert("svg", ui->svgLineEdit);
     args[ COMMONARGS ].insert("dpi", ui->dpiSpinBox);
 
     args[ MILLARGS ].insert("zwork", ui->zworkDoubleSpinBox);
@@ -127,6 +127,7 @@ MainWindow::MainWindow(QWidget *parent) :
 
     connect(ui->g64CheckBox, SIGNAL(toggled(bool)), ui->g64DoubleSpinBox, SLOT(setEnabled(bool)));
     connect(ui->filloutlineCheckBox, SIGNAL(toggled(bool)), ui->outlinewidthDoubleSpinBox, SLOT(setEnabled(bool)));
+    connect(ui->svgCheckBox, SIGNAL(toggled(bool)), ui->svgLineEdit, SLOT(setEnabled(bool)));
     connect(ui->startPushButton, SIGNAL(clicked()), this, SLOT(startPcb2gcode()));
     connect(ui->inputMetricRadioButton, SIGNAL(toggled(bool)), this, SLOT(changeMetricInputUnits(bool)));
 
@@ -533,6 +534,7 @@ bool MainWindow::loadConfFile(const QString filename)
         }
 
         ui->g64CheckBox->setChecked(ui->g64DoubleSpinBox->isEnabled());   //Sync checkBox checked state with doubleSpinBox enabled state
+        ui->svgCheckBox->setChecked(ui->svgLineEdit->isEnabled());      //Sync checkBox checked state with lineEdit enabled state
 
         changeMetricImperialValues = true;
         return true;

mainwindow.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>795</width>
-    <height>467</height>
+    <height>504</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -29,7 +29,7 @@
       <x>440</x>
       <y>10</y>
       <width>341</width>
-      <height>391</height>
+      <height>431</height>
      </rect>
     </property>
     <property name="toolTip">
@@ -57,7 +57,7 @@
         <x>10</x>
         <y>10</y>
         <width>317</width>
-        <height>341</height>
+        <height>375</height>
        </rect>
       </property>
       <layout class="QGridLayout" name="commonGridLayout">
@@ -119,7 +119,7 @@
          </property>
         </widget>
        </item>
-       <item row="10" column="1">
+       <item row="11" column="1">
         <widget class="QSpinBox" name="dpiSpinBox">
          <property name="toolTip">
           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Resolution used internally&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@@ -148,7 +148,7 @@
          </property>
         </widget>
        </item>
-       <item row="10" column="0">
+       <item row="11" column="0">
         <widget class="QLabel" name="dpiLabel">
          <property name="toolTip">
           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Resolution used internally&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@@ -216,6 +216,16 @@
          </property>
         </widget>
        </item>
+       <item row="0" column="0">
+        <widget class="QLabel" name="inputValuesLabel">
+         <property name="toolTip">
+          <string/>
+         </property>
+         <property name="text">
+          <string>Input values</string>
+         </property>
+        </widget>
+       </item>
        <item row="2" column="0">
         <widget class="QLabel" name="zsafeLabel">
          <property name="toolTip">
@@ -226,6 +236,23 @@
          </property>
         </widget>
        </item>
+       <item row="10" column="0">
+        <widget class="QLabel" name="svgLabel">
+         <property name="text">
+          <string>svg output file</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0">
+        <widget class="QLabel" name="outputValuesLabel">
+         <property name="toolTip">
+          <string/>
+         </property>
+         <property name="text">
+          <string>Output values</string>
+         </property>
+        </widget>
+       </item>
        <item row="3" column="1">
         <widget class="QDoubleSpinBox" name="zchangeDoubleSpinBox">
          <property name="toolTip">
@@ -248,16 +275,6 @@
          </property>
         </widget>
        </item>
-       <item row="0" column="0">
-        <widget class="QLabel" name="inputValuesLabel">
-         <property name="toolTip">
-          <string/>
-         </property>
-         <property name="text">
-          <string>Input values</string>
-         </property>
-        </widget>
-       </item>
        <item row="0" column="1">
         <layout class="QHBoxLayout" name="inputSystemOfMeasurementHorizontalLayout">
          <item>
@@ -294,16 +311,6 @@
          </item>
         </layout>
        </item>
-       <item row="1" column="0">
-        <widget class="QLabel" name="outputValuesLabel">
-         <property name="toolTip">
-          <string/>
-         </property>
-         <property name="text">
-          <string>Output values</string>
-         </property>
-        </widget>
-       </item>
        <item row="1" column="1">
         <layout class="QHBoxLayout" name="outputSystemOfMeasurementHorizontalLayout">
          <item>
@@ -337,6 +344,13 @@
          </item>
         </layout>
        </item>
+       <item row="10" column="1">
+        <widget class="QLineEdit" name="svgLineEdit">
+         <property name="enabled">
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
       </layout>
      </widget>
     </widget>
@@ -1127,6 +1141,11 @@
            <string>Mach3</string>
           </property>
          </item>
+         <item>
+          <property name="text">
+           <string>Mach4</string>
+          </property>
+         </item>
          <item>
           <property name="text">
            <string>TurboCNC</string>
@@ -1477,7 +1496,7 @@
     <property name="geometry">
      <rect>
       <x>340</x>
-      <y>410</y>
+      <y>450</y>
       <width>131</width>
       <height>23</height>
      </rect>