fixing pivot points

mapmanager · Jan 14, 2025 · 8009911 · 8009911
1 parent 28501c2
commit 8009911
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 22 deletions.
diff --git a/src/pymapmanager.egg-info/PKG-INFO b/src/pymapmanager.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: pymapmanager
-Version: 0.0.7.dev335+gf256346.d20250104
+Version: 0.0.7.dev342+g28501c2
 Requires-Python: >=3.11
 License-File: LICENSE
 Requires-Dist: mapmanagercore

diff --git a/src/pymapmanager.egg-info/SOURCES.txt b/src/pymapmanager.egg-info/SOURCES.txt
@@ -154,6 +154,7 @@ src/pymapmanager/interface2/mapWidgets/mmMapPlot_mpl.py
 src/pymapmanager/interface2/stackWidgets/__init__.py
 src/pymapmanager/interface2/stackWidgets/analysisParamWidget2.py
 src/pymapmanager/interface2/stackWidgets/annotationListWidget2.py
+src/pymapmanager/interface2/stackWidgets/channelEditor.py
 src/pymapmanager/interface2/stackWidgets/dendrogramWidget.py
 src/pymapmanager/interface2/stackWidgets/histogramWidget2.py
 src/pymapmanager/interface2/stackWidgets/imagePlotWidget2.py

diff --git a/src/pymapmanager/_version.py b/src/pymapmanager/_version.py
@@ -12,5 +12,5 @@
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.0.7.dev335+gf256346.d20250104'
-__version_tuple__ = version_tuple = (0, 0, 7, 'dev335', 'gf256346.d20250104')
+__version__ = version = '0.0.7.dev342+g28501c2.d20250114'
+__version_tuple__ = version_tuple = (0, 0, 7, 'dev342', 'g28501c2.d20250114')
diff --git a/src/pymapmanager/annotations/baseAnnotationsCore.py b/src/pymapmanager/annotations/baseAnnotationsCore.py
@@ -821,6 +821,7 @@ def getPivotPoint(self):
 
         returnPointX = []
         returnPointY = []
+        returnPointZ = []
         for rowLabel, row in self._summaryDf.iterrows():
             segmentID = rowLabel  # row["Segment"]
             pivotDistance = row["Pivot Distance"]
@@ -832,8 +833,9 @@ def getPivotPoint(self):
 
             returnPointX.append(_point.x)
             returnPointY.append(_point.y)
+            returnPointZ.append(_point.z)
 
-        return returnPointX, returnPointY
+        return returnPointX, returnPointY, returnPointZ
 
     def getLeftRadiusPlot(self, sliceNumber, zPlusMinus):
         # segmentLines = self._df 

diff --git a/src/pymapmanager/interface2/core/scatter_plot_widget.py b/src/pymapmanager/interface2/core/scatter_plot_widget.py
@@ -745,29 +745,37 @@ def getMainLayout(self):
         return self.layout
 
     def setScatterPlot(self, xStat, yStat, xyStatIndex):
+        logger.info('self._df')
+        # print(self._df.columns)
+        # print(self._df)
+        # print(xyStatIndex)
+
         hueColumn = str(self.dict["hueColumn"])
-        myColorMap = []
+        # myColorMap = []  # abb how is this used?
         if hueColumn == "None" and self.dict["plotType"] == "Scatter":
-            for id in xyStatIndex:
-                if self.acceptCheckbox.isChecked() and not self._df["accept"].iloc[id]:
-                    myColorMap.append("white")
-                else:
-                    myColorMap.append(self.color[0])
+            # for id in xyStatIndex:
+            #     if self.acceptCheckbox.isChecked() and not self._df["accept"].iloc[id]:
+            #         myColorMap.append("white")
+            #     else:
+            #         myColorMap.append(self.color[0])
 
-            self.scatterPoints = self.axScatter.scatter(xStat, yStat, s = self._markerSize, c = myColorMap, 
+            # self.scatterPoints = self.axScatter.scatter(xStat, yStat, s = self._markerSize, c = myColorMap, 
+            #                                             picker=False)
+            self.scatterPoints = self.axScatter.scatter(xStat, yStat, s = self._markerSize, c = self.filteredDF['markerColor'], 
                                                         picker=False)
         else: # hue is selected
-            for id in xyStatIndex:
-                if self.acceptCheckbox.isChecked() and not self._df["accept"].iloc[id]:
-                    myColorMap.append("white")
-                else:
-                    if hueColumn != "None":
-                        logger.info(f'hueColumn: "{hueColumn}" id:{id}')
-                        hueId = self._df[hueColumn].iloc[id]
-                        myColorMap.append(self.color[hueId])
+            # for id in xyStatIndex:
+            #     if self.acceptCheckbox.isChecked() and not self._df["accept"].iloc[id]:
+            #         myColorMap.append("white")
+            #     else:
+            #         if hueColumn != "None":
+            #             logger.info(f'hueColumn: "{hueColumn}" id:{id}')
+            #             hueId = self._df[hueColumn].iloc[id]
+            #             myColorMap.append(self.color[hueId])
 
             if self.dict["plotType"] == "Scatter":
-                self.scatterPoints = self.axScatter.scatter(xStat, yStat, s = 12, c = myColorMap, 
+                # self.scatterPoints = self.axScatter.scatter(xStat, yStat, s = 12, c = myColorMap, 
+                self.scatterPoints = self.axScatter.scatter(xStat, yStat, s = 12, c = self.filteredDF['markerColor'], 
                                                             picker=False)
             elif self.dict["plotType"] == "Histogram":
                 if hueColumn == "None":

diff --git a/src/pymapmanager/interface2/stackWidgets/base/annotationPlotWidget2.py b/src/pymapmanager/interface2/stackWidgets/base/annotationPlotWidget2.py
@@ -1428,7 +1428,7 @@ def slot_setSlice(self, sliceNumber: int):
 
         # TODO add option to show/hide
         # TODO add a z and mask if not in view (just like core points)
-        pivotPointXs, pivotPointYs = self._annotations.getPivotPoint()
+        pivotPointXs, pivotPointYs, pivotPointZs = self._annotations.getPivotPoint()
         self._pivotPoints.setData(pivotPointXs, pivotPointYs)
 
     def selectedEvent(self, event: pmmEvent):