Save and Save As Improvements

pymapmanager/interface2/pyMapManagerApp2.py

@@ -307,7 +307,8 @@ def saveFile(self):
             # looping through every path in stackWidgetDict
             # key = path of current stack
             stackWidget = self._stackWidgetDict[key]
-            stackWidget.save(key)
+            # stackWidget.save(key)
+            stackWidget.save()
 
     def saveAsFile(self):
         """ Save change to a new file

pymapmanager/interface2/runInterfaceJohnson.py

@@ -27,7 +27,8 @@ def run():
     # path ='\\Users\\johns\\Documents\\GitHub\\MapManagerCore\\sandbox\\data\\rr30a_s0.mmap'
     # path = 'C:\\Users\\johns\\Documents\\GitHub\\MapManagerCore\\data\\rr30a_s0u.mmap'
     # path = '\\Users\\johns\\Documents\\GitHub\\MapManagerCore\\data\\rr30a_s0u.mmap'
-    path = '/Users/johns/Documents/GitHub/MapManagerCore/data/rr30a_s0u.mmap'
+    # path = '/Users/johns/Documents/GitHub/MapManagerCore/data/rr30a_s0u.mmap'
+    path = '/Users/johns/Documents/GitHub/MapManagerCore/data/test2.mmap'
     # path = '/Users/johns/Documents/GitHub/PyMapManager-Data/one-timepoint/rr30a_s0_ch1.mmap'
     # import mapmanagercore
     # path = mapmanagercore.getSingleTimepointMap()
@@ -52,5 +53,5 @@ def run2():
     sys.exit(app.exec_())
 
 if __name__ == '__main__':
-    run()
-    # run2()
+    # run()
+    run2()

pymapmanager/interface2/stackWidgets/stackWidget2.py

@@ -2,6 +2,7 @@
 # from pymapmanager.interface2 import PyMapManagerApp
 # see: https://stackoverflow.com/questions/39740632/python-type-hinting-without-cyclic-imports
 from __future__ import annotations
+import os
 from typing import TYPE_CHECKING
 
 import pymapmanager.interface2
@@ -1030,10 +1031,19 @@ def _redo_action(self):
         # redoSpineEvent = RedoSpineEvent(self, redoEvent)
         # self.emitEvent(redoSpineEvent)
 
-    def save(self, path):
+    def save(self):
         """ Stack Widget saves changes to its Zarr file
         """
-        self.getStack().save(path)
+        # self.getStack().save()
+
+        path = self.getStack.getPath()
+        ext = os.path.splitext(path)[1]
+        if ext == ".mmap":
+            self.getStack().save()
+        elif ext == "tif":
+            self.fileSaveAs()
+        else:
+            logger.info("Extension not understood, nothing is saved")
 
     # def old_saveAs(self, path):
     #     """ Stack Widget saves changes to a new zarr file path
@@ -1048,4 +1058,4 @@ def fileSaveAs(self):
         # ('C:/Users/johns/Documents/GitHub/MapManagerCore/data/test', 'All Files (*)')
         saveAsPath = QtWidgets.QFileDialog.getSaveFileName(None, 'Save File')[0]
         logger.info(f"name {saveAsPath}")
-        self.getStack().save(saveAsPath)
+        self.getStack().saveAs(saveAsPath)

pymapmanager/stack.py

@@ -369,16 +369,24 @@ def redo(self):
         self.getPointAnnotations()._buildDataFrame()
 
     #abj
-    def save(self, path):
-        """ Stack saves changes to its Zarr file
+    def save(self):
+        """ Stack saves changes to its .mmap Zarr file that is stored
         """
         logger.info(f"Entering Stack save")
+
+        path =  self.getPath()
+        ext = os.path.splitext(path)[1]
+
+        if ext == ".mmap":
+            self._fullMap.save(self.getPath())
+        else:
+            logger.info("Not an .mmap file - No save occurred")
+
+    def saveAs(self, path):
+        """ Stack saves changes to to a new zarr file path
+            that user types in through dialog
+        """
         self._fullMap.save(path)
-
-    # def saveAs(self, path):
-    #     """ Stack saves changes to to a new zarr file path
-    #     """
-    #     self._fullMap.save(path)