tests needed

anselm.py

@@ -31,7 +31,7 @@ class Anselm(System):
     dut_branches = ["dut_a", "dut_b", "dut_c"]
     maintainer_select = ["Ute Becker", "Thomas Bock", "Christian Buchmann"]
     gas_select = ["N2", "Ar", "He", ]
-
+    runmod_select = ["sequential", "parallel"]
     mult_line_height = 4
     current_grid_line = 1
 
@@ -40,12 +40,14 @@ class Anselm(System):
     maintainer_col = 3
     gas_col = 4
     add_device_btn_col = 5
+    runmod_col = 6
     
     std_line = 1
     year_line = 1
     maintainer_line = 1
     gas_line =1
     add_device_btn_line = 1
+    runmod_line =1
 
     cal_id_col = 2
     fullscale_col = 3
@@ -97,7 +99,7 @@ class Anselm(System):
         self.win.closeEvent = self.closeEvent
         self.grid = QGridLayout(self.win)
 
-        self.add_widget_to_grid(self.make_std_combo(),self.std_line, self.std_col)
+        self.add_widget_to_grid(self.make_std_combo(), self.std_line, self.std_col)
         self.draw_grid()
 
     def make_label_edit_pair(self, label_val, edit_val, line):
@@ -151,6 +153,13 @@ class Anselm(System):
 
         self.grid.addWidget(widget, line, col)
 
+    def make_runmod_combo(self):
+        c = self.make_combo(self.runmod_select, first_item="run modus (default: parallel)", last_item=False)
+        c.setFixedSize(self.long_line, self.line_heigth)
+        c.currentIndexChanged.connect(lambda: self.runmod_selected(c))
+
+        return c
+
     def make_combo(self, item_list, first_item=True, last_item=True):
         c = QComboBox(self.win)
 
@@ -436,12 +445,18 @@ class Anselm(System):
         gas = combo.currentText()
         self.aset('gas', 0,  gas )
         self.log.info("select gas {}".format( gas))
-        self.add_widget_to_grid(self.make_add_device_button(), self.add_device_btn_line, self.add_device_btn_col) 
+        self.add_widget_to_grid(self.make_add_device_button(), self.add_device_btn_line, self.add_device_btn_col)
+        self.add_widget_to_grid(self.make_runmod_combo(), self.runmod_line, self.runmod_col)
 
     def year_selected(self, combo):
         year = combo.currentText()
         self.aset('year', 0, year)
         self.log.info("select year {}".format( year ))
+
+    def runmod_selected(self, combo):
+        runmod = combo.currentText()
+        self.aset('runmod', 0,  runmod)
+        self.log.info("select run modus {}".format( runmod))
         
     def default_change(self, edit_widget, label_val, line):
         self.log.debug(label_val)

srv.py

@@ -366,7 +366,8 @@ def offset_sequences():
     s.log.info(msg) 
     s.r.publish('info', msg)
     s.aset('info', 0, msg)
-
+    run_mod = s.aget("runmod", 0)
+    
     seq_array = []
    
     lines = s.get_lines('offset_all_sequence')
@@ -381,7 +382,12 @@ def offset_sequences():
         for task in sequence:
             seq_array.append("{}-{}".format(task.get('TaskName'), line)) 
 
-        start_new_thread( work_seqence, (sequence, line,))
+        # start sequence here (via thread)
+        # if the lines should run in parallel 
+        if runmod == "sequential":
+            work_seqence(sequence, line)
+        else:
+            start_new_thread( work_seqence, (sequence, line,))
     
     res = wait_sequences_complete(seq_array)
 
@@ -433,7 +439,10 @@ def offset():
                     
                     
                 if len(offset_sequence) >0:
-                    start_new_thread( work_seqence, (offset_sequence, line,))
+                    if runmod == "sequential":
+                        work_seqence(offset_sequence, line)
+                    else:
+                        start_new_thread( work_seqence, (offset_sequence, line,))
                 else:
                     s.log.info("No task match for line {}".format(line))
                     s.log.info("nothing started")
@@ -496,7 +505,10 @@ def ind():
                     
                     
                 if len(ind_sequence) >0:
-                    start_new_thread( work_seqence, (ind_sequence, line,))
+                    if runmod == "sequential":
+                        work_seqence(ind_sequence, line)
+                    else:
+                        start_new_thread( work_seqence, (ind_sequence, line,))
                 else:
                     s.log.info("No task match for line {}".format(line))
                     s.log.info("nothing started")
@@ -567,4 +579,4 @@ def select_task(target_pressure, task_array):
             res = task
             break
 
-    return res
\ No newline at end of file
+    return res