shinestacker 0.5.0__py3-none-any.whl → 1.0.1__py3-none-any.whl

shinestacker/gui/gui_run.py

@@ -1,6 +1,5 @@
 # pylint: disable=C0114, C0115, C0116, E0611, R0903, R0915, R0914, R0917, R0913, R0902
-import time
-from PySide6.QtWidgets import (QWidget, QPushButton, QVBoxLayout, QHBoxLayout, QProgressBar,
+from PySide6.QtWidgets import (QWidget, QPushButton, QVBoxLayout, QHBoxLayout,
                                QMessageBox, QScrollArea, QSizePolicy, QFrame, QLabel, QComboBox)
 from PySide6.QtGui import QColor
 from PySide6.QtCore import Qt, QTimer
@@ -10,11 +9,11 @@ from .. config.gui_constants import gui_constants
 from .colors import RED_BUTTON_STYLE, BLUE_BUTTON_STYLE, BLUE_COMBO_STYLE
 from .gui_logging import LogWorker, QTextEditLogger
 from .gui_images import GuiPdfView, GuiImageView, GuiOpenApp
-from .colors import ColorPalette
-
-
-ACTION_RUNNING_COLOR = ColorPalette.MEDIUM_BLUE
-ACTION_DONE_COLOR = ColorPalette.MEDIUM_GREEN
+from .colors import (
+    ColorPalette,
+    ACTION_RUNNING_COLOR, ACTION_COMPLETED_COLOR,
+    ACTION_STOPPED_COLOR, ACTION_FAILED_COLOR)
+from .time_progress_bar import TimerProgressBar
 
 
 class ColorButton(QPushButton):
@@ -40,95 +39,6 @@ class ColorButton(QPushButton):
         """)
 
 
-class TimerProgressBar(QProgressBar):
-    light_background_color = ColorPalette.LIGHT_BLUE
-    border_color = ColorPalette.DARK_BLUE
-    text_color = ColorPalette.DARK_BLUE
-
-    def __init__(self):
-        super().__init__()
-        super().setRange(0, 10)
-        super().setValue(0)
-        self.set_running_style()
-        self._start_time = -1
-        self._current_time = -1
-
-    def set_style(self, bar_color=None):
-        if bar_color is None:
-            bar_color = ColorPalette.MEDIUM_BLUE
-        self.setStyleSheet(f"""
-        QProgressBar {{
-          border: 2px solid #{self.border_color.hex()};
-          border-radius: 8px;
-          text-align: center;
-          font-weight: bold;
-          font-size: 12px;
-          background-color: #{self.light_background_color.hex()};
-          color: #{self.text_color.hex()};
-          min-height: 1px;
-        }}
-        QProgressBar::chunk {{
-          border-radius: 6px;
-          background-color: #{bar_color.hex()};
-        }}
-        """)
-
-    def time_str(self, secs):
-        ss = int(secs)
-        h = ss // 3600
-        m = (ss % 3600) // 60
-        s = (ss % 3600) % 60
-        x = secs - ss
-        t_str = f"{s:02d}" + f"{x:.1f}s".lstrip('0')
-        if m > 0:
-            t_str = f"{m:02d}:{t_str}"
-        if h > 0:
-            t_str = f"{h:02d}:{t_str}"
-        if m > 0 or h > 0:
-            t_str = t_str.lstrip('0')
-        elif 0 < s < 10:
-            t_str = t_str.lstrip('0')
-        elif s == 0:
-            t_str = t_str[1:]
-        return t_str
-
-    def check_time(self, val):
-        if self._start_time < 0:
-            raise RuntimeError("TimeProgressbar: start and must be called before setValue and stop")
-        self._current_time = time.time()
-        elapsed_time = self._current_time - self._start_time
-        elapsed_str = self.time_str(elapsed_time)
-        fmt = f"Progress: %p% - %v of %m - elapsed: {elapsed_str}"
-        if 0 < val < self.maximum():
-            time_per_iter = elapsed_time / val
-            estimated_time = time_per_iter * self.maximum()
-            remaining_time = max(0, estimated_time - elapsed_time)
-            remaining_str = self.time_str(remaining_time)
-            fmt += f", {remaining_str} remaining"
-        self.setFormat(fmt)
-
-    def start(self, steps):
-        super().setMaximum(steps)
-        self._start_time = time.time()
-        self.setValue(0)
-
-    def stop(self):
-        self.check_time(self.maximum())
-        self.setValue(self.maximum())
-
-    # pylint: disable=C0103
-    def setValue(self, val):
-        self.check_time(val)
-        super().setValue(val)
-    # pylint: enable=C0103
-
-    def set_running_style(self):
-        self.set_style(ACTION_RUNNING_COLOR)
-
-    def set_done_style(self):
-        self.set_style(ACTION_DONE_COLOR)
-
-
 class RunWindow(QTextEditLogger):
     def __init__(self, labels, stop_worker_callback, close_window_callback, retouch_paths, parent):
         QTextEditLogger.__init__(self, parent)
@@ -245,17 +155,26 @@ class RunWindow(QTextEditLogger):
 
     @Slot(int, str)
     def handle_before_action(self, run_id, _name):
-        if 0 <= run_id < len(self.color_widgets[self.row_widget_id]):
-            self.color_widgets[self.row_widget_id][run_id].set_color(*ACTION_RUNNING_COLOR.tuple())
-            self.progress_bar.start(1)
+        if self.row_widget_id < len(self.color_widgets):
+            widgets = self.color_widgets[self.row_widget_id]
+            if 0 <= run_id < len(widgets):
+                widget = widgets[run_id]
+                widget.set_color(*ACTION_RUNNING_COLOR.tuple())
+                widget.setText(widget.text() + " - running")
+                self.progress_bar.start(1)
         if run_id == -1:
             self.progress_bar.set_running_style()
 
     @Slot(int, str)
     def handle_after_action(self, run_id, _name):
-        if 0 <= run_id < len(self.color_widgets[self.row_widget_id]):
-            self.color_widgets[self.row_widget_id][run_id].set_color(*ACTION_DONE_COLOR.tuple())
-            self.progress_bar.stop()
+        if self.row_widget_id < len(self.color_widgets):
+            widgets = self.color_widgets[self.row_widget_id]
+            if 0 <= run_id < len(widgets):
+                widget = widgets[run_id]
+                widget.set_color(*ACTION_COMPLETED_COLOR.tuple())
+                postfix = f" - completed in {self.progress_bar.elapsed_str}"
+                widget.setText(widget.text().replace(" - running", "") + postfix)
+                self.progress_bar.stop()
         if run_id == -1:
             self.row_widget_id += 1
             self.progress_bar.set_done_style()
@@ -318,6 +237,28 @@ class RunWindow(QTextEditLogger):
             0, lambda: self.right_area.verticalScrollBar().setValue(
                 self.right_area.verticalScrollBar().maximum()))
 
+    @Slot(int)
+    def handle_run_completed(self, _run_id):
+        self.progress_bar.setFormat(self.progress_bar.format() + " - completed")
+
+    def handle_run_interrupt(self, run_id, color, postfix):
+        if self.row_widget_id < len(self.color_widgets):
+            widgets = self.color_widgets[self.row_widget_id]
+            if 0 <= run_id < len(widgets):
+                widget = widgets[run_id]
+                widget.set_color(*color)
+                widget.setText(widget.text().replace(" - running", "") + postfix)
+
+    @Slot(int)
+    def handle_run_stopped(self, run_id):
+        postfix = f" - stopped after {self.progress_bar.elapsed_str}"
+        self.handle_run_interrupt(run_id, ACTION_STOPPED_COLOR.tuple(), postfix)
+
+    @Slot(int)
+    def handle_run_failed(self, run_id):
+        postfix = f" - failed after {self.progress_bar.elapsed_str}"
+        self.handle_run_interrupt(run_id, ACTION_FAILED_COLOR.tuple(), postfix)
+
 
 class RunWorker(LogWorker):
     before_action_signal = Signal(int, str)
@@ -328,6 +269,9 @@ class RunWorker(LogWorker):
     after_step_signal = Signal(int, str, int)
     save_plot_signal = Signal(int, str, str)
     open_app_signal = Signal(int, str, str, str)
+    run_completed_signal = Signal(int)
+    run_stopped_signal = Signal(int)
+    run_failed_signal = Signal(int)
 
     def __init__(self, id_str):
         LogWorker.__init__(self)
@@ -382,15 +326,19 @@ class RunWorker(LogWorker):
         </div>
         ''') # noqa
         status, error_message = self.do_run()
-        if status == constants.RUN_FAILED:
-            message = f"{self.tag} failed"
-            color = "#" + ColorPalette.DARK_RED.hex()
-        elif status == constants.RUN_COMPLETED:
+        run_id = int(self.id_str.split('_')[-1])
+        if status == constants.RUN_COMPLETED:
             message = f"{self.tag} ended successfully"
+            self.run_completed_signal.emit(run_id)
             color = "#" + ColorPalette.DARK_BLUE.hex()
         elif status == constants.RUN_STOPPED:
             message = f"{self.tag} stopped"
             color = "#" + ColorPalette.DARK_RED.hex()
+            self.run_stopped_signal.emit(run_id)
+        elif status == constants.RUN_FAILED:
+            message = f"{self.tag} failed"
+            color = "#" + ColorPalette.DARK_RED.hex()
+            self.run_failed_signal.emit(run_id)
         else:
             message = ''
             color = "#000000"

shinestacker/gui/ico/shinestacker.svg

@@ -0,0 +1,60 @@
+<svg id="Livello_1" data-name="Livello 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1000 1000">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #fff;
+      }
+
+      .cls-2 {
+        fill: #216ea1;
+      }
+
+      .cls-3 {
+        opacity: 0.8;
+      }
+
+      .cls-4 {
+        opacity: 0.6;
+      }
+
+      .cls-5 {
+        opacity: 0.4;
+      }
+    </style>
+  </defs>
+  <title>shinestacker_1</title>
+  <rect class="cls-1" x="238.36" y="238.36" width="523.29" height="523.29" rx="100" transform="translate(1000 1000) rotate(-180)"/>
+  <rect class="cls-2" x="312.66" y="487.43" width="311.99" height="35.36" rx="7.87"/>
+  <g class="cls-3">
+    <rect class="cls-2" x="374.9" y="535.13" width="311.99" height="35.36" rx="7.87"/>
+  </g>
+  <g class="cls-4">
+    <rect class="cls-2" x="312.66" y="582.82" width="311.99" height="35.36" rx="7.87"/>
+  </g>
+  <g class="cls-5">
+    <rect class="cls-2" x="268.51" y="630.51" width="311.99" height="35.36" rx="7.87"/>
+  </g>
+  <g>
+    <g>
+      <g>
+        <g>
+          <path class="cls-2" d="M493.18,405.7c13.36,10,26.59,18.35,39.15,10.5,10.79-6.75,16.24-40.11,23.51-50.42,7.95-11.29,47.4-9.52,62.4-5,13.25,4,21.24,9.35,29.9,20.64,7.63,9.94,5.49,19.28,11.61,24.94,7.36,6.79,13.12,1.52,13.4-4,.19-3.83-1.25-9.55-4.08-14.29-9.43-15.79-30.85-29.24-48.48-35.39-20.12-7-59.42-4.39-71-1.18-9,2.51-33.85-3.58-58.11,9.29C461.05,376.94,475.15,392.16,493.18,405.7Zm27.87-39.55a12.47,12.47,0,0,1,3.9-5.76c3.34-2.9,8-4.45,12.27-3.3a10.12,10.12,0,0,1,5.3,3.41c4.08,5,3.31,13.64-2.15,17.95-5,4-12.21,2.42-16.42-1.89A11,11,0,0,1,521.05,366.15Z"/>
+          <path class="cls-2" d="M493,405.94c-10.09-7.58-20.3-16.62-19.55-26.19.53-6.83,6.4-13.12,17.94-19.24,16.86-8.95,33.66-8.78,45.92-8.65,5.32.05,9.52.1,12.25-.66,11.17-3.12,50.63-6,71.13,1.18,17.24,6,39,19.33,48.64,35.52,2.67,4.47,4.32,10.28,4.11,14.45a8,8,0,0,1-4.57,7.07c-2.8,1.14-6.11.13-9.32-2.84s-4.09-6.51-5.27-10.78-2.53-9.18-6.37-14.19c-8.52-11.11-16.31-16.48-29.75-20.54-14.43-4.35-54.16-6.37-62.08,4.88-2.88,4.1-5.5,11.93-8.28,20.23-4.1,12.26-8.75,26.17-15.31,30.27a19.88,19.88,0,0,1-10.19,3.13C512.56,419.82,502.57,413.13,493,405.94ZM618.33,360.5c13.58,4.1,21.44,9.53,30,20.75,3.91,5.1,5.27,10,6.48,14.39,1.15,4.18,2.14,7.79,5.09,10.51s6.12,3.76,8.69,2.72a7.41,7.41,0,0,0,4.21-6.54c.2-4.07-1.42-9.75-4-14.13-9.6-16.06-31.19-29.28-48.33-35.26-20.38-7.11-59.65-4.27-70.77-1.17-2.81.78-7.05.74-12.42.68-12.2-.12-28.9-.29-45.63,8.58-11.34,6-17.11,12.16-17.63,18.77-.73,9.28,9.36,18.18,19.32,25.66,12.78,9.6,26.3,18.31,38.81,10.48,6.38-4,11-17.78,15.07-29.95,2.79-8.34,5.42-16.22,8.36-20.39,4.79-6.8,20.09-8.27,28.79-8.55l.77,0C597,356.74,610.51,358.14,618.33,360.5Zm-94.59,16.26h0a11.22,11.22,0,0,1-3-10.69,12.57,12.57,0,0,1,4-5.9c3.66-3.19,8.46-4.47,12.54-3.37a10.47,10.47,0,0,1,5.45,3.51,12.77,12.77,0,0,1,2.57,9.45,13.21,13.21,0,0,1-4.77,8.93A10.84,10.84,0,0,1,534,381,14.21,14.21,0,0,1,523.74,376.76Zm1.41-16.15a12,12,0,0,0-3.81,5.62,10.62,10.62,0,0,0,2.82,10.12h0c3.94,4,11,5.83,16,1.87a12.61,12.61,0,0,0,4.55-8.52,12.2,12.2,0,0,0-2.44-9,9.81,9.81,0,0,0-5.14-3.3A10.71,10.71,0,0,0,534,357,14.28,14.28,0,0,0,525.15,360.61Z"/>
+        </g>
+        <path class="cls-2" d="M464.67,376.8c-10-8.15-40.07-.55-51.41,4.72a101.42,101.42,0,0,0-38.2,30.84c-7.44,10-14.3,23.13-12.26,36,.84,5.33,3.55,9.79,8.48,12.22a33,33,0,0,0,9.59,2.65c21.74,3.38,43.54.18,64.87-4.24,13.95-2.88,28.27-6.23,41.11-12.57,8.38-4.14,18.66-11.43,15.55-22.2-1.85-6.38-15.55-14.82-24.76-24.91C469.06,389.9,468.22,379.69,464.67,376.8Z"/>
+        <path class="cls-2" d="M539.06,363.49a6.24,6.24,0,0,0-3.34-2.1,9,9,0,0,0-7.84,2.21,8.22,8.22,0,0,0-2.55,3.68,6.75,6.75,0,0,0,1.75,6.55c2.63,2.68,7.18,3.6,10.43,1C541,372.08,541.61,366.62,539.06,363.49Z"/>
+      </g>
+      <path class="cls-2" d="M688.89,361a74.58,74.58,0,0,0-14.25-3.37c-2.4-.28-4.79-.52-7.18-.58-1.2,0-2.4-.06-3.59,0s-2.39.09-3.58.19a54.34,54.34,0,0,0-26.46,9.52,60.68,60.68,0,0,0-18.49,21.15,75.05,75.05,0,0,0-8.06,27.78l7.14-.3a46.86,46.86,0,0,1,2.88-26.54,48.34,48.34,0,0,1,17.21-21.09c1-.61,1.93-1.26,2.93-1.85l3-1.62a53.91,53.91,0,0,1,6.43-2.47,44.83,44.83,0,0,1,13.49-2.11,51.67,51.67,0,0,1,13.47,1.77,53.55,53.55,0,0,1,6.4,2.18,39.53,39.53,0,0,1,5.92,3Z"/>
+    </g>
+    <path class="cls-2" d="M530,426.52h0a4.22,4.22,0,0,0,.84,6.29l20.36,13.57a4.22,4.22,0,0,0,6.36-2.22l1.73-5.39a4.23,4.23,0,0,0-2.56-5.25l-22.09-8.18A4.21,4.21,0,0,0,530,426.52Z"/>
+    <path class="cls-2" d="M350.43,434.83h0a5.23,5.23,0,0,0,2.43,7.49l27.91,12.07a5.25,5.25,0,0,0,7.28-4.13l.91-7a5.24,5.24,0,0,0-4.29-5.84l-28.82-5.09A5.25,5.25,0,0,0,350.43,434.83Z"/>
+    <path class="cls-2" d="M559.79,442.49h0a2.84,2.84,0,0,1,4.54,1l11.88,27.94a2.83,2.83,0,0,1-2.06,3.87l-2.11.43a2.84,2.84,0,0,1-3.25-1.85L559,445.48A2.8,2.8,0,0,1,559.79,442.49Z"/>
+    <path class="cls-2" d="M573.56,477.22l5.57,3.81a.9.9,0,0,1,0,1.39,1.06,1.06,0,0,1-.61.14,3.53,3.53,0,0,0-.86.08,1.54,1.54,0,0,0-.49.13.26.26,0,0,0-.09.37,1.37,1.37,0,0,0,.38.38c.35.28.65.59,1,.9l1.64,1.56h0c.44.42.25,1.44-.26,1.44h-8.05c-.25,0-.47-.3-.5-.69l-.66-9a.83.83,0,0,1,.36-.83A2.46,2.46,0,0,1,573.56,477.22Z"/>
+    <path class="cls-2" d="M349.61,441.27h0a3,3,0,0,0-4.71,1l-12.3,28.94a2.93,2.93,0,0,0,2.13,4l2.19.44a2.93,2.93,0,0,0,3.37-1.91l10.11-29.38A2.9,2.9,0,0,0,349.61,441.27Z"/>
+    <path class="cls-2" d="M333.55,477.22,328,481a.9.9,0,0,0,0,1.39,1.08,1.08,0,0,0,.61.14,3.62,3.62,0,0,1,.87.08,1.69,1.69,0,0,1,.49.13.25.25,0,0,1,.08.37,1.49,1.49,0,0,1-.37.38c-.35.28-.66.59-1,.9L327,486h0c-.43.42-.24,1.44.27,1.44h8c.26,0,.47-.3.5-.69l.67-9a.86.86,0,0,0-.36-.83A2.48,2.48,0,0,0,333.55,477.22Z"/>
+    <path class="cls-2" d="M413.88,438.35h0a3.19,3.19,0,0,0-5.1,1.1l-13.33,31.36a3.17,3.17,0,0,0,2.3,4.35l2.37.48a3.18,3.18,0,0,0,3.65-2.08l11-31.85A3.16,3.16,0,0,0,413.88,438.35Z"/>
+    <path class="cls-2" d="M397,477.22,391.43,481a.9.9,0,0,0,0,1.39,1.09,1.09,0,0,0,.62.14,3.58,3.58,0,0,1,.86.08,1.69,1.69,0,0,1,.49.13.26.26,0,0,1,.09.37,1.37,1.37,0,0,1-.38.38c-.35.28-.66.59-1,.9L390.48,486h0c-.43.42-.24,1.44.27,1.44h8c.26,0,.48-.3.51-.69l.66-9a.83.83,0,0,0-.36-.83A2.48,2.48,0,0,0,397,477.22Z"/>
+    <path class="cls-2" d="M449.93,482l2.5-4.58a1.44,1.44,0,0,1,1.62-.72h0a1.45,1.45,0,0,1,.89.66l2.84,4.7a.71.71,0,0,1-.67,1.07h0a.71.71,0,0,0-.61,1.15l1.63,2a.71.71,0,0,1-.55,1.15h-7.36a.7.7,0,0,1-.55-1.14l1.65-2.11a.7.7,0,0,0-.61-1.14h-.11A.7.7,0,0,1,449.93,482Z"/>
+    <path class="cls-2" d="M452.52,475.76h2a2.94,2.94,0,0,0,2.94-3l-1.16-34.88a2.94,2.94,0,0,0-2.9-2.84h0a3,3,0,0,0-3,2.87l-.83,34.87A2.94,2.94,0,0,0,452.52,475.76Z"/>
+  </g>
+</svg>