debugged channel editor, removed np.bool

Author: cudmore

src/pymapmanager.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pymapmanager
-Version: 0.0.7.dev384+g144a945.d20250430
+Version: 0.0.7.dev385+gc285506
 Requires-Python: >=3.11
 License-File: LICENSE
 Requires-Dist: numpy
@@ -13,6 +13,7 @@ Requires-Dist: qtpy
 Requires-Dist: PyQt5
 Requires-Dist: pyqtgraph
 Requires-Dist: pyqtdarktheme
+Requires-Dist: qtawesome
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: pytest-cov; extra == "test"

src/pymapmanager.egg-info/requires.txt

@@ -8,6 +8,7 @@ qtpy
 PyQt5
 pyqtgraph
 pyqtdarktheme
+qtawesome
 
 [docs]
 mkdocs

src/pymapmanager/_version.py

@@ -17,5 +17,5 @@
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.0.7.dev384+g144a945.d20250430'
-__version_tuple__ = version_tuple = (0, 0, 7, 'dev384', 'g144a945.d20250430')
+__version__ = version = '0.0.7.dev385+gc285506.d20250807'
+__version_tuple__ = version_tuple = (0, 0, 7, 'dev385', 'gc285506.d20250807')

src/pymapmanager/interface/core/_data_model.py

@@ -70,7 +70,7 @@ def data(self, index, role=QtCore.Qt.DisplayRole):
                         retVal = float(retVal)
                     elif isinstance(retVal, np.int64):
                         retVal = int(retVal)
-                    elif isinstance(retVal, np.bool_):
+                    elif isinstance(retVal, bool):
                         retVal = str(retVal)
                     elif isinstance(retVal, list):
                         retVal = str(retVal)

src/pymapmanager/interface/core/scatter_plot_widget.py

@@ -605,7 +605,7 @@ def checkFloat(self, val):
         """
         try:
             # logger.info(f"val type is {type(val)}")
-            if isinstance(val, np.bool):
+            if isinstance(val, bool):
                 logger.info(f"val is {val}")
                 return False
             float(val)

src/pymapmanager/interface/stackWidgets/channelEditor.py

@@ -34,7 +34,7 @@ def _buildGUI(self):
         # listOfChannelIdx = self.stackWidget.getStack().getChannelKeys()
         self._listOfChannelIdx = self.stackWidget.getStack().getChannelKeys()
         # self._listOfChannelIdx = listOfChannelIdx
-        dictOfChannelNames = self.stackWidget.getStack().getChannelNameDict()
+        # dictOfChannelNames = self.stackWidget.getStack().getChannelNameDict()
 
         _shapeDict = self.getStack().getMetadata().shapeDict
         zSlice = _shapeDict['z']
@@ -63,11 +63,12 @@ def _buildGUI(self):
             if 1:
                 # logger.info(f"channel index in loop {channelKey}")
                 self.totalChannelsShown += 1
-                try:
-                    channelPath = dictOfChannelNames[channelKey]
-                except:
-                    logger.error(f'xxx abb missing `dictOfChannelPaths`')
-                    channelPath = "xxx"
+
+                # try:
+                #     channelPath = dictOfChannelNames[channelKey]
+                # except:
+                #     logger.error(f'xxx abb missing `dictOfChannelPaths`')
+                #     channelPath = "xxx"
 
                 # abb actualIndex and channelRowNum are redundant -> removed
                 # Offset by 1,  channel idx being 0 based
@@ -83,9 +84,13 @@ def _buildGUI(self):
                 # Diplaying channel as seen in the row rather than actual index in backend
                 self.gridLayout.addWidget(QtWidgets.QLabel(str(self.totalChannelsShown)), self.totalChannelsShown, 0)
 
-                self.gridLayout.addWidget(DraggableWidget(channelPath, self.totalChannelsShown, 1, self, name = "widget " + 
-                                                str(channelKey), stackWidget = self.stackWidget,
-                                                channelIdx = channelKey), self.totalChannelsShown, 1)
+                self.gridLayout.addWidget(DraggableWidget(str(channelKey),
+                                                          self.totalChannelsShown, 1,
+                                                          self, name = "widget " + 
+                                                str(channelKey), 
+                                                stackWidget = self.stackWidget,
+                                                channelIdx = channelKey),
+                                                self.totalChannelsShown, 1)
 
                                                 # ), channelKey + 1, 1)
 
@@ -97,13 +102,13 @@ def _buildGUI(self):
                 activateBox.addItem("Off")
 
                 # get activate channel value from backend
-                timePoint = self.getStack().timepoint
-                activatedChannels = self.getStack().getTimeSeriesCore().getActivatedChannels(t=timePoint)
+                # timePoint = self.getStack().timepoint
+                # activatedChannels = self.getStack().getTimeSeriesCore().getActivatedChannels(t=timePoint)
 
-                if channelKey in activatedChannels:
-                    activateBox.setCurrentText("On")
-                else:
-                    activateBox.setCurrentText("Off")
+                # if channelKey in activatedChannels:
+                #     activateBox.setCurrentText("On")
+                # else:
+                #     activateBox.setCurrentText("Off")
 
                 self.gridLayout.addWidget(activateBox, self.totalChannelsShown, 2)
                 activateBox.currentTextChanged.connect(partial(self._onActivate, channelKey))
@@ -174,9 +179,9 @@ def importChannel(self, channelIdx, tifFile = None):
             logger.info(f"cancelling import")
             return
 
-        with Image.open(tifFile) as img:
-            newImgWidth, newImgHeight = img.size
-            newImgSlices = img.n_frames  # z dimension
+        # with Image.open(tifFile) as img:
+        #     newImgWidth, newImgHeight = img.size
+        #     newImgSlices = img.n_frames  # z dimension
 
         # confirmed, selectedChannelIdx = \
         #     self.showConfirmationDialog(fileDimensions=(newImgWidth,newImgHeight,newImgSlices))
@@ -326,7 +331,7 @@ def dropEvent(self, event):
             self.importChannel(self.channelIdx, tifFile)
 
 class DraggableWidget(QtWidgets.QWidget):
-    def __init__(self, text, row, column, parent=None, name = None, 
+    def __init__(self, text: str, row, column, parent=None, name = None, 
                  stackWidget = None, channelIdx = None):
 
         """ Draggable widget

src/pymapmanager/stack.py

@@ -346,7 +346,7 @@ def _checkFloat(self, val):
         """
         try:
             # logger.info(f"val type is {type(val)}")
-            if isinstance(val, np.bool):
+            if isinstance(val, bool):
                 # logger.info(f"val is {val}")
                 return False
             float(val)
@@ -366,7 +366,7 @@ def _checkFloat(self, val):
     #     return listOfChannels
 
     def getChannelNameDict(self):
-        channelNames = self.getMetadata().getChannelNames()
+        channelNames = self.getMetadata().channelKeys
         return channelNames
 
     def getLeftOverChannels(self, channelIdx):

src/pymapmanager/timeseriesCore.py

@@ -211,6 +211,7 @@ def numMapSegments(self):
         """
         return len(self._fullMap.segments[:].index.unique(0))
 
+    # abb 202508 remove
     def getActivatedChannels(self, t):
         """List of channels that are activates
         """