Merge pull request #451 from rafalkowalewski1/development

Development

.readthedocs.yaml

@@ -8,7 +8,11 @@ version: 2
 build:
   os: ubuntu-22.04
   tools:
-    python: "3.10"
+    python:
+      version: 3.10
+      install:
+        - method: pip
+        - path: .
 
 # Build documentation in the "docs/" directory with Sphinx
 sphinx:

changelog.rst

@@ -3,10 +3,16 @@ Changelog
 
 Last change: 22-FEB-2024 MTS
 
-0.6.9
------
+0.6.9 - 0.6.10
+--------------
 - Added the option to draw polygon picks in Picasso: Render
 - Save pick properties in Picasso: Render saves areas of picked regions in nm^2
+- Calibration .yaml file saves number of frames and step size in nm
+- ``picasso.lib.merge_locs`` function can merge localizations from multiple files
+- Mask dialog in Picasso: Render saves .png mask files
+- Mask dialog in Picasso: Render allows to save .png with the blurred image
+- Picasso: Localize - added the option to save the current view as a .png file
+- Picasso:Render - functions related to picking moved to ``picasso.lib`` and ``picasso.postprocess``
 
 0.6.6 - 0.6.8
 -------------

picasso/__main__.py

@@ -165,15 +165,17 @@ def _hdf2csv(path):
         paths = glob(path)
     if paths:
         import os.path
+        from .io import load_locs
 
         for path in _tqdm(paths):
             base, ext = os.path.splitext(path)
             if ext == ".hdf5":
                 print("Converting {}".format(path))
                 out_path = base + ".csv"
-                locs = pd.read_hdf(path)
+                locs = load_locs(path)[0]
+                df = pd.DataFrame(locs)
                 print("A total of {} rows loaded".format(len(locs)))
-                locs.to_csv(out_path, sep=",", encoding="utf-8")
+                df.to_csv(out_path, sep=",", encoding="utf-8")
     print("Complete.")
 
 

picasso/gui/localize.py

@@ -1804,11 +1804,12 @@ def export_current(self):
             self, "Save image", out_path, filter="*.png;;*.tif"
         )
         if path:
-            qimage = QtGui.QImage(self.view.viewport().size(), QtGui.QImage.Format_RGB32)
+            qimage = QtGui.QImage(self.view.size(), QtGui.QImage.Format_RGB32)
             painter = QtGui.QPainter(qimage)
             self.view.render(painter)
             painter.end()
             qimage.save(path)
+            # self.view.scene().save_image(path)
         self.view.setMinimumSize(1, 1)
 
     def save_locs(self, path):