Simplified arguments structure

Author: corna

argaction.cpp

@@ -152,7 +152,7 @@ bool argAction::setValue(const QString key, const QString value)
     return false;
 }
 
-QStringList argAction::getAllArgs(bool getCommentedOptions)
+QStringList argAction::getAllArgs(const QString prepend, bool getCommentedOptions)
 {
     QStringList output;
     QString value;
@@ -163,10 +163,10 @@ QStringList argAction::getAllArgs(bool getCommentedOptions)
         if ( !value.isEmpty() )
         {
             if( static_cast<QWidget *>(i.value().object)->isEnabled() )
-                output << i.key() + '=' + value;
+                output << prepend + i.key() + '=' + value;
             else
                 if(getCommentedOptions)
-                    output << "#@#" + i.key() + '=' + value;
+                    output << prepend + "#@#" + i.key() + '=' + value;
         }
     }
 

argaction.h

@@ -66,21 +66,15 @@ class argAction
     };
 
     QMap<QString,argElement> argList;
-    bool stringMarks;
 
 public:
     explicit argAction();
     ~argAction();
 
     bool setValue(const QString key, const QString value);
-    QStringList getAllArgs(bool getCommentedOptions);
+    QStringList getAllArgs(const QString prepend, bool getCommentedOptions);
     bool setEnabled(const QString key, const bool enabled);
 
-    inline void setStringMarks (bool stringMarks)
-    {
-        this->stringMarks = stringMarks;
-    }
-
     inline void insert( const QString argName, QDoubleSpinBox *doubleSpinBox)
     {
         argList.insert( argName, (argElement){ .setFunction = &setDoubleSpinBox, .getFunction = &getDoubleSpinBox,

mainwindow.cpp

@@ -106,8 +106,8 @@ MainWindow::MainWindow(QWidget *parent) :
     args[ AUTOLEVELLERARGS ].insert("al-x", ui->alxDoubleSpinBox);
     args[ AUTOLEVELLERARGS ].insert("al-y", ui->alyDoubleSpinBox);
     args[ AUTOLEVELLERARGS ].insert("al-probefeed", ui->alprobefeedSpinBox);
-    args[ AUTOLEVELLERARGS ].insert("al-probeon", ui->alprobeonLineEdit);
-    args[ AUTOLEVELLERARGS ].insert("al-probeoff", ui->alprobeoffLineEdit);
+    args[ AUTOLEVELLERARGS ].insert("al-probe-on", ui->alprobeonLineEdit);
+    args[ AUTOLEVELLERARGS ].insert("al-probe-off", ui->alprobeoffLineEdit);
 
     connect(ui->actionQuit, SIGNAL(triggered()), this, SLOT(close()));
     connect(ui->actionAbout_pcb2gcode, SIGNAL(triggered()), this, SLOT(menu_aboutpcb2gcode()));
@@ -281,55 +281,22 @@ void MainWindow::adjustMetricImperial(QDoubleSpinBox *doubleSpinBox, const doubl
 QStringList MainWindow::getCmdLineArguments()
 {
     QStringList arguments;
-    int i;
-    int pos;
 
-    for( i = FILEARGS; i <= AUTOLEVELLERARGS; i++ )
-        args[i].setStringMarks(true);
-
-    arguments += args[ FILEARGS ].getAllArgs(false);
-    arguments += args[ COMMONARGS ].getAllArgs(false);
+    arguments += args[ FILEARGS ].getAllArgs("--", false);
+    arguments += args[ COMMONARGS ].getAllArgs("--", false);
 
     if( !ui->frontLineEdit->text().isEmpty() || !ui->backLineEdit->text().isEmpty() )
-        arguments += args[ MILLARGS ].getAllArgs(false);
+        arguments += args[ MILLARGS ].getAllArgs("--", false);
 
     if( !ui->drillLineEdit->text().isEmpty() )
-        arguments += args[ DRILLARGS ].getAllArgs(false);
+        arguments += args[ DRILLARGS ].getAllArgs("--", false);
 
     if( !ui->outlineLineEdit->text().isEmpty() || ui->milldrillCheckBox->isChecked() )
-        arguments += args[ OUTLINEARGS ].getAllArgs(false);
+        arguments += args[ OUTLINEARGS ].getAllArgs("--", false);
 
     if ( (ui->alfrontCheckBox->isChecked() || ui->albackCheckBox->isChecked()) &&
          (!ui->frontLineEdit->text().isEmpty() || !ui->backLineEdit->text().isEmpty()) )
-        arguments += args[ AUTOLEVELLERARGS ].getAllArgs(false);
-
-    i = 0;
-
-    while( i < arguments.size() )
-    {
-        if( arguments[i].contains("al-probe-") )
-        {
-            pos = arguments[i].indexOf('=');
-
-            if( pos > 0 )
-            {
-                arguments[i].prepend("--");
-                arguments[i].insert( pos + 1, '\'');
-                arguments[i].append('\'');
-                i++;
-            }
-            else
-                arguments.removeAt(i);
-        }
-        else if( !arguments[i].contains("=false") )   //Remove lines with a false boolean option ("--metric=false")
-        {
-            arguments[i].remove("=true");   //Remove =true ("--metric=true" --> "--metric")
-            arguments[i].prepend("--");     //Add the "--"
-            i++;
-        }
-        else
-            arguments.removeAt(i);
-    }
+        arguments += args[ AUTOLEVELLERARGS ].getAllArgs("--", false);
 
     return arguments;
 }
@@ -586,8 +553,7 @@ void MainWindow::saveConfFile(const QString filename)
 
         for( int i = COMMONARGS; i <= AUTOLEVELLERARGS; i++ )
         {
-            args[i].setStringMarks(false);
-            arguments = args[i].getAllArgs(true);
+            arguments = args[i].getAllArgs("", true);
             confFile.write( QString("# " + names[i] + " options\n").toLatin1() );
 
             for( QStringList::const_iterator j = arguments.begin(); j != arguments.constEnd(); j++ )

mainwindow.ui

@@ -45,7 +45,7 @@
      <enum>QTabWidget::Rounded</enum>
     </property>
     <property name="currentIndex">
-     <number>2</number>
+     <number>0</number>
     </property>
     <widget class="QWidget" name="commonTab">
      <attribute name="title">
@@ -1133,6 +1133,9 @@
          <property name="toolTip">
           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Insert these commands at the start of the probing sequence. You can use this argument to add a M64/M65 command (LinuxCNC) to automatically enable the probe tool. Use a at sign (@) to insert a newline&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
+         <property name="placeholderText">
+          <string/>
+         </property>
         </widget>
        </item>
        <item row="7" column="1">