moved and renamed Legend from analysisWidgets to colorlegend in main module where it is imported

analysis/analysisview.py

@@ -822,15 +822,13 @@ class ParticleAnalysis(QtWidgets.QMainWindow):
             self.parent.contouritem.colorList = colorList
             self.parent.contouritem.update()
             
-            self.parent.imparent.legend.items = legendItems
-            self.parent.imparent.legend.update()
+            self.parent.imparent.legend.setTextColorItems(legendItems)
             self.parent.imparent.legend.show()
             
         else:
             self.parent.contouritem.colorList = []
             self.parent.contouritem.update()
-            self.parent.imparent.legend.items = []
-            self.parent.imparent.legend.update()
+            self.parent.imparent.legend.setTextColorItems([])
             self.parent.imparent.legend.hide()
             
     def show_hide_labels(self):

analysis/analysisWidgets.py → colorlegend.py

@@ -24,7 +24,7 @@ import numpy as np
 
 WX, WY = 1024, 200
         
-class Legend(QtWidgets.QMdiSubWindow):
+class ColorLegend(QtWidgets.QMdiSubWindow):
     def __init__(self, parent=None):
         super().__init__(parent)
         
@@ -38,6 +38,14 @@ class Legend(QtWidgets.QMdiSubWindow):
         self.fontSize = 15
         self.spacer = 10
         
+    def setTextColorItems(self, items):
+        for text, color in items:
+            print(text, color)
+            assert type(text)==str or type(text)==np.str_, "items must be tuples of text and QColor"
+            assert type(color)==QtGui.QColor or type(color)==QtCore.Qt.GlobalColor, "items must be tuples of text and QColor"
+        self.items = items
+        self.update()
+        
     def mousePressEvent(self, event):
         if event.button()==QtCore.Qt.LeftButton:
             self.drag = event.pos()

gepard.py

@@ -23,7 +23,7 @@ from sampleview import SampleView
 from scalebar import ScaleBar
 from ramancom.ramancontrol import defaultPath
 from ramancom.ramanSwitch import RamanSwitch
-from analysis.analysisWidgets import Legend
+from colorlegend import ColorLegend
 import os
 from pathlib import Path
             
@@ -39,7 +39,7 @@ class MeasureParticleWindow(QtWidgets.QMainWindow):
         self.view.imparent = self
         self.view.ScalingChanged.connect(self.scalingChanged)
         self.scalebar = ScaleBar(self)
-        self.legend = Legend(self)
+        self.legend = ColorLegend(self)
         self.ramanSwitch = RamanSwitch(self)
         self.view.ScalingChanged.connect(self.scalebar.updateScale)