Changeset 920 for palm/trunk/UTIL

Timestamp:

Jun 5, 2012 9:56:53 AM (12 years ago)

Author:

maronga

Message:

Bugfixes for the parameter file check. New mrun option switches off combine_plot_fields

Location:

palm/trunk/UTIL/mrungui

Files:

• mainwindow.cpp (modified) (4 diffs)
• mainwindow.ui (modified) (22 diffs)

palm/trunk/UTIL/mrungui/mainwindow.cpp

@@ -2 +2 @@
 // Current revisions:
 // -----------------
-//
+// Added -Z option (disable combine_plot_fields)
 //
 // Former revisions:
@@ -1088 +1088 @@
         deactivate_flag("x");
     }
+    
+    status = ui->check_Z->checkState();
+
+    if (status == 2)
+    {
+        activate_flag("Z");
+    }
+    else
+    {
+        deactivate_flag("Z");
+    }
     return 0;
 
@@ -1438 +1449 @@
             {
                ui->check_A->setChecked(true);
-
             }
             else if ( parameter == "b")
@@ -1475 +1485 @@
                advanced = true;
             }
+            else if ( parameter == "Z")
+            {
+               ui->check_Z->setChecked(true);
+               advanced = true;
+            }  
             else if ( parameter == "m")
             {

palm/trunk/UTIL/mrungui/mainwindow.ui

@@ -945 +945 @@
       <rect>
        <x>280</x>
-       <y>235</y>
+       <y>255</y>
        <width>111</width>
        <height>25</height>
@@ -970 +970 @@
       <rect>
        <x>200</x>
-       <y>315</y>
+       <y>330</y>
        <width>191</width>
        <height>25</height>
@@ -983 +983 @@
       <rect>
        <x>200</x>
-       <y>290</y>
+       <y>305</y>
        <width>191</width>
        <height>25</height>
@@ -1012 +1012 @@
       <rect>
        <x>10</x>
-       <y>220</y>
+       <y>240</y>
        <width>381</width>
        <height>16</height>
@@ -1025 +1025 @@
       <rect>
        <x>100</x>
-       <y>240</y>
+       <y>260</y>
        <width>91</width>
        <height>15</height>
@@ -1041 +1041 @@
       <rect>
        <x>200</x>
-       <y>235</y>
+       <y>255</y>
        <width>71</width>
        <height>25</height>
@@ -1051 +1051 @@
       <rect>
        <x>30</x>
-       <y>295</y>
+       <y>310</y>
        <width>161</width>
        <height>16</height>
@@ -1067 +1067 @@
       <rect>
        <x>10</x>
-       <y>320</y>
+       <y>335</y>
        <width>181</width>
        <height>16</height>
@@ -1083 +1083 @@
       <rect>
        <x>20</x>
-       <y>345</y>
+       <y>360</y>
        <width>171</width>
        <height>16</height>
@@ -1099 +1099 @@
       <rect>
        <x>200</x>
-       <y>340</y>
+       <y>355</y>
        <width>191</width>
        <height>25</height>
@@ -1112 +1112 @@
       <rect>
        <x>60</x>
-       <y>370</y>
+       <y>385</y>
        <width>131</width>
        <height>16</height>
@@ -1128 +1128 @@
       <rect>
        <x>200</x>
-       <y>365</y>
+       <y>380</y>
        <width>191</width>
        <height>25</height>
@@ -1141 +1141 @@
       <rect>
        <x>20</x>
-       <y>395</y>
+       <y>410</y>
        <width>171</width>
-       <height>31</height>
-      </rect>
-     </property>
-     <property name="text">
-      <string>Filenames of routines to be
- compiled:</string>
+       <height>16</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>Filenames to be compiled:</string>
      </property>
      <property name="alignment">
@@ -1284 +1283 @@
       <rect>
        <x>30</x>
-       <y>265</y>
+       <y>285</y>
        <width>161</width>
        <height>16</height>
@@ -1300 +1299 @@
       <rect>
        <x>200</x>
-       <y>260</y>
+       <y>280</y>
        <width>191</width>
        <height>25</height>
@@ -1307 +1306 @@
      <property name="text">
       <string/>
+     </property>
+    </widget>
+    <widget class="QCheckBox" name="check_Z">
+     <property name="geometry">
+      <rect>
+       <x>10</x>
+       <y>225</y>
+       <width>421</width>
+       <height>23</height>
+      </rect>
+     </property>
+     <property name="text">
+      <string>-Z  (disable combine_plot_fields at the end of job)</string>
      </property>
     </widget>
@@ -1426 +1438 @@
   </action>
  </widget>
- <layoutdefault spacing="6" margin="11"/>
+ <layoutdefault spacing="1" margin="11"/>
  <tabstops>
   <tabstop>pushButton</tabstop>
@@ -2082 +2094 @@
     <hint type="sourcelabel">
      <x>756</x>
-     <y>303</y>
+     <y>332</y>
     </hint>
     <hint type="destinationlabel">
@@ -2098 +2110 @@
     <hint type="sourcelabel">
      <x>796</x>
-     <y>358</y>
+     <y>387</y>
     </hint>
     <hint type="destinationlabel">
@@ -2130 +2142 @@
     <hint type="sourcelabel">
      <x>850</x>
-     <y>410</y>
+     <y>438</y>
     </hint>
     <hint type="destinationlabel">
@@ -2226 +2238 @@
     <hint type="sourcelabel">
      <x>887</x>
-     <y>303</y>
+     <y>332</y>
     </hint>
     <hint type="destinationlabel">
@@ -2423 +2435 @@
      <x>5</x>
      <y>594</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>check_Z</sender>
+   <signal>stateChanged(int)</signal>
+   <receiver>MainWindow</receiver>
+   <slot>check_flags()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>730</x>
+     <y>295</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>458</x>
+     <y>344</y>
     </hint>
    </hints>