Changeset 2067 for palm/trunk

Timestamp:

Nov 11, 2016 9:55:49 PM (8 years ago)

Author:

maronga

Message:

small bugfix in palm_jm, integration of palm_jm in mrungui

Location:

palm/trunk

Files:

• SCRIPTS/palm_jm (modified) (2 diffs)
• UTIL/mrungui/mainwindow.cpp (modified) (2 diffs)
• UTIL/mrungui/mainwindow.h (modified) (1 diff)
• UTIL/mrungui/mainwindow.ui (modified) (15 diffs)

palm/trunk/SCRIPTS/palm_jm

@@ -91 +91 @@
 
         # Load predefined mainwindow
-        uic.loadUi('palm_jm_files/palm_jm.ui', self)
+        uic.loadUi(palm_bin + '/palm_jm_files/palm_jm.ui', self)
     
         # Display MainWindow
@@ -359 +359 @@
         super(CreateSetBox, self).__init__()
         
-        uic.loadUi('palm_jm_files/palm_jm_create_set.ui', self)
+        uic.loadUi(palm_bin + '/palm_jm_files/palm_jm_create_set.ui', self)
         
         self.show()

palm/trunk/UTIL/mrungui/mainwindow.cpp

@@ -18 +18 @@
 // Current revisions:
 // -----------------
-//
+// Added support for PALM job manager
 //
 // Former revisions:
@@ -1281 +1281 @@
 {
     return system("nohup palm_wd >> /dev/null 2>&1 &");
+
+}
+
+//****************************************************************************//
+//  Start job manager (palm_jm)
+int MainWindow::start_jobmanager()
+{
+    return system("nohup palm_jm >> /dev/null 2>&1 &");
 
 }

palm/trunk/UTIL/mrungui/mainwindow.h

@@ -62 +62 @@
     int save_to_file();
     int save_default();
+    int start_jobmanager();
     int start_watchdog();
     int open_from_file();

palm/trunk/UTIL/mrungui/mainwindow.ui

@@ -1359 +1359 @@
     <property name="geometry">
      <rect>
-      <x>2175</x>
-      <y>98</y>
+      <x>4137</x>
+      <y>194</y>
       <width>159</width>
-      <height>186</height>
+      <height>163</height>
      </rect>
     </property>
@@ -1376 +1376 @@
     <addaction name="action_save"/>
     <addaction name="action_default"/>
-    <addaction name="action_start_wd"/>
     <addaction name="action_quit"/>
    </widget>
@@ -1386 +1385 @@
     <addaction name="action_about"/>
    </widget>
+   <widget class="QMenu" name="menuTools">
+    <property name="title">
+     <string>Tools</string>
+    </property>
+    <addaction name="action_start_watchdog"/>
+    <addaction name="action_start_jobmanager"/>
+   </widget>
    <addaction name="menuStart"/>
+   <addaction name="menuTools"/>
    <addaction name="menuHelp"/>
   </widget>
@@ -1441 +1448 @@
    <property name="text">
     <string>Start watchdog</string>
+   </property>
+  </action>
+  <action name="actionStart_job_manager">
+   <property name="text">
+    <string>Start job manager</string>
+   </property>
+  </action>
+  <action name="action_start_watchdog">
+   <property name="text">
+    <string>Watchdog</string>
+   </property>
+  </action>
+  <action name="action_start_jobmanager">
+   <property name="text">
+    <string>Job manager</string>
    </property>
   </action>
@@ -1556 +1578 @@
     <hint type="sourcelabel">
      <x>222</x>
-     <y>296</y>
+     <y>326</y>
     </hint>
     <hint type="destinationlabel">
@@ -1652 +1674 @@
     <hint type="sourcelabel">
      <x>413</x>
-     <y>141</y>
+     <y>164</y>
     </hint>
     <hint type="destinationlabel">
@@ -1764 +1786 @@
     <hint type="sourcelabel">
      <x>270</x>
-     <y>295</y>
+     <y>326</y>
     </hint>
     <hint type="destinationlabel">
@@ -1908 +1930 @@
     <hint type="sourcelabel">
      <x>606</x>
-     <y>216</y>
+     <y>239</y>
     </hint>
     <hint type="destinationlabel">
@@ -1940 +1962 @@
     <hint type="sourcelabel">
      <x>617</x>
-     <y>266</y>
+     <y>289</y>
     </hint>
     <hint type="destinationlabel">
@@ -2132 +2154 @@
     <hint type="sourcelabel">
      <x>805</x>
-     <y>389</y>
+     <y>421</y>
     </hint>
     <hint type="destinationlabel">
@@ -2292 +2314 @@
     <hint type="sourcelabel">
      <x>900</x>
-     <y>343</y>
+     <y>371</y>
     </hint>
     <hint type="destinationlabel">
@@ -2420 +2442 @@
     <hint type="sourcelabel">
      <x>175</x>
-     <y>66</y>
+     <y>91</y>
     </hint>
     <hint type="destinationlabel">
@@ -2445 +2467 @@
   </connection>
   <connection>
-   <sender>action_start_wd</sender>
+   <sender>check_cycfill</sender>
+   <signal>stateChanged(int)</signal>
+   <receiver>MainWindow</receiver>
+   <slot>change_rc_list()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>280</x>
+     <y>622</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>4</x>
+     <y>510</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>action_start_jobmanager</sender>
    <signal>triggered()</signal>
    <receiver>MainWindow</receiver>
-   <slot>start_watchdog()</slot>
+   <slot>start_jobmanager()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -2461 +2499 @@
   </connection>
   <connection>
-   <sender>check_cycfill</sender>
-   <signal>stateChanged(int)</signal>
-   <receiver>MainWindow</receiver>
-   <slot>change_rc_list()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>336</x>
-     <y>526</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>4</x>
-     <y>510</y>
+   <sender>action_start_watchdog</sender>
+   <signal>triggered()</signal>
+   <receiver>MainWindow</receiver>
+   <slot>start_watchdog()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>458</x>
+     <y>344</y>
     </hint>
    </hints>
@@ -2495 +2533 @@
   <slot>help()</slot>
   <slot>start_watchdog()</slot>
+  <slot>start_jobmanager()</slot>
  </slots>
 </ui>