datview 2.0.0__tar.gz → 2.0.1__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datview
-Version: 2.0.0
+Version: 2.0.1
 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

datview-2.0.1/datview/__init__.py

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

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

@@ -677,6 +677,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 +710,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 +755,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)

{datview-2.0.0 → datview-2.0.1}/datview/lib/rendering.py

@@ -96,6 +96,14 @@ THEME_QSS = f"""
 """
 
 
+if platform.system() == "Linux":
+    for var in ("FONTCONFIG_FILE", "FONTCONFIG_PATH"):
+        if var in os.environ and not os.environ[var].strip():
+            del os.environ[var]
+    os.environ.setdefault("FONTCONFIG_FILE", "/etc/fonts/fonts.conf")
+    os.environ.setdefault("FONTCONFIG_PATH", "/etc/fonts")
+
+
 def select_ui_font(point_size: int = 13, weight: int = QFont.Normal) -> QFont:
     """
     Choose a UI font based on OS, using a priority list.
@@ -1621,7 +1629,6 @@ class InteractiveViewerWindow(BaseWindow):
             self.v_line.setPos(x)
             self.v_line.show()
             self.h_line.hide()
-            # data = img[:, x]
             data = np.asarray(img[:, x], dtype=np.float64)
             self.plot_widget.setTitle(f"Intensity at column: {x}")
         if not np.isfinite(data).all():
@@ -1652,6 +1659,7 @@ class InteractiveViewerWindow(BaseWindow):
             pass
 
     def save_current_image(self):
+        self.perform_update()
         if hasattr(self.parent_app, "set_active_viewer"):
             self.parent_app.set_active_viewer(self)
         self.parent_app.save_to_image()

{datview-2.0.0 → datview-2.0.1}/datview/main.py

@@ -5,6 +5,7 @@ import argparse
 from PySide6.QtCore import QTimer
 import datview.lib.utilities as util
 from datview.lib.interactions import DatviewInteraction
+from datview import __version__
 
 display_msg = """
 ===============================================================================
@@ -19,6 +20,8 @@ def parse_args():
     parser = argparse.ArgumentParser(
         description=display_msg,
         formatter_class=argparse.RawDescriptionHelpFormatter)
+    parser.add_argument("-v", "--version", action="version",
+                        version=f"Datview {__version__}")
     parser.add_argument("-b", "--base", type=str, default=None,
                         help="Specify the base folder")
     parser.add_argument("path", type=str, nargs="?", default=None,

{datview-2.0.0 → datview-2.0.1}/datview.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datview
-Version: 2.0.0
+Version: 2.0.1
 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

{datview-2.0.0 → datview-2.0.1}/setup.py

@@ -14,7 +14,7 @@ README = (HERE / "README.md").read_text()
 
 setuptools.setup(
     name="datview",
-    version="2.0.0",
+    version="2.0.1",
     author="Nghia Vo",
     author_email="nvo@bnl.gov",
     description="GUI software for viewing images, text, cine, and HDF files.",

datview-2.0.0/datview/__init__.py

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