fixed tests and load MapAnnotations from tif

Author: cudmore

src/pymapmanager/_logger.py

@@ -14,7 +14,8 @@ def setLogLevel(newLogLevel : str = 'INFO'):
     logger = logging.getLogger(__name__)
 
     logger.info(f'setLogLevel() newLogLevel "{newLogLevel}"')
-    logger.info(f'   logging to file: {getLoggerFilePath()}')
+    logger.info(f'   logging to file:')
+    logger.info(f'{getLoggerFilePath()}')
 
     if newLogLevel == 'DEBUG':
         logLevel = logging.DEBUG

src/pymapmanager/annotations/lineAnnotationsCore.py

@@ -112,7 +112,8 @@ def _buildSummaryDf(self) -> pd.DataFrame:
 
         segmentDf = self.singleTimepoint.segments[:]
 
-        _columns = ['Segment', 'Points', 'Length', 'Radius', 'Pivot Distance', 'Color']
+        # _columns = ['Segment', 'Points', 'Length', 'Radius', 'Pivot Distance', 'Color']
+        _columns = ['Segment', 'Length', 'Radius', 'Pivot Distance', 'Color']
         summaryDf = pd.DataFrame(columns=_columns)
 
         try:
@@ -123,11 +124,11 @@ def _buildSummaryDf(self) -> pd.DataFrame:
             summaryDf['Radius'] = segmentDf['radius']
             summaryDf['Pivot Distance'] = segmentDf['pivotDistance']
             summaryDf['Color'] = segmentDf['color']
-            summaryDf['Points'] = segmentDf['points']
+            # summaryDf['Points'] = segmentDf['points']
             summaryDf['roughTracing'] = segmentDf['roughTracing'] # Represents point or linestring of segment
 
         except (KeyError) as e:
-            logger.error(e)
+            logger.error(f'KeyError:"{e}"')
             logger.error(f'available keys are: {segmentDf.keys()}')
 
         except (AttributeError) as e:
@@ -172,7 +173,7 @@ def _buildDataFrame(self) -> None:
         dfRet = pd.DataFrame(columns=_columns)
 
         segmentDf = self.singleTimepoint.segments[:]
-        logger.info(f"check {segmentDf.columns}")
+        # logger.info(f"check {segmentDf.columns}")
 
         if len(segmentDf) > 0:
             # xyCoord = segmentDf['segment'].get_coordinates(include_z=True)

src/pymapmanager/interface/mainMenus.py

@@ -316,11 +316,12 @@ def _refreshEditMenu(self):
 
         # from pymapmanager.interface.stackWidgets import stackWidget
         frontWindow = self.getApp().getFrontWindow()
-        if isinstance(frontWindow, (mmWidget2, mapWidget)):
-            nextUndo = frontWindow.getUndoRedo().nextUndoStr()
-            nextRedo = frontWindow.getUndoRedo().nextRedoStr()
-            enableUndo = frontWindow.getUndoRedo().numUndo() > 0
-            enableRedo = frontWindow.getUndoRedo().numRedo() > 0
+        if isinstance(frontWindow, (mmWidget2, mapWidget)) \
+            and frontWindow.getUndoRedo() is not None:
+                nextUndo = frontWindow.getUndoRedo().nextUndoStr()
+                nextRedo = frontWindow.getUndoRedo().nextRedoStr()
+                enableUndo = frontWindow.getUndoRedo().numUndo() > 0
+                enableRedo = frontWindow.getUndoRedo().numRedo() > 0
         else:
             nextUndo = ''
             nextRedo = ''

src/pymapmanager/interface/pyMapManagerApp.py

@@ -263,7 +263,8 @@ def openWidgetFromPath(self, path : str) -> Union[stackWidget, mapWidget]:
         Returns a stack widget (tp==1) or a map widget (tp>1)
         """
         if path not in self._widgetDictList.keys():
-            logger.info(f'loading widget path:{path}')
+            logger.info(f'loading widget path:')
+            logger.info(f'  {path}')
 
             # open timeseries core
             _timeSeriesCore = TimeSeriesCore(path)

src/pymapmanager/interface/runInterface2.py

@@ -11,7 +11,7 @@ def run():
     app = PyMapManagerApp()
 
     # path = '../PyMapManager-Data/maps/rr30a/rr30a_s0_ch2.tif'
-    path = mapmanagercore.data.getSingleTimepointMap()
+    path = mapmanagercore.data.get202504_map()
 
     sw2 = app.loadStackWidget(path)
 

src/pymapmanager/interface/stackWidgets/stackWidget.py

@@ -262,9 +262,9 @@ def _deleteSelection(self):
             self.slot_pmmEvent(event)
 
     def keyPressEvent(self, event : QtGui.QKeyEvent):
-        _handled = super().keyPressEvent(event)
-        if _handled:
-            return
+        # _handled = super().keyPressEvent(event)
+        # if _handled:
+        #     return
 
         logger.info(f'{self.getClassName()} {event.text()}')
 

src/pymapmanager/tests/interface/runInterfaceBob.py

@@ -21,7 +21,6 @@ def runBob():
 
     # a mmap with multiple timepoints, connects segments and spines
     # path = '/Users/cudmore/Desktop/multi_timepoint_map_seg_spine_connected.mmap'
-    # path = mapmanagercore.data.getMultiTimepointMap()
 
     # path = '/Users/cudmore/Desktop/olsen_example.mmap'
     # path = '/Users/cudmore/Desktop/example_nd2.mmap'
@@ -47,7 +46,10 @@ def runBob():
         logger.error('did not find folder path')
         logger.error(path)
         return
-    
+
+    from mapmanagercore.data import get202504_map
+    path = get202504_map()
+
     # turn off SettingWithCopyWarning
     import pandas as pd
     pd.options.mode.chained_assignment = None  # default='warn'

src/pymapmanager/tests/interface/runInterfaceJohnson.py

@@ -120,7 +120,7 @@ def runMultiTimepointMap():
     app = PyMapManagerApp(sys.argv)
     import mapmanagercore.data
     ## path = mapmanagercore.getSingleTimepointMap()
-    path = mapmanagercore.data.getMultiTimepointMap()
+    path = mapmanagercore.data.get202504_map()
 
     print("path", path)
     sw2 = app.loadStackWidget(path)

src/pymapmanager/tests/interface/test_app.py

@@ -18,7 +18,7 @@ def test_app(qtbot, qapp):
 @pytest.fixture 
 def stackWidgetObject(qtbot, qapp):
 	# path = '../PyMapManager-Data/maps/rr30a/rr30a_s0_ch2.tif'
-    path = mapmanagercore.data.getSingleTimepointMap()
+    path = mapmanagercore.data.get202504_map()
 
     # abb we would need to open stackWidget with a TimeSeriesCore(from path)
     # instead, open it with the PyMqpMqnqgerApp

src/pymapmanager/tests/interface/test_editEvent.py

@@ -15,7 +15,7 @@ def qapp_cls():
 @pytest.fixture
 def stackWidgetObject(qtbot, qapp):
 	# path = '../PyMapManager-Data/maps/rr30a/rr30a_s0_ch2.tif'
-    path = mapmanagercore.data.getSingleTimepointMap()
+    path = mapmanagercore.data.get202504_map()
 
     # sw = stackWidget(path=path)
     sw = qapp.loadStackWidget(path)