Refactor updating

cpdctrl_gui/ui/widgets/led_script.py

@@ -40,7 +40,6 @@ class TimeLeft(QWidget):
         self.t_end = None
         self.t_start = None
         self.setLayout(QFormLayout())
-        self.setLayout(QFormLayout())
         self.w_time_passed = QLabel("N.A.")
         self.layout().addRow(QLabel("Time passed:"), self.w_time_passed)
         self.w_time_left = QLabel("N.A.")
@@ -55,19 +54,19 @@ class TimeLeft(QWidget):
         self.w_time_left.setText("N.A.")
         self.w_end_time.setText("N.A.")
 
-    def set_start_end_time(self, t_start: float, t_end: float):
+    def set_start_end_time(self, t_start: float, duration: float):
         """
         Set the end time
         Parameters
         ----------
         t_start
             The start time in seconds since epoch
-        t_end
+        duration
-            The end time in seconds since epoch
+            The script duration in seconds
         """
         self.t_start = t_start
-        self.t_end = t_end
+        self.t_end = t_start + duration
-        self.w_end_time.setText(datetime.datetime.fromtimestamp(t_end).strftime("%Y-%m-%d %H:%M:%S"))
+        self.w_end_time.setText(datetime.datetime.fromtimestamp(self.t_end).strftime("%Y-%m-%d %H:%M:%S"))
 
     def update_time(self, t_now: float):
         """
@@ -91,8 +90,12 @@ class LedScriptTableModel(QAbstractTableModel):
     """
     def __init__(self, led_script: LedScript, parent=None):
         super().__init__(parent)
-        self.led_script = led_script
+        self.led_script: LedScript = led_script
-        self.indices = [i[0] for i in LedScript.ARRAY_DTYPE]
+        self.indices = ["dt", "dtsum", "led"]
+        self.indices_all = [i[0] for i in LedScript.ARRAY_DTYPE]
+        for i in self.indices:
+            assert i in self.indices_all, f"Index '{i}' not in {self.indices_all} - LedScriptTableModel incompatible with LedScript"
+        self.indices_print = ["Length [s]", "End time [s]", "Led [%]"]
         self.dt = 0
 
     def rowCount(self, parent=None):
@@ -108,13 +111,14 @@ class LedScriptTableModel(QAbstractTableModel):
     def headerData(self, section: int, orientation: Qt.Orientation, role: int):
         if role == Qt.ItemDataRole.DisplayRole:
             if orientation == Qt.Orientation.Horizontal:
-                return self.indices[section]
+                return self.indices_print[section]
             else:
                 return str(section)
 
     def setData(self, index: QModelIndex, value, role: int):
         if role == Qt.ItemDataRole.EditRole:
             self.led_script.script[self.indices[index.column()]][index.row()] = value
+            self.dataChanged.emit(index, index, role)
             return True
         return False
 
@@ -122,8 +126,8 @@ class LedScriptTableModel(QAbstractTableModel):
         self.beginInsertRows(parent, self.rowCount(), self.rowCount() + rowCount - 1)
         for i in self.indices:
             np.append(self.led_script.script[i], np.zeros((rowCount, self.led_script.script[i].shape[1])), axis=0)
-
         self.endInsertRows()
+
     def removeRows(self, row: int, count: int, parent: QModelIndex):
         self.beginRemoveRows(parent, row, row + count - 1)
         rows = [i for i in range(row, row+count)]
@@ -169,17 +173,34 @@ class LedScriptViewer(QWidget):
         self.w_time_left = TimeLeft(self)
         self.l_vbox.addWidget(self.w_time_left)
         self.l_vbox.addStretch(1)
+        # TODO: this should emit when the script is changed
+        # TODO: apparently not working, also cant use on_update_callback since the file watcher watchdog thing
+        # TODO: when updating, the update notice comes twice so I suspect the model copies the other one?
+        # is not in a QThread, thus the callback cant interact with qt objects and signals
+        self.model.dataChanged.connect(self.update_time_predictions)
 
     def set_script(self, led_script: LedScript):
         self.model = LedScriptTableModel(led_script, self)
         self.w_table.setModel(self.model)
         self.w_table.show()
 
-    def set_relative_time(self, t: float):
+    def update_time_predictions(self):
-        pass
+        t_start = self.model.led_script.t_start
-        raise NotImplementedError()
+        if t_start is None:
+            self.w_time_left.reset()
+        else:
+            self.w_time_left.set_start_end_time(t_start, self.model.led_script.script["dtsum"][-1])
 
     def update_time(self, t_now: float):
+        """
+        Update the time of the LED script.
+        Parameters
+        ----------
+        t_now
+           Current time since epoch.
+        """
+        if self.model.led_script.has_updated():
+            self.update_time_predictions()
         self.model.update_time(t_now)
         self.w_time_left.update_time(t_now)
         self.w_table.update()