toucan-plot 0.2.7__tar.gz → 0.3.0__tar.gz

{toucan_plot-0.2.7/src/toucan_plot.egg-info → toucan_plot-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: toucan-plot
-Version: 0.2.7
+Version: 0.3.0
 Summary: A versatile PyQt6 and Matplotlib-based plotting tool for CSV and SMV data files.
 License-Expression: MIT
 Requires-Python: >=3.11
@@ -14,6 +14,7 @@ Requires-Dist: scienceplots>=2.2.1
 Requires-Dist: python-can>=4.0
 Requires-Dist: cantools>=39.0
 Requires-Dist: asammdf>=7.0
+Requires-Dist: pyarrow>=23.0.1
 Dynamic: license-file
 
 # Toucan-Plot

{toucan_plot-0.2.7 → toucan_plot-0.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "toucan-plot"
-version = "0.2.7"
+version = "0.3.0"
 description = "A versatile PyQt6 and Matplotlib-based plotting tool for CSV and SMV data files."
 license = "MIT"
 readme = { file = "README.md", content-type = "text/markdown" }
@@ -14,6 +14,7 @@ dependencies = [
     "python-can>=4.0",
     "cantools>=39.0",
     "asammdf>=7.0",
+    "pyarrow>=23.0.1",
 ]
 
 [project.scripts]

{toucan_plot-0.2.7 → toucan_plot-0.3.0}/src/toucan_plot/main.py

@@ -9,7 +9,7 @@ from matplotlib.backends.backend_qtagg import FigureCanvasQTAgg as FigureCanvas
 from matplotlib.backends.backend_qt import NavigationToolbar2QT as NavigationToolbar
 import qdarktheme
 
-from toucan_plot.utils import styles, csv_load_worker, can_log_load_worker, mf4_load_worker
+from toucan_plot.utils import styles, csv_load_worker, can_log_load_worker, mf4_load_worker, feather_load_worker
 
 LEGEND_POSITIONS = [
     'best', 'upper right', 'upper left', 'lower left', 'lower right',
@@ -687,6 +687,7 @@ class MainWindow(QtWidgets.QMainWindow):
         dbc_files = [p for p in paths if os.path.splitext(p)[1].lower() == '.dbc']
         csv_files = [p for p in paths if os.path.splitext(p)[1].lower() in ('.csv', '.smv')]
         mf4_files = [p for p in paths if os.path.splitext(p)[1].lower() in ('.mf4', '.mf4z')]
+        feather_files = [p for p in paths if os.path.splitext(p)[1].lower() == '.feather']
 
         first_loaded = False
 
@@ -715,19 +716,27 @@ class MainWindow(QtWidgets.QMainWindow):
                 self._merged_mode = True
                 self._merge_load_mf4(path, os.path.basename(path))
 
+        for path in feather_files:
+            if not first_loaded:
+                self._load_feather(path)
+                first_loaded = True
+            else:
+                self._merged_mode = True
+                self._merge_load_feather(path, os.path.basename(path))
+
         if self._merged_mode and self.series_list:
             file_names = [f['name'] for f in self._loaded_files]
             self.update_plot()
             self.setWindowTitle(f'Toucan-Plot — Merged: {", ".join(file_names)}')
 
     def open_file(self):
-        file_filter = "All supported files (*.csv *.smv *.blf *.trc *.asc *.dbc *.mf4 *.mf4z);;CSV files (*.csv);;SMV files (*.smv);;MF4 files (*.mf4 *.mf4z);;CAN files (*.blf *.trc *.asc *.dbc);;All files (*)"
+        file_filter = "All supported files (*.csv *.smv *.blf *.trc *.asc *.dbc *.mf4 *.mf4z *.feather);;CSV files (*.csv *.smv);;MF4 files (*.mf4 *.mf4z);;Feather files (*.feather);;CAN files (*.blf *.trc *.asc *.dbc);;All files (*)"
         paths, _ = QtWidgets.QFileDialog.getOpenFileNames(self, 'Open File', '', file_filter)
         self.open_files(paths)
 
     def merge_file(self):
         """Open additional files and append their series to the existing plot session."""
-        file_filter = "All supported files (*.csv *.smv *.blf *.trc *.asc *.dbc *.mf4 *.mf4z);;CSV files (*.csv);;SMV files (*.smv);;MF4 files (*.mf4 *.mf4z);;CAN files (*.blf *.trc *.asc *.dbc);;All files (*)"
+        file_filter = "All supported files (*.csv *.smv *.blf *.trc *.asc *.dbc *.mf4 *.mf4z *.feather);;CSV files (*.csv *.smv);;MF4 files (*.mf4 *.mf4z);;Feather files (*.feather);;CAN files (*.blf *.trc *.asc *.dbc);;All files (*)"
         paths, _ = QtWidgets.QFileDialog.getOpenFileNames(self, 'Merge Files', '', file_filter)
         if not paths:
             return
@@ -738,6 +747,7 @@ class MainWindow(QtWidgets.QMainWindow):
         dbc_files = [p for p in paths if os.path.splitext(p)[1].lower() == '.dbc']
         csv_files = [p for p in paths if os.path.splitext(p)[1].lower() in ('.csv', '.smv')]
         mf4_files = [p for p in paths if os.path.splitext(p)[1].lower() in ('.mf4', '.mf4z')]
+        feather_files = [p for p in paths if os.path.splitext(p)[1].lower() == '.feather']
 
         for path in csv_files:
             basename = os.path.basename(path)
@@ -752,6 +762,10 @@ class MainWindow(QtWidgets.QMainWindow):
             basename = os.path.basename(path)
             self._merge_load_mf4(path, basename)
 
+        for path in feather_files:
+            basename = os.path.basename(path)
+            self._merge_load_feather(path, basename)
+
         if self.series_list:
             file_names = [f['name'] for f in self._loaded_files]
             self.update_plot()
@@ -1203,6 +1217,153 @@ class MainWindow(QtWidgets.QMainWindow):
             file_entry['series_indices'].append(idx)
         self._loaded_files.append(file_entry)
 
+    def _load_feather(self, path):
+        """Load a Feather file using a worker process with live progress."""
+        queue = multiprocessing.Queue()
+        proc = multiprocessing.Process(target=feather_load_worker, args=(path, queue))
+
+        progress = QtWidgets.QProgressDialog(f'Loading {os.path.basename(path)}...', None, 0, 100, self)
+        progress.setWindowTitle('Loading')
+        progress.setWindowModality(QtCore.Qt.WindowModality.WindowModal)
+        progress.setMinimumDuration(0)
+        progress.setValue(0)
+
+        result_data = {}
+
+        def poll():
+            try:
+                while not queue.empty():
+                    msg = queue.get_nowait()
+                    if msg[0] == 'progress':
+                        pct = msg[1]
+                        label = msg[2] if len(msg) > 2 else ''
+                        if pct >= 0:
+                            progress.setValue(pct)
+                        if label:
+                            progress.setLabelText(label)
+                    elif msg[0] == 'result':
+                        result_data['data'] = msg[1]
+                        progress.setValue(100)
+                        progress.close()
+                    elif msg[0] == 'error':
+                        result_data['error'] = msg[1]
+                        progress.close()
+            except Exception:
+                pass
+
+        timer = QtCore.QTimer(progress)
+        timer.timeout.connect(poll)
+        timer.start(50)
+        proc.start()
+        progress.exec()
+        timer.stop()
+        proc.join(timeout=10)
+
+        if 'error' in result_data:
+            QtWidgets.QMessageBox.warning(self, 'Error', result_data['error'])
+            return
+        if 'data' not in result_data:
+            return
+
+        x_col, all_columns = result_data['data']
+        x_array = all_columns[x_col]
+
+        self._x = x_array
+        self._all_columns = all_columns
+        self._x_col_name = x_col
+        self._merged_mode = False
+
+        # Clear existing series and subplots
+        self.series_list.clear()
+        self.subplot_series.clear()
+        self.subplot_series_props.clear()
+        self.subplot_axes_labels.clear()
+        self.subplot_config.clear()
+        self._loaded_files.clear()
+
+        # Build series_list from all_columns
+        basename = os.path.basename(path)
+        file_entry = {'name': basename, 'series_indices': []}
+        for name in all_columns:
+            if name == x_col:
+                continue
+            data = all_columns[name]
+            idx = len(self.series_list)
+            self.series_list.append((name, lambda x, f, _d=data: _d, x_array))
+            file_entry['series_indices'].append(idx)
+        self._loaded_files.append(file_entry)
+        self._merge_action.setEnabled(True)
+
+        self.update_plot()
+        self.setWindowTitle(f'Toucan-Plot — {basename}')
+        self.show_series_selector()
+
+    def _merge_load_feather(self, path, prefix):
+        """Load a Feather file and append its series (prefixed) to the existing series_list."""
+        queue = multiprocessing.Queue()
+        proc = multiprocessing.Process(target=feather_load_worker, args=(path, queue))
+
+        progress = QtWidgets.QProgressDialog(f'Loading {os.path.basename(path)}...', None, 0, 100, self)
+        progress.setWindowTitle('Loading')
+        progress.setWindowModality(QtCore.Qt.WindowModality.WindowModal)
+        progress.setMinimumDuration(0)
+        progress.setValue(0)
+
+        result_data = {}
+
+        def poll():
+            try:
+                while not queue.empty():
+                    msg = queue.get_nowait()
+                    if msg[0] == 'progress':
+                        pct = msg[1]
+                        label = msg[2] if len(msg) > 2 else ''
+                        if pct >= 0:
+                            progress.setValue(pct)
+                        if label:
+                            progress.setLabelText(label)
+                    elif msg[0] == 'result':
+                        result_data['data'] = msg[1]
+                        progress.setValue(100)
+                        progress.close()
+                    elif msg[0] == 'error':
+                        result_data['error'] = msg[1]
+                        progress.close()
+            except Exception:
+                pass
+
+        timer = QtCore.QTimer(progress)
+        timer.timeout.connect(poll)
+        timer.start(50)
+        proc.start()
+        progress.exec()
+        timer.stop()
+        proc.join(timeout=10)
+
+        if 'error' in result_data:
+            QtWidgets.QMessageBox.warning(self, 'Error', result_data['error'])
+            return
+        if 'data' not in result_data:
+            return
+
+        x_col, all_columns = result_data['data']
+        x_array = all_columns[x_col]
+
+        if len(self.series_list) == 0:
+            self._x = x_array
+            self._x_col_name = x_col
+
+        file_entry = {'name': prefix, 'series_indices': []}
+        for name in all_columns:
+            if name == x_col:
+                continue
+            data = all_columns[name]
+            prefixed_name = f'{prefix}: {name}'
+            idx = len(self.series_list)
+            self.series_list.append((prefixed_name, lambda x, f, _d=data: _d, x_array))
+            file_entry['series_indices'].append(idx)
+        self._loaded_files.append(file_entry)
+
     # ---- Measure cursors ----
 
     def _toggle_measure(self, checked: bool):

{toucan_plot-0.2.7 → toucan_plot-0.3.0}/src/toucan_plot/utils/__init__.py

@@ -4,6 +4,7 @@ from .loaders import (
     csv_load_worker,
     can_log_load_worker,
     mf4_load_worker,
+    feather_load_worker,
 )
 
 __all__ = [
@@ -11,4 +12,5 @@ __all__ = [
     "csv_load_worker",
     "can_log_load_worker",
     "mf4_load_worker",
+    "feather_load_worker",
 ]

{toucan_plot-0.2.7 → toucan_plot-0.3.0}/src/toucan_plot/utils/loaders.py

@@ -217,3 +217,41 @@ def mf4_load_worker(path, queue):
         queue.put(('result', (x_col, all_columns)))
     except Exception as e:
         queue.put(('error', str(e)))
+
+
+def feather_load_worker(path, queue):
+    """Multiprocessing worker for Feather loading via pandas. Sends progress via queue."""
+    try:
+        import pandas as pd
+
+        queue.put(('progress', 5, 'Reading Feather file...'))
+        df = pd.read_feather(path)
+
+        if df.empty:
+            queue.put(('error', 'Feather file is empty or has no data rows.'))
+            return
+
+        queue.put(('progress', 30, 'Building columns...'))
+        all_columns = {}
+        num_cols = len(df.columns)
+
+        x_col = None
+        for candidate in ('Time', 'timestamp', 'time'):
+            if candidate in df.columns:
+                x_col = candidate
+                break
+        if x_col is None:
+            x_col = df.columns[0]
+
+        for col_idx, col_name in enumerate(df.columns):
+            try:
+                all_columns[col_name] = df[col_name].to_numpy(dtype=float, na_value=np.nan)
+            except (ValueError, TypeError):
+                continue
+            pct = 30 + int(65 * (col_idx + 1) / num_cols)
+            queue.put(('progress', pct, f'Processing column {col_idx + 1}/{num_cols}...'))
+
+        queue.put(('progress', 98, 'Finalizing...'))
+        queue.put(('result', (x_col, all_columns)))
+    except Exception as e:
+        queue.put(('error', str(e)))

{toucan_plot-0.2.7 → toucan_plot-0.3.0/src/toucan_plot.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: toucan-plot
-Version: 0.2.7
+Version: 0.3.0
 Summary: A versatile PyQt6 and Matplotlib-based plotting tool for CSV and SMV data files.
 License-Expression: MIT
 Requires-Python: >=3.11
@@ -14,6 +14,7 @@ Requires-Dist: scienceplots>=2.2.1
 Requires-Dist: python-can>=4.0
 Requires-Dist: cantools>=39.0
 Requires-Dist: asammdf>=7.0
+Requires-Dist: pyarrow>=23.0.1
 Dynamic: license-file
 
 # Toucan-Plot

{toucan_plot-0.2.7 → toucan_plot-0.3.0}/src/toucan_plot.egg-info/requires.txt

@@ -6,3 +6,4 @@ scienceplots>=2.2.1
 python-can>=4.0
 cantools>=39.0
 asammdf>=7.0
+pyarrow>=23.0.1