xxx

Author: cudmore

pymapmanager/annotations/baseAnnotationsCore.py

@@ -291,27 +291,46 @@ def _buildDataFrame(self):
                 logger.error(f'error getting x/y allSpinesDf is: {type(allSpinesDf)}')
                 print(allSpinesDf)
 
-        allSpinesDf['roiType'] = 'spineROI'
         allSpinesDf.insert(0,'index', allSpinesDf.index)  # index is first column (use this as row label)
+        
+        addTheseColumns = ['roiType', 'markerColor', 'mplMarker']
+        for aColumn in addTheseColumns:
+            allSpinesDf[aColumn] = None
+
+        # logger.info('allSpinesDf is:')
+        # print(allSpinesDf.columns)
+        # print(allSpinesDf.index)
+        # print(allSpinesDf)
+
+        allSpinesDf['roiType'] = 'spineROI'
+
+        if len(allSpinesDf) > 0:
+            allSpinesDf['markerColor'] = 'm'
+            try:
+                _notAcceptRowLabels = allSpinesDf[ ~allSpinesDf['accept'] ]
+                # logger.warning(f'_notAcceptRowLabels:{_notAcceptRowLabels}')
+                # ValueError: The truth value of a Series is ambiguous.
+                # Use a.empty, a.bool(), a.item(), a.any() or a.all().
+                if len(_notAcceptRowLabels)>0:
+                    allSpinesDf.loc[_notAcceptRowLabels.index, 'markerColor'] = 'w'
+            except (KeyError) as e:
+                logger.error(f'{e}')
+                logger.error(f'available columns are: {allSpinesDf.columns}')
+                logger.info('_notAcceptRowLabels is:')
+                print(_notAcceptRowLabels)
+                logger.error('allSpinesDf is:')
+                print(allSpinesDf)
 
-        # if len(allSpinesDf) > 0:
-            # TODO make this work
-            # marker color
-            # allSpinesDf['markerColor'] = 'm'
-            # try:
-            #     _notAcceptRowLabels = allSpinesDf[ not allSpinesDf['accept'] ]
-            #     allSpinesDf.loc[_notAcceptRowLabels, 'markerColor'] = 'w'
-            # except (KeyError) as e:
-            #     logger.error(f'{e}')
-            #     logger.error(f'available columns are: {allSpinesDf.columns}')
-
-            # TODO make this work
-            # _userTypeMarkers = getUserTypeMarkers_mpl()
-            # allSpinesDf['mplMarker'] = 'o'
-            # for userType in range(10):
-            #     # 10 user types
-            #     _userTypeRowLabels = allSpinesDf[ allSpinesDf['userType'] == userType]
-            #     allSpinesDf.loc[_userTypeRowLabels, 'mplMarker'] = _userTypeMarkers[userType]
+            _userTypeMarkers = getUserTypeMarkers_mpl()
+            # logger.info(f'_userTypeMarkers:{_userTypeMarkers}')
+            allSpinesDf['mplMarker'] = 'o'
+            for userType in range(10):
+                # 10 user types
+                _userTypeRowLabels = allSpinesDf[ allSpinesDf['userType'] == userType]
+                # logger.info(f'userType:{userType}')
+                # logger.info('_userTypeRowLabels.index:')
+                # print(_userTypeRowLabels.index)
+                allSpinesDf.loc[_userTypeRowLabels.index, 'mplMarker'] = _userTypeMarkers[userType]
 
         self._df = allSpinesDf
 

pymapmanager/interface2/runInterfaceBob.py

@@ -35,7 +35,7 @@ def run():
     # random ome zarr file (local)
     # path = '/Users/cudmore/Dropbox/data/ome-zarr/6001240.ome.zarr'
 
-    # a single timepoint tif file
+    # a single timepoint tif file (import)
     # path = mapmanagercore.data.getTiffChannel_1()
 
     # map with segments and spines (no segments connected)
@@ -53,7 +53,7 @@ def run():
 
     # 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 = mapmanagercore.data.getMultiTimepointMap()
 
     # mw will be map widget if path has multiple timepoints, otherwise mw is a stackwidget2
     mw = app.loadStackWidget(path)