SpecLog 0.0.5__tar.gz → 0.0.7__tar.gz

{speclog-0.0.5 → speclog-0.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: SpecLog
-Version: 0.0.5
+Version: 0.0.7
 Summary: A Python Package for logging data from instrumentations
 Author-email: Yen-Chun Huang <yen-chun.huang@bruker.com>
 License-Expression: MIT
@@ -135,7 +135,11 @@ SpecLogger -startup False
 ```
 
 The configuration editor also provides **Enable** and **Disable** startup
-buttons. Administrator permission is normally required to use them.
+buttons. Administrator permission is normally required to use them. 
+
+After **Enable**, open **Task Scheduler** and find **Speclogger** task, disable
+**Stop the task if it runs longer than** in **settings**.
+
 
 If the startup task was created by another administrator, a standard account
 may show startup as **Unavailable**. If new log data is still being written, the
@@ -151,10 +155,28 @@ SpecMonitor
 ```
 
 Use the monitoring-item controls to select which measurements are plotted. Use
-the data-selection controls to choose a start time and duration.
-
-To load all available history, leave the date fields at their defaults and click
-**Ok**. The first import may take longer; later queries load only new or changed
+**Historical Data** to open a separate historical-data window. Enter a start time
+and duration, choose curves from the **Items to plot** checklist, then click
+**OK** to plot the selected range in that window. This checklist is independent
+of the main monitor's live-item selection. After data is loaded, checking or
+unchecking an item updates the historical plot immediately without loading the
+files again. The main monitor remains open and
+continues displaying live data. Click **Reset** to cancel the current historical
+request and clear the selection fields and plot.
+
+The historical plot uses a time-only horizontal axis; its title shows the full
+start and end date/time. Click **Save** to export the loaded Date, Time, and
+currently checked measurement items to a CSV file.
+
+Click **Load** in the Historical Data window to open an existing SpecLog CSV
+file in the historical plot. File loading is kept out of the main monitor so its
+graph continues showing live data.
+
+Click **Save Figure** to export the historical plot, including its title, axes,
+curves, and legend, as a PNG image.
+
+To load all available history, leave Start Time empty, keep Duration at **All**,
+and click **OK**. The first import may take longer; later queries load only new or changed
 files.
 
 Start the monitor with a visible debug console when troubleshooting:
@@ -163,6 +185,19 @@ Start the monitor with a visible debug console when troubleshooting:
 SpecMonitor -debug True
 ```
 
+Monitor curves use a high-contrast subset of the packaged Bruker color palette
+that remains visible on a white background. They cycle through solid, dashed,
+dotted, and dash-dot line shapes when additional curve styles are needed. Style
+assignment is recalculated from the currently selected items, so selections that
+fit within the color palette use solid lines only. These
+application styles are stored internally in
+`SpecLog/config/monitor_config.cfg`; they are separate from the public device
+configuration.
+
+Plot legends are displayed below the curves rather than over them. Legend and
+axis text use larger fonts, and long legends automatically use additional
+columns.
+
 ## Common status messages
 
 - **Running**: The logger is active and directly detectable.

{speclog-0.0.5 → speclog-0.0.7}/README.md

@@ -116,7 +116,11 @@ SpecLogger -startup False
 ```
 
 The configuration editor also provides **Enable** and **Disable** startup
-buttons. Administrator permission is normally required to use them.
+buttons. Administrator permission is normally required to use them. 
+
+After **Enable**, open **Task Scheduler** and find **Speclogger** task, disable
+**Stop the task if it runs longer than** in **settings**.
+
 
 If the startup task was created by another administrator, a standard account
 may show startup as **Unavailable**. If new log data is still being written, the
@@ -132,10 +136,28 @@ SpecMonitor
 ```
 
 Use the monitoring-item controls to select which measurements are plotted. Use
-the data-selection controls to choose a start time and duration.
-
-To load all available history, leave the date fields at their defaults and click
-**Ok**. The first import may take longer; later queries load only new or changed
+**Historical Data** to open a separate historical-data window. Enter a start time
+and duration, choose curves from the **Items to plot** checklist, then click
+**OK** to plot the selected range in that window. This checklist is independent
+of the main monitor's live-item selection. After data is loaded, checking or
+unchecking an item updates the historical plot immediately without loading the
+files again. The main monitor remains open and
+continues displaying live data. Click **Reset** to cancel the current historical
+request and clear the selection fields and plot.
+
+The historical plot uses a time-only horizontal axis; its title shows the full
+start and end date/time. Click **Save** to export the loaded Date, Time, and
+currently checked measurement items to a CSV file.
+
+Click **Load** in the Historical Data window to open an existing SpecLog CSV
+file in the historical plot. File loading is kept out of the main monitor so its
+graph continues showing live data.
+
+Click **Save Figure** to export the historical plot, including its title, axes,
+curves, and legend, as a PNG image.
+
+To load all available history, leave Start Time empty, keep Duration at **All**,
+and click **OK**. The first import may take longer; later queries load only new or changed
 files.
 
 Start the monitor with a visible debug console when troubleshooting:
@@ -144,6 +166,19 @@ Start the monitor with a visible debug console when troubleshooting:
 SpecMonitor -debug True
 ```
 
+Monitor curves use a high-contrast subset of the packaged Bruker color palette
+that remains visible on a white background. They cycle through solid, dashed,
+dotted, and dash-dot line shapes when additional curve styles are needed. Style
+assignment is recalculated from the currently selected items, so selections that
+fit within the color palette use solid lines only. These
+application styles are stored internally in
+`SpecLog/config/monitor_config.cfg`; they are separate from the public device
+configuration.
+
+Plot legends are displayed below the curves rather than over them. Legend and
+axis text use larger fonts, and long legends automatically use additional
+columns.
+
 ## Common status messages
 
 - **Running**: The logger is active and directly detectable.

speclog-0.0.7/SpecLog/config/monitor_config.cfg

@@ -0,0 +1,24 @@
+[Bruker Colors]
+BrukerIce = #008DEB
+BrukerPacific = #054169
+BrukerOcean = #0071BC
+BrukerGlacier = #E5F1F8
+BrukerDolomite = #A0A0A0
+BrukerObsidian = #313331
+BrukerGranite = #737373
+BrukerLimestone = #DCDCDC
+BrukerOrange = #FF9300
+BrukerRed = #FF0011
+BrukerGreen = #AFC800
+
+[Roles]
+primary1 = #054169
+primary2 = #0071BC
+secondary1 = #737373
+secondary2 = #A0A0A0
+accent = #FF9300
+
+[Plot]
+color_order = BrukerPacific, BrukerIce, BrukerOrange, BrukerGreen, BrukerObsidian, BrukerGranite
+line_styles = solid, dash, dot, dash_dot
+line_width = 2.5

{speclog-0.0.5 → speclog-0.0.7}/SpecLog/config_editor.py

@@ -45,6 +45,7 @@ class ConfigEditor(QMainWindow):
         self.logger_log_offset = 0
         self.startup_state = "Checking..."
         self.scheduled_task_running = False
+        self._closing = False
         self.setWindowTitle("SpecLog Configuration")
         self.resize(900, 600)
         self._build_ui()
@@ -95,6 +96,36 @@ class ConfigEditor(QMainWindow):
         self.startup_timer.start()
         self._refresh_startup_status()
 
+    def closeEvent(self, event):
+        """Stop status probes before Qt destroys the editor's widgets."""
+        self._closing = True
+        for timer_name in ("logger_timer", "startup_timer"):
+            timer = getattr(self, timer_name, None)
+            if timer is not None:
+                timer.stop()
+
+        # A process can emit errorOccurred while its parent and sibling widgets
+        # are being torn down.  Block those callbacks first, then ensure no
+        # child process is left running when its QProcess wrapper is destroyed.
+        for process_name in (
+            "task_state_process",
+            "startup_query_process",
+            "logger_process",
+            "startup_process",
+        ):
+            process = getattr(self, process_name, None)
+            if process is None:
+                continue
+            process.blockSignals(True)
+            if process.state() == QProcess.ProcessState.NotRunning:
+                continue
+            process.terminate()
+            if not process.waitForFinished(500):
+                process.kill()
+                process.waitForFinished(1000)
+
+        super().closeEvent(event)
+
     def _update_command_buttons(self, tab_index):
         self.add_value_command_button.setVisible(tab_index == 0)
         self.add_status_command_button.setVisible(tab_index == 1)
@@ -115,6 +146,8 @@ class ConfigEditor(QMainWindow):
         return is_logger_running()
 
     def _refresh_logger_status(self):
+        if self._closing:
+            return
         if os.name != "nt":
             self.logger_status_label.setText("Status unavailable")
             self.start_logger_button.setEnabled(False)
@@ -286,6 +319,8 @@ class ConfigEditor(QMainWindow):
             )
 
     def _refresh_startup_status(self):
+        if self._closing:
+            return
         if os.name != "nt":
             self._set_startup_state("Unavailable")
             return