refactored EditDataClass

Author: cudmore

src/pymapmanager/interface/mainMenus.py

@@ -511,18 +511,18 @@ def _refreshFileMenu(self):
         self.fileMenu.addMenu(self.sampleDataMenu)
 
         # abj: copy spine dataframe to clip board or export spine dataframe to csv
-        self.fileMenu.addSeparator()
-        self.spineTableMenu = QtWidgets.QMenu("Spine Table ...")
-        self.spineTableMenu.setEnabled(_frontStackWindow is not None)
-        self.fileMenu.addMenu(self.spineTableMenu)
+        # self.fileMenu.addSeparator()
+        # self.spineTableMenu = QtWidgets.QMenu("Spine Table ...")
+        # self.spineTableMenu.setEnabled(_frontStackWindow is not None)
+        # self.fileMenu.addMenu(self.spineTableMenu)
 
-        copySpineTableAction = QtWidgets.QAction('Copy to ClipBoard', self.getApp())
-        copySpineTableAction.triggered.connect(lambda: self.getApp().exportSpineTable("copy"))
-        self.spineTableMenu.addAction(copySpineTableAction)
+        # copySpineTableAction = QtWidgets.QAction('Copy to ClipBoard', self.getApp())
+        # copySpineTableAction.triggered.connect(lambda: self.getApp().exportSpineTable("copy"))
+        # self.spineTableMenu.addAction(copySpineTableAction)
 
-        exportSpineTableAction = QtWidgets.QAction('Export to CSV', self.getApp())
-        exportSpineTableAction.triggered.connect(lambda: self.getApp().exportSpineTable("export"))
-        self.spineTableMenu.addAction(exportSpineTableAction)
+        # exportSpineTableAction = QtWidgets.QAction('Export to CSV', self.getApp())
+        # exportSpineTableAction.triggered.connect(lambda: self.getApp().exportSpineTable("export"))
+        # self.spineTableMenu.addAction(exportSpineTableAction)
 
     def _refreshOpenRecent(self):
         """Dynamically generate the open recent stack/map menu.

src/pymapmanager/interface/pyMapManagerApp.py

@@ -29,7 +29,7 @@
 
 from pymapmanager.interface.openFirstWindow import OpenFirstWindow
 from pymapmanager.interface.openFolderWindow import OpenFolderWindow
-from pymapmanager.interface.stackWidgets.analysisParamWidget2 import AnalysisParamWidget
+from pymapmanager.interface.stackWidgets.metaDataWidget import AnalysisParamWidget
 from pymapmanager.timeseriesCore import TimeSeriesCore
 
 from pymapmanager.interface.mapWidgets.mapWidget import mapWidget

src/pymapmanager/interface/stackWidgets/annotationListWidget2.py

@@ -45,15 +45,6 @@ def __init__(self,
         # rewire context menu
         self._myTableView.contextMenuEvent = self._contextMenuEvent
 
-    def _contextMenuEvent(self, event):
-        self.menu = QtWidgets.QMenu(self)
-        colorAction = QtWidgets.QAction('Set Color', self)
-        colorAction.triggered.connect(lambda: self._colorPickerSlot(event))
-        self.menu.addAction(colorAction)
-
-        # action = _menu.exec_(self.mapToGlobal(event.pos()))
-        self.menu.popup(QtGui.QCursor.pos())
-
     def _colorPickerSlot(self, event):
         """Show color dialog and set segment color.
         """
@@ -273,6 +264,10 @@ def on_table_selection(self, itemList : List[int], isAlt : bool = False):
         event.getStackSelection().setPointSelection(itemList)
         self.emitEvent(event, blockSlots=False)
 
+    def _contextMenuEvent(self, event):
+        """Define in derived."""
+        logger.error(f'{self.getClassName()} base class called')
+    
 class pointListWidget(annotationListWidget):
 
     _widgetName = 'Point List'
@@ -362,6 +357,31 @@ def _deleteSelected(self):
             deleteSpineEvent = DeleteSpineEvent(self, spineLabelList)
             self.emitEvent(deleteSpineEvent)
 
+    def _contextMenuEvent(self, event):
+        
+        logger.info(f'{self.getClassName()}')
+
+        self.menu = QtWidgets.QMenu(self)
+
+        # export spines to clipboard
+        exportToClipboardAction = QtWidgets.QAction('Copy Spines To Clipboard', self)
+        # exportToClipboardAction.triggered.connect(lambda: self.getStackWidget().exportSpines(mode='copy'))
+        exportToClipboardAction.triggered.connect(lambda: self._exportSpines(mode='copy'))
+        self.menu.addAction(exportToClipboardAction)
+
+        # export spines to csv file
+        exportToFileAction = QtWidgets.QAction('Export Spines To File', self)
+        # exportToFileAction.triggered.connect(lambda: self.getStackWidget().exportSpines(mode='export'))
+        exportToFileAction.triggered.connect(lambda: self._exportSpines(mode='export'))
+        self.menu.addAction(exportToFileAction)
+
+        # action = _menu.exec_(self.mapToGlobal(event.pos()))
+        self.menu.popup(QtGui.QCursor.pos())
+
+    def _exportSpines(self, mode):
+        logger.warning(f'mode:{mode}')
+        self.getStackWidget().exportSpines(mode=mode)
+
 class lineListWidget(annotationListWidget):
 
     _widgetName = 'Segment List'
@@ -581,3 +601,13 @@ def addSegment(self):
         """
         self.tracingWidget.on_segment_button_clicked(state = None, buttonName= '+')
 
+    def _contextMenuEvent(self, event):
+        self.menu = QtWidgets.QMenu(self)
+        
+        # color dialog to set color
+        colorAction = QtWidgets.QAction('Set Color', self)
+        colorAction.triggered.connect(lambda: self._colorPickerSlot(event))
+        self.menu.addAction(colorAction)
+
+        # action = _menu.exec_(self.mapToGlobal(event.pos()))
+        self.menu.popup(QtGui.QCursor.pos())

src/pymapmanager/interface/stackWidgets/base/editDataclass.py

@@ -14,12 +14,12 @@ class EditDataClass(mmWidget2):
 
     def __init__(self,
                  stackWidget: stackWidget,
+                 dataClass: "_metadataBase" = None,
                  ):
         """After init, must call setDataclass().
         """
         super().__init__(stackWidget)
 
-        # self._dataclass: _metadataBase = None
         self._dataclass: "_metadataBase" = None
         """The dataclass we are editing."""
 
@@ -29,7 +29,13 @@ def __init__(self,
         self.widgetDict = {}
         self.canApply = False
 
+        if dataClass is not None:
+            self.setDataclass(dataClass)
+
     def setDataclass(self, dataClass):
+        if self._dataclass is not None:
+            logger.warning(f'reassigning _dataclass, already assigned as {type(self_dataclass)}')
+        
         self._dataclass = dataClass
         self._dict = self._dataclass.to_dict_with_metadata()
 

src/pymapmanager/interface/stackWidgets/base/mmWidget2.py

@@ -1382,14 +1382,15 @@ def exportSpines(self, mode: str):
         Parameters
         ----------
         mode: str
-            "export" or "copy"
+            "export" to file or "copy" to clipboard.
         """    
         filename = None
         if mode == 'export':
-            logger.error('todo: prompt user for a file')
-            filename = ''
+            # abb, we need this here because once we are in stack(), we don't have a GUI
+            logger.error('todo: prompt user for a csv file')
+            # filename = ''
 
-        self.getStack().exportSpines(mode, filename=filename)
+        self.getStack().exportSpines(filename=filename)
 
 if __name__ == '__main__':
     from pymapmanager._logger import setLogLevel

src/pymapmanager/interface/stackWidgets/experimentMetadata.py

@@ -1,15 +1,12 @@
+from qtpy import QtWidgets
+
 from pymapmanager.interface.stackWidgets.base.editDataclass import EditDataClass
 from pymapmanager.interface.stackWidgets import stackWidget
-from pymapmanager._logger import logger, setLogLevel
-from qtpy import QtGui, QtCore, QtWidgets
 
-from pymapmanager.interface.pyMapManagerApp import PyMapManagerApp
-from pymapmanager._logger import logger
-from pymapmanager.interface.stackWidgets.experimentMetadata import ExperimentMetadata
-from pymapmanager.interface.stackWidgets.voxelMetadata import VoxelMetadata 
 from pymapmanager.interface.stackWidgets.analysisParamWidget2 import AnalysisParamWidget 
+from pymapmanager.interface.stackWidgets.base.mmWidget2  import mmWidget2
 
-from pymapmanager.interface.stackWidgets.base.mmWidget2  import mmWidget2, pmmEventType, pmmEvent
+# from pymapmanager._logger import logger
 
 class MetaDataWidget(mmWidget2):
     _widgetName = 'Metadata Widget'
@@ -21,9 +18,13 @@ def __init__(self, stackWidget: stackWidget):
         self.tabWidget = QtWidgets.QTabWidget()
         layout.addWidget(self.tabWidget)
 
-        # Instantiate and add tabs
-        self.voxelTab = VoxelMetadata(stackWidget)
-        self.experimentTab = ExperimentMetadata(stackWidget)
+        # add tabs
+        voxelMetadata = stackWidget.getStack().getMetadata().voxelMetadata
+        self.voxelTab = EditDataClass(stackWidget, dataClass=voxelMetadata)
+
+        experimentMetadata = stackWidget.getStack().getMetadata().experimentMetadata
+        self.experimentTab = EditDataClass(stackWidget, dataClass=experimentMetadata)
+
         self.analysisParamsTab = AnalysisParamWidget(stackWidget)
 
         # self.tabWidget.addTab(self.geometryTab, self.geometryTab._widgetName)

src/pymapmanager/interface/stackWidgets/metaDataWidget.py

@@ -96,7 +96,9 @@ def __init__(self,
         self.setWindowTitle(self.getStack().getFileName())
 
         self._buildUI()
-        self._buildMenus()
+        
+        # moved to MainWindow
+        # self._buildMenus()
 
         # self.setContextMenuPolicy(QtCore.Qt.NoContextMenu) # abj - disabled hidden context menu
 

src/pymapmanager/interface/stackWidgets/stackWidget.py

@@ -241,15 +241,13 @@ def shape(self):
     def getDendrogramReplot(self, newSegmentID, spineAngleChecked, spineLengthChecked , spineLengthConstant):
         return self._fullMap.getDendrogramReplot(newSegmentID, spineAngleChecked, spineLengthChecked, spineLengthConstant)
 
-    def exportSpines(self, mode:str, filename:str = None):
+    def exportSpines(self, filename:str = None):
         """Export spines to clipboard or file.
         
         Parameters
         ==========
-        mode:
-            in ['export', 'copy']
         filename:
-            file name to save to if mode is 'export'
+            file name to export to, if None then copy to clipboard
         """
         # get the spine dataframe in physical units
         df = self._convertToMicrometer()
@@ -258,14 +256,14 @@ def exportSpines(self, mode:str, filename:str = None):
             logger.error('empty df')
             return
 
-        if mode == 'export':
-            logger.error(f'todo: save csv to filename:{filename}')
-            #df.to_csv(filename, index=False)
-
-        elif mode == 'copy':
-            logger.info(f'copied {len(df)} spines to clipboard.')
+        if filename is None:
             df.to_clipboard()
-
+            logger.info(f'copied {len(df)} spines to clipboard')
+            
+        else:
+            logger.error('todo: be sure to fill in proper filename when still in PyQt GUI')
+            df.to_csv(filename, index=False)
+            
     def _convertToMicrometer(self):
         """  Convert df columns values in pixels to micrometer