datview 2.0.0__tar.gz → 2.1.0__tar.gz

{datview-2.0.0 → datview-2.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datview
-Version: 2.0.0
+Version: 2.1.0
 Summary: GUI software for viewing images, text, cine, and HDF files.
 Home-page: https://github.com/algotom/datview
 Download-URL: https://github.com/algotom/datview.git
@@ -53,7 +53,7 @@ Motivation
 ==========
 
 For synchrotron-based tomography, users need convenient tools to view their 
-data, typically in TIF, HDF, or CINE format during experiments, along with 
+data, typically in text, TIF, HDF, or CINE format during experiments, along with 
 basic assessment tools such as contrast adjustment, zooming, line-profile 
 viewing, histograms, image statistics, or percentile density. However, at synchrotron facilities, 
 where Linux OS and open-source software are the primary tools, users often need to switch 
@@ -64,12 +64,8 @@ This separation of tools is inconvenient, especially since many users are not fa
 with the Linux OS. **DatView** provides a unified GUI for all these tasks, improving 
 efficiency and user experience. **DatView** runs across operating systems.
 
-Design Philosophy
-=================
-
-DatView has been developed following two key guidelines:
--   Minimize dependencies and the codebase.
--   Maximize functionality and maintainability.
+Design
+======
 
 For distributing the software through Pip and Conda, the software is structured 
 based on the RUI (Rendering-Utilities-Interactions) concept, which is a user-friendly 
@@ -107,7 +103,6 @@ Features
     ![Fig5](https://github.com/algotom/datview/raw/main/figs/fig5.png)
 
 -   Interactive viewing of TIF files in a folder or frames of a CINE file.
-
 -   Interactive viewing of common image formats (JPG, PNG, TIF, ...).
 -   Viewing 1D or 2D datasets of an HDF file in table format.
 -   Opening multiple interactive viewers simultaneously.

{datview-2.0.0 → datview-2.1.0}/README.md

@@ -13,7 +13,7 @@ Motivation
 ==========
 
 For synchrotron-based tomography, users need convenient tools to view their 
-data, typically in TIF, HDF, or CINE format during experiments, along with 
+data, typically in text, TIF, HDF, or CINE format during experiments, along with 
 basic assessment tools such as contrast adjustment, zooming, line-profile 
 viewing, histograms, image statistics, or percentile density. However, at synchrotron facilities, 
 where Linux OS and open-source software are the primary tools, users often need to switch 
@@ -24,12 +24,8 @@ This separation of tools is inconvenient, especially since many users are not fa
 with the Linux OS. **DatView** provides a unified GUI for all these tasks, improving 
 efficiency and user experience. **DatView** runs across operating systems.
 
-Design Philosophy
-=================
-
-DatView has been developed following two key guidelines:
--   Minimize dependencies and the codebase.
--   Maximize functionality and maintainability.
+Design
+======
 
 For distributing the software through Pip and Conda, the software is structured 
 based on the RUI (Rendering-Utilities-Interactions) concept, which is a user-friendly 
@@ -67,7 +63,6 @@ Features
     ![Fig5](https://github.com/algotom/datview/raw/main/figs/fig5.png)
 
 -   Interactive viewing of TIF files in a folder or frames of a CINE file.
-
 -   Interactive viewing of common image formats (JPG, PNG, TIF, ...).
 -   Viewing 1D or 2D datasets of an HDF file in table format.
 -   Opening multiple interactive viewers simultaneously.

datview-2.1.0/datview/__init__.py

@@ -0,0 +1 @@
+__version__ = "2.1.0"

{datview-2.0.0 → datview-2.1.0}/datview/lib/interactions.py

@@ -9,12 +9,13 @@ import sys
 import json
 import threading
 from pathlib import Path
-import numpy as np
 import h5py
+import numpy as np
 from PIL import Image
+import pyqtgraph as pg
 from PySide6.QtCore import QObject, Qt, QTimer
-from PySide6.QtWidgets import QApplication, QFileDialog, QMessageBox, \
-    QTreeWidgetItem, QInputDialog, QLineEdit
+from PySide6.QtWidgets import (QApplication, QFileDialog, QMessageBox,
+                               QTreeWidgetItem, QInputDialog, QLineEdit)
 
 import datview.lib.rendering as ren
 import datview.lib.utilities as util
@@ -29,12 +30,16 @@ class DatviewInteraction(QObject):
         self.app.setApplicationName(util.APP_NAME)
         self.app.setFont(ren.select_ui_font(point_size=util.FONT_SIZE,
                                             weight=util.FONT_WEIGHT))
-        ren.apply_app_theme(self.app)
+        # Load saved theme (default Light)
+        config_data = util.load_config()
+        saved_theme = "Light"
+        if config_data and "theme" in config_data:
+            if config_data["theme"] in ren.THEMES:
+                saved_theme = config_data["theme"]
+        ren.apply_theme(self.app, saved_theme)
 
         if base_folder is None:
-            cfg = util.load_config()
-            if cfg:
-                base_folder = cfg.get("last_folder")
+            base_folder = config_data.get("last_folder") if config_data else None
             if not base_folder:
                 base_folder = os.path.expanduser("~")
 
@@ -43,6 +48,10 @@ class DatviewInteraction(QObject):
             self.base_folder = Path.home()
 
         self.main_win = ren.DatviewMainWindow(str(self.base_folder))
+        # Restore theme combo
+        self.main_win.combo_theme.blockSignals(True)
+        self.main_win.combo_theme.setCurrentText(saved_theme)
+        self.main_win.combo_theme.blockSignals(False)
         self.active_viewer = None
         self.viewers = []
         self.current_table = None
@@ -57,6 +66,7 @@ class DatviewInteraction(QObject):
     def _wire_signals(self):
         """Wire UI signals to controller slots."""
         self.main_win.sig_browse_requested.connect(self.select_base_folder)
+        self.main_win.sig_theme_changed.connect(self.on_theme_changed)
         self.main_win.sig_folder_selected.connect(self.on_folder_select)
         self.main_win.sig_file_select_changed.connect(
             self.on_file_select_change)
@@ -83,7 +93,23 @@ class DatviewInteraction(QObject):
             self.populate_tree_root()
             self.main_win.combo_hdf.clear()
             self.main_win.combo_hdf.setEnabled(False)
-            util.save_config({"last_folder": str(self.base_folder)})
+            theme_name = self.main_win.combo_theme.currentText()
+            util.save_config({"last_folder": str(self.base_folder), "theme": theme_name})
+
+    def on_theme_changed(self, theme_name: str):
+        """Apply the selected theme and refresh open viewer backgrounds."""
+        if not self.app:
+            return
+        ren.apply_theme(self.app, theme_name)
+        pg_bg = pg.mkColor(ren.sel_theme["SURFACE"])
+        for v in self.viewers:
+            if hasattr(v, "imv") and v.imv is not None:
+                try:
+                    v.imv.getHistogramWidget().setBackground(pg_bg)
+                except Exception:
+                    pass
+        cfg = {"last_folder": str(self.base_folder), "theme": theme_name}
+        util.save_config(cfg)
 
     def populate_tree_root(self):
         self.main_win.tree.clear()
@@ -379,8 +405,8 @@ class DatviewInteraction(QObject):
         try:
             img = util.load_image(path)
             win = ren.Viewer2DWindow(self,
-                                     title=f"Viewing: {os.path.basename(path)}. "
-                                           f"(Height, Width) = {img.shape}",
+                                     title=f"Viewing: {os.path.basename(path)}."
+                                           f" (Height, Width) = {img.shape}",
                                      image=img, file_path=path)
             win.parent_app = self
             self._show_window(win)
@@ -599,7 +625,7 @@ class DatviewInteraction(QObject):
                                             "2D arrays.")
                 return
             # Too large -> show as image instead of table
-            if data.size > util.TABLE_SIZE_CUTOFF:
+            if data.size > util.TABLE_SIZE_CUTOFF and len(data.shape) == 2:
                 info = " !!!Display as image instead table due to size!!!"
                 win = ren.Viewer2DWindow(
                     self,
@@ -677,6 +703,28 @@ class DatviewInteraction(QObject):
         self.active_viewer = viewer
         self.main_win.statusBar().showMessage(f"Active: {viewer.windowTitle()}")
 
+    def _get_save_start_path(self, default_ext: str):
+        """
+        Return a default save path based on the current active viewer file.
+        """
+        source_path = None
+
+        if self.active_viewer and hasattr(self.active_viewer, "file_path"):
+            source_path = self.active_viewer.file_path
+
+        if source_path:
+            source_path = os.path.normpath(source_path)
+
+            if os.path.isfile(source_path):
+                base_dir = os.path.dirname(source_path)
+                base_name = os.path.splitext(os.path.basename(source_path))[0]
+                return os.path.join(base_dir, base_name + default_ext)
+
+            if os.path.isdir(source_path):
+                return os.path.join(source_path, "output" + default_ext)
+
+        return os.path.join(os.getcwd(), "output" + default_ext)
+
     def save_to_image(self):
         if self.active_viewer and hasattr(self.active_viewer, 'viewer_state'):
             img = self.active_viewer.viewer_state.get("image")
@@ -688,13 +736,28 @@ class DatviewInteraction(QObject):
             QMessageBox.information(self.main_win, "Input needed",
                                     "No active image. Use Interactive-Viewer!")
             return
+        default_path = self._get_save_start_path(".tif")
+        path, selected_filter = QFileDialog.getSaveFileName(
+            self.main_win,
+            "Save Image As",
+            default_path,
+            "TIFF (*.tif);;PNG (*.png);;JPEG (*.jpg)")
+
+        if not path:
+            return
 
-        path, _ = QFileDialog.getSaveFileName(self.main_win,
-                                              "Save Image As", "",
-                                              "TIFF (*.tif);;PNG (*.png);;"
-                                              "JPEG (*.jpg)")
-        if path:
-            util.save_image(path, img)
+        if not os.path.splitext(path)[1]:
+            if "PNG" in selected_filter:
+                path += ".png"
+            elif "JPEG" in selected_filter:
+                path += ".jpg"
+            else:
+                path += ".tif"
+
+        err = util.save_image(path, img)
+        if err:
+            QMessageBox.critical(self, "Save failed", err)
+        else:
             self.main_win.statusBar().showMessage(f"Image saved to: {path}")
 
     def save_to_table(self):
@@ -718,11 +781,19 @@ class DatviewInteraction(QObject):
                                     f"({util.MAX_TABLE_SAVE} elements).")
             return
 
-        path, _ = QFileDialog.getSaveFileName(self.main_win, "Save Data As", "",
-                                              "CSV (*.csv)")
+        default_path = self._get_save_start_path(".csv")
+
+        path, _ = QFileDialog.getSaveFileName(self.main_win, "Save Data As",
+                                              default_path, "CSV (*.csv)")
+
         if path:
-            util.save_table(path, data)
-            self.main_win.statusBar().showMessage(f"Data saved to: {path}")
+            if not os.path.splitext(path)[1]:
+                path += ".csv"
+            err = util.save_table(path, data)
+            if err:
+                QMessageBox.critical(self, "Save failed", err)
+            else:
+                self.main_win.statusBar().showMessage(f"Data saved to: {path}")
 
     def _show_window(self, win):
         self.viewers.append(win)