Fixed sorting within list widgets, Adding capability to import new tif channel

jtle00 · jtle00 · commit 155674cfdb4f · 2024-12-05T15:35:01.000-08:00
Sorting list fixed - column values are interpreted as their actual types rather than as just strings.
Fixing try - except code to explicit show what the except errors are
Testing 2nd channel import
diff --git a/pymapmanager/interface2/core/scatter_plot_widget.py b/pymapmanager/interface2/core/scatter_plot_widget.py
@@ -487,9 +487,16 @@ def getCurrentRow(self):
     def getCurrentStat(self):
         # assuming single selection
         row = self.getCurrentRow()
-        currentStat = self.myTableWidget.item(row, 0).text()
-
-        return currentStat
+        # currentStat = self.myTableWidget.item(row, 0).text()
+
+        # return currentStat
+        logger.info(f"row {row}")
+        tableItem = self.myTableWidget.item(row, 0)
+        if tableItem is not None:
+            currentStat = tableItem.text()
+            return currentStat
+        else:
+            return None
     
     # @QtCore.pyqtSlot()
     def on_scatter_toolbar_table_click(self):
@@ -756,7 +763,7 @@ def setScatterPlot(self, xStat, yStat, xyStatIndex):
                     myColorMap.append("white")
                 else:
                     if hueColumn != "None":
-                        logger.info(f"hueColumn {hueColumn} id:{id}")
+                        # logger.info(f"hueColumn {hueColumn} id:{id}")
                         hueId = self._df[hueColumn].iloc[id]
                         myColorMap.append(self.color[hueId])
 
@@ -994,24 +1001,28 @@ def _buildMainLayout(self):
             self.filteredDF, indexList = self.getfilteredDFWithIndexList(filterStr=filterStr, filterColumn=filterColumn)   
         else:     # when there is no filterStr
             self.filteredDF, indexList = self.getfilteredDFWithIndexList(filterStr=None, filterColumn=None)
+        
+        if columnNameX is not None:
+            xDFStat = np.array(self.filteredDF[columnNameX].tolist())
+            yDFStat = np.array(self.filteredDF[columnNameY].tolist())
+            indexList = np.array(indexList)
 
-        xDFStat = np.array(self.filteredDF[columnNameX].tolist())
-        yDFStat = np.array(self.filteredDF[columnNameY].tolist())
-        indexList = np.array(indexList)
+            self.setScatterPlot(xDFStat, yDFStat, indexList)
 
-        self.setScatterPlot(xDFStat, yDFStat, indexList)
+            self.axScatter.set_xlabel(columnNameX)
+            self.axScatter.set_ylabel(columnNameY)
 
-        self.axScatter.set_xlabel(columnNameX)
-        self.axScatter.set_ylabel(columnNameY)
+            # Added to test histogram
+            self.scatter_hist(xDFStat, yDFStat, self.axHistX, self.axHistY)
 
-        # Added to test histogram
-        self.scatter_hist(xDFStat, yDFStat, self.axHistX, self.axHistY)
+            # self.scatterPoints.set_data(xStat, yStat)
+            self.axScatter.invert_yaxis()
+            self.static_canvas.draw()
+            
+            self.myHighlighter = Highlighter(self, self.axScatter, xDFStat, yDFStat, indexList)
 
-        # self.scatterPoints.set_data(xStat, yStat)
-        self.axScatter.invert_yaxis()
-        self.static_canvas.draw()
-        
-        self.myHighlighter = Highlighter(self, self.axScatter, xDFStat, yDFStat, indexList)
+        else:
+            self.myHighlighter = None
 
         plotWidget = QtWidgets.QWidget()
         vLayoutPlot = QtWidgets.QVBoxLayout()
@@ -1219,7 +1230,8 @@ def _switchScatter(self):
             self.axHistX = None
             self.axHistY = None
 
-        self.myHighlighter.resetHighlighter(self.axScatter, np.array([]), np.array([]), np.array([]))
+        if self.myHighlighter is not None: # TODO: go back and retest after adding points
+            self.myHighlighter.resetHighlighter(self.axScatter, np.array([]), np.array([]), np.array([]))
 
     # IMPORTANT SIGNAL-SLOT CONNECTION (outside wrapper -> inside)
     def selectHighlighterPoints(self, rowIndexes):    
diff --git a/pymapmanager/interface2/core/search_widget.py b/pymapmanager/interface2/core/search_widget.py
@@ -51,77 +51,77 @@ def slot_setNameFilter(self, regExp):
     #     self.invalidateFilter()
 
     # Write a test function for this for the different cases
-    def filterAcceptsRow(self, sourceRow, sourceParent):
-        """
-        This function overrides the parent class' function
-        Args:
-            sourceRow: row that is being looked at
-            QModelIndex: QModelIndex of parent that contians source row
-        """
-        # logger.error('')
-        # logger.error(f'   sourceRow:{sourceRow} {type(sourceRow)}')
-        # logger.error(f'   sourceParent:{sourceParent} {type(sourceParent)}')
+    # def filterAcceptsRow(self, sourceRow, sourceParent):
+    #     """
+    #     This function overrides the parent class' function
+    #     Args:
+    #         sourceRow: row that is being looked at
+    #         QModelIndex: QModelIndex of parent that contians source row
+    #     """
+    #     # logger.error('')
+    #     # logger.error(f'   sourceRow:{sourceRow} {type(sourceRow)}')
+    #     # logger.error(f'   sourceParent:{sourceParent} {type(sourceParent)}')
         
-        # super().filterAcceptsRow(sourceRow)
-        # Specific column is already set in QTableView and comparison value
-
-        # row, column, qmodelindx
-        filterCol = self.filterKeyColumn()
-        # logger.error(f'   filterCol:{filterCol}')
-        valIndex = self.sourceModel().index(sourceRow, filterCol, sourceParent)
-        role = QtCore.Qt.DisplayRole
-        val = self.sourceModel().data(valIndex, role)
-
-        # logger.info(f'self.nameRegExp pattern: {self.nameRegExp.pattern()}, valIndex: {valIndex}, val: {val}')
-        # logger.info(f'ComparisonValue: {self.currentComparisonValue}, ComparisonSymbol : {self.currentComparisonSymbol}')
-
-        checkPattern = self.nameRegExp.pattern() in val
-        checkComparisonVal = self.currentComparisonValue != ""
-
-        #Check for float conversion?
-        if checkPattern:
-            if (checkComparisonVal):
-                # Change this to an enumerated type
-                if (self.currentComparisonSymbol == ""):
-                    return True
-                elif(self.currentComparisonSymbol == "="):
-                    if float(self.currentComparisonValue) == float(val):
-                        return True
-                    else:
-                        return False
-                elif(self.currentComparisonSymbol == ">"):
-                    if float(val) > float(self.currentComparisonValue):
-                        # logger.info(f"here in > !!!")
-                        return True
-                        # return False
-                    else:
-                        return False
-                elif(self.currentComparisonSymbol == "<"):
-                    if float(val) < float(self.currentComparisonValue):
-                        return True
-                    else:
-                        return False
-                elif(self.currentComparisonSymbol== "<="):
-                    if float(val) <= float(self.currentComparisonValue):
-                        return True
-                    else:
-                        return False
-                elif(self.currentComparisonSymbol == ">="):
-                    if float(val) >= float(self.currentComparisonValue):
-                        return True
-                    else:
-                        return False
-                elif(self.currentComparisonSymbol == "None"):
-                    return True
-                else:
-                    # Any unaccounted for symbol will be False
-                    logger.info(f'Warning: Symbol is not accounted for.')
-                    return False
-            else:
-                # When there is no comparison value show row
-                return True
-        else:
-            return False
+    #     # super().filterAcceptsRow(sourceRow)
+    #     # Specific column is already set in QTableView and comparison value
+
+    #     # row, column, qmodelindx
+    #     filterCol = self.filterKeyColumn()
+    #     # logger.error(f'   filterCol:{filterCol}')
+    #     valIndex = self.sourceModel().index(sourceRow, filterCol, sourceParent)
+    #     role = QtCore.Qt.DisplayRole
+    #     val = self.sourceModel().data(valIndex, role)
+
+    #     # logger.info(f'self.nameRegExp pattern: {self.nameRegExp.pattern()}, valIndex: {valIndex}, val: {val}')
+    #     # logger.info(f'ComparisonValue: {self.currentComparisonValue}, ComparisonSymbol : {self.currentComparisonSymbol}')
+
+    #     checkPattern = self.nameRegExp.pattern() in val
+    #     checkComparisonVal = self.currentComparisonValue != ""
+
+    #     #Check for float conversion?
+    #     if checkPattern:
+    #         if (checkComparisonVal):
+    #             # Change this to an enumerated type
+    #             if (self.currentComparisonSymbol == ""):
+    #                 return True
+    #             elif(self.currentComparisonSymbol == "="):
+    #                 if float(self.currentComparisonValue) == float(val):
+    #                     return True
+    #                 else:
+    #                     return False
+    #             elif(self.currentComparisonSymbol == ">"):
+    #                 if float(val) > float(self.currentComparisonValue):
+    #                     # logger.info(f"here in > !!!")
+    #                     return True
+    #                     # return False
+    #                 else:
+    #                     return False
+    #             elif(self.currentComparisonSymbol == "<"):
+    #                 if float(val) < float(self.currentComparisonValue):
+    #                     return True
+    #                 else:
+    #                     return False
+    #             elif(self.currentComparisonSymbol== "<="):
+    #                 if float(val) <= float(self.currentComparisonValue):
+    #                     return True
+    #                 else:
+    #                     return False
+    #             elif(self.currentComparisonSymbol == ">="):
+    #                 if float(val) >= float(self.currentComparisonValue):
+    #                     return True
+    #                 else:
+    #                     return False
+    #             elif(self.currentComparisonSymbol == "None"):
+    #                 return True
+    #             else:
+    #                 # Any unaccounted for symbol will be False
+    #                 logger.info(f'Warning: Symbol is not accounted for.')
+    #                 return False
+    #         else:
+    #             # When there is no comparison value show row
+    #             return True
+    #     else:
+    #         return False
     
 class TableModel(QAbstractTableModel):
     """
@@ -197,9 +197,31 @@ def data(self, index, role) -> str:
 
                 # print('qqq Table model used "at" to get row', row, 'colName', colName, 'returnVal:', returnVal)
 
-                # print(f"row: {row} col: {col} colName: {colName} returnVal: {returnVal} returnVal type: {type(returnVal)}")=
+                # print(f"row: {row} col: {col} colName: {colName} returnVal: {returnVal} returnVal type: {type(returnVal)}")
                 # TODO: possible type checking
-                return str(returnVal)
+                # return str(returnVal)
+                # return returnVal
+                # data does not like returning numpy ints
+                # type checking to see if value can be converted to int
+
+                try:
+                    checkVal = float(returnVal)
+                except TypeError:
+                    checkVal = None
+                    # logger.info(f"Col {colName} values do not have the correct type")
+                except ValueError:
+                    checkVal = None
+                    # logger.info("table data value is not a float")
+
+                if checkVal is not None and not checkVal.is_integer():
+                      return round(float(returnVal), 2)
+                elif str(returnVal).isdigit(): # check for int
+                    # logger.info(f"colName: {colName}")
+                    return int(returnVal)
+                else:
+                    return str(returnVal)
+
+                # TODO: check if filtering still works after this
             except KeyError:
                 print(f'Error occurred when accessing dataframe: {KeyError}')
 
@@ -617,7 +639,7 @@ def _selectRow(self, rowList):
         Called by other widgets like annotationPlotWidget
         """
 
-        logger.info(f'programattic select of row(s) -->> {self.getMyName()} rowList:{rowList}')
+        # logger.info(f'programattic select of row(s) -->> {self.getMyName()} rowList:{rowList}')
         
         if rowList is None or len(rowList)==0:
             with self._blockSlotsManager():
@@ -635,18 +657,18 @@ def _selectRow(self, rowList):
             for _idx, rowIdx in enumerate(rowList):
                 # abb already row label
                 # abb 20241121 -->> this is not getting the correct row
-                logger.info(f"rowIdx in _selectRow{rowIdx}")
+                # logger.info(f"rowIdx in _selectRow{rowIdx}")
 
                 modelIndex = self.findModelIndex(column=0, value=rowIdx) # column = 0, assuming index is always first column
-                logger.info(f"modelIdx in _selectRow {modelIndex}")
+                # logger.info(f"modelIdx in _selectRow {modelIndex}")
 
                 # find the correct model.index get a spine Index(rowIndex)
 
                 # 2nd argument is column
                 # here we default to zero since we will select the entire row regardless
                 # modelIndex = self.model.index(rowIdx, 0)
                 proxyIndex = self.proxyModel.mapFromSource(modelIndex)
-                logger.info(f'   modelIndex.row():{modelIndex.row()} proxyIndex.row():{proxyIndex.row()}')
+                # logger.info(f'   modelIndex.row():{modelIndex.row()} proxyIndex.row():{proxyIndex.row()}')
 
                 mode = QtCore.QItemSelectionModel.Select | QtCore.QItemSelectionModel.Rows
                 self.mySelectionModel.select(proxyIndex, mode)
diff --git a/pymapmanager/interface2/mainMenus.py b/pymapmanager/interface2/mainMenus.py
@@ -212,7 +212,7 @@ def _refreshWindowsMenu(self):
             # never use a bare except (causes lots of problems)
             # I think you wanted 'except (AttributeError)' to catch getOpenPluginDict()
             # when activeWindow was not a stackwidget2
-            except:
+            except AttributeError:
                 logger.info("Error when adding opened plugins to windows menu!")
 
         #abb
@@ -455,6 +455,11 @@ def _refreshFileMenu(self):
         analysisParametersAction.triggered.connect(self.getApp()._showAnalysisParameters)
         self.fileMenu.addAction(analysisParametersAction)
 
+        self.fileMenu.addSeparator()
+        importNewTIFAction = QtWidgets.QAction('Import new TIF (channel)', self.getApp())
+        importNewTIFAction.triggered.connect(self.getApp().importNewTIF)
+        self.fileMenu.addAction(importNewTIFAction)
+
     def _refreshOpenRecent(self):
         """Dynamically generate the open recent stack/map menu.
         
diff --git a/pymapmanager/interface2/pyMapManagerApp2.py b/pymapmanager/interface2/pyMapManagerApp2.py
@@ -653,8 +653,8 @@ def loadFolder(self):
                     _aWidget = self._openWidgetList.openWidgetFromPath(openFilePath)
                     logger.info(f"opened PATH {openFilePath}")
                     self.shownFolderPathsList.append(openFilePath)
-                except:
-                    logger.info(f"failed to open path {openFilePath}")
+                except Exception as e: #  exception: 'timePoints'
+                    logger.info(f"failed to open path {openFilePath} with exception: {e}")
 
             if len(self.shownFolderPathsList) > 0:
                 self.enableFolderWindow = True
@@ -699,6 +699,19 @@ def clearRecentFiles(self):
 
         # refresh first window 
         self._openFirstWindow.refreshUI()
+
+    def importNewTIF(self):
+        pass
+
+        frontStackWindow = self.getFrontWindow()
+        # bring up directory
+
+        # get newTifPath
+
+        # try calling map.loadInNewChannel(self, path: Union[str, np.ndarray], time: int = 0, channel: int = 0):
+        frontStackWindow.loadInNewChannel()
+        # might need to somehow refresh stackwidget?
+
     
 def main():
     """Run the PyMapMAnager app.
diff --git a/pymapmanager/interface2/runInterfaceJohnson.py b/pymapmanager/interface2/runInterfaceJohnson.py
@@ -67,13 +67,13 @@ def run():
     # sw2.zoomToPointAnnotation(1, isAlt=True)
 
     sw2.zoomToPointAnnotation(1, isAlt=True)
-    spineID = 1
-    deleteEvent = DeleteSpineEvent(sw2, spineID)
-    # deleteEvent = DeleteSpineEvent(sw2)
-    # deleteEvent.addDeleteSpine(spineID)
-    # sw2.deletedEvent(deleteEvent)
-    # sw2.emitEvent(deleteEvent, blockSlots=False)
-    sw2.slot_pmmEvent(deleteEvent)
+    # spineID = 1
+    # deleteEvent = DeleteSpineEvent(sw2, spineID)
+    # # deleteEvent = DeleteSpineEvent(sw2)
+    # # deleteEvent.addDeleteSpine(spineID)
+    # # sw2.deletedEvent(deleteEvent)
+    # # sw2.emitEvent(deleteEvent, blockSlots=False)
+    # sw2.slot_pmmEvent(deleteEvent)
 
 
     # _pmmEvent = pmmEvent(pmmEventType.delete, sw2)
@@ -197,7 +197,7 @@ def testingProgrammaticRunClose():
     sys.exit(app.exec_())
 
 if __name__ == '__main__':
-    run()
+    # run()
     # run2()
     # run3()
     # run4()
@@ -206,4 +206,4 @@ def testingProgrammaticRunClose():
     # testingOpenClose()
     # runPoochFileDirectly()
     # testingProgrammaticRunClose()
-    # run2_tif()
+    run2_tif()
diff --git a/pymapmanager/interface2/stackWidgets/base/stacktoolbar.py b/pymapmanager/interface2/stackWidgets/base/stacktoolbar.py
@@ -70,6 +70,7 @@ def _setStack(self, theStack):
             actionWidget.setVisible(False)
 
         for channelIdx in range(self._myStack.numChannels):
+            # logger.info(f"channelIdx visible {channelIdx} ")
             self._actionDict[channelIdx].setDisabled(False)
             self._actionDict[channelIdx].setVisible(True)
         
@@ -179,6 +180,7 @@ def _buildUI(self):
         self.channelActionGroup = QtWidgets.QActionGroup(self)
 
         for channelIdx in range(self._myStack.maxNumChannels):
+            # logger.info(f"channel idx {channelIdx}")
             iconPath = ''  # use toolName to get from canvas.util
             theIcon = QtGui.QIcon(iconPath)
 
diff --git a/pymapmanager/interface2/stackWidgets/stackWidget2.py b/pymapmanager/interface2/stackWidgets/stackWidget2.py
diff --git a/pymapmanager/stack.py b/pymapmanager/stack.py
diff --git a/pymapmanager/timeseriesCore.py b/pymapmanager/timeseriesCore.py
