PyMca5 5.9.6__tar.gz → 5.9.7rc1__tar.gz

{pymca5-5.9.6/src/PyMca5.egg-info → pymca5-5.9.7rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyMca5
-Version: 5.9.6
+Version: 5.9.7rc1
 Summary: Mapping and X-Ray Fluorescence Analysis
 Author: V. Armando Sole
 Author-email: sole@esrf.fr

{pymca5-5.9.6 → pymca5-5.9.7rc1}/src/PyMca5/PyMcaGui/PyMcaQt.py

@@ -376,6 +376,10 @@ elif BINDING.lower() == 'pyqt6':
             QPalette.Button = QPalette.ColorRole.Button
             QPalette.ButtonText = QPalette.ColorRole.ButtonText
             QPalette.BrightText = QPalette.ColorRole.BrightText
+            QPalette.Highlight = QPalette.ColorRole.Highlight
+            QPalette.Shadow = QPalette.ColorRole.Shadow
+            QPalette.Midlight = QPalette.ColorRole.Midlight
+            QPalette.Link = QPalette.ColorRole.Link
 
         try:
             from silx.gui import qt as SilxQt
@@ -399,6 +403,10 @@ elif BINDING.lower() == 'pyqt6':
                     SilxQt.QPalette.Button = SilxQt.QPalette.ColorRole.Button
                     SilxQt.QPalette.ButtonText = SilxQt.QPalette.ColorRole.ButtonText
                     SilxQt.QPalette.BrightText = SilxQt.QPalette.ColorRole.BrightText
+                    SilxQt.QPalette.Highlight = SilxQt.QPalette.ColorRole.Highlight
+                    SilxQt.QPalette.Shadow = SilxQt.QPalette.ColorRole.Shadow
+                    SilxQt.QPalette.Midlight = SilxQt.QPalette.ColorRole.Midlight
+                    SilxQt.QPalette.Link = SilxQt.QPalette.ColorRole.Link
         except Exception:
             _logger.info("Exception patching silx")
             pass

{pymca5-5.9.6 → pymca5-5.9.7rc1}/src/PyMca5/PyMcaGui/io/PyMcaFileDialogs.py

@@ -119,13 +119,7 @@ def getFileList(parent=None, filetypelist=None, message=None, currentdir=None,
         nativeFileDialogs = native
     if getfilter is None:
         getfilter = False
-    if getfilter:
-        if QTVERSION < '4.5.1':
-            native_possible = False
-        else:
-            native_possible = True
-    else:
-        native_possible = True
+    native_possible = True
     filterused = None
     if native_possible and nativeFileDialogs:
         filetypes = currentfilter
@@ -164,16 +158,10 @@ def getFileList(parent=None, filetypelist=None, message=None, currentdir=None,
                         currentfilter)
                 filterused = qt.safe_str(filterused)
             else:
-                if QTVERSION < '5.0.0':
-                    filelist = qt.QFileDialog.getSaveFileNameAndFilter(parent,
-                            message,
-                            wdir,
-                            filetypes)
-                else:
-                    filelist = qt.QFileDialog.getSaveFileName(parent,
-                            message,
-                            wdir,
-                            filetypes)
+                filelist = qt.QFileDialog.getSaveFileName(parent,
+                        message,
+                        wdir,
+                        filetypes)
                 if len(filelist[0]):
                     filterused = qt.safe_str(filelist[1])
                     filelist=[filelist[0]]
@@ -182,33 +170,21 @@ def getFileList(parent=None, filetypelist=None, message=None, currentdir=None,
         else:
             if mode == "OPEN":
                 if single:
-                    if QTVERSION < '5.0.0':
-                        filelist = [qt.QFileDialog.getOpenFileName(parent,
+                    filelist, filterused = qt.QFileDialog.getOpenFileName(parent,
                                 message,
                                 wdir,
-                                filetypes)]
-                    else:
-                        filelist, filterused = qt.QFileDialog.getOpenFileName(parent,
-                                    message,
-                                    wdir,
-                                    filetypes)
-                        filelist = [filelist]
+                                filetypes)
+                    filelist = [filelist]
                 else:
                     filelist = qt.QFileDialog.getOpenFileNames(parent,
                             message,
                             wdir,
                             filetypes)
             else:
-                if QTVERSION < '5.0.0':
-                    filelist = qt.QFileDialog.getSaveFileName(parent,
+                filelist, filterused = qt.QFileDialog.getSaveFileName(parent,
                             message,
                             wdir,
                             filetypes)
-                else:
-                    filelist, filterused = qt.QFileDialog.getSaveFileName(parent,
-                                message,
-                                wdir,
-                                filetypes)
                 filelist = qt.safe_str(filelist)
                 if len(filelist):
                     filelist = [filelist]
@@ -253,10 +229,9 @@ def getFileList(parent=None, filetypelist=None, message=None, currentdir=None,
             fdialog.setFileMode(qt.QFileDialog.FileMode.AnyFile)
 
         fdialog.setDirectory(wdir)
-        if QTVERSION > '4.3.0':
-            history = fdialog.history()
-            if len(history) > 6:
-                fdialog.setHistory(history[-6:])
+        history = fdialog.history()
+        if len(history) > 6:
+            fdialog.setHistory(history[-6:])
         ret = fdialog.exec()
         if ret != qt.QDialog.Accepted:
             fdialog.close()
@@ -269,10 +244,7 @@ def getFileList(parent=None, filetypelist=None, message=None, currentdir=None,
             filelist = fdialog.selectedFiles()
             if single:
                 filelist = [filelist[0]]
-            if QTVERSION < "5.0.0":
-                filterused = qt.safe_str(fdialog.selectedFilter())
-            else:
-                filterused = qt.safe_str(fdialog.selectedNameFilter())
+            filterused = qt.safe_str(fdialog.selectedNameFilter())
             if mode != "OPEN":
                 if "." in filterused:
                     extension = filterused.replace(")", "")

{pymca5-5.9.6 → pymca5-5.9.7rc1}/src/PyMca5/PyMcaGui/io/QSpecFileWidget.py

@@ -41,17 +41,14 @@ _logger = logging.getLogger(__name__)
 
 QTVERSION = qt.qVersion()
 
-if QTVERSION > '4.2.0':
-    class MyQTreeWidgetItem(qt.QTreeWidgetItem):
-        def __lt__(self, other):
-            c = self.treeWidget().sortColumn()
-            if  c == 0:
-                return False
-            if c !=  2:
-                return (float(self.text(c)) <  float(other.text(c)))
-            return (self.text(c) < other.text(c))
-else:
-    MyQTreeWidgetItem = qt.QTreeWidgetItem
+class MyQTreeWidgetItem(qt.QTreeWidgetItem):
+    def __lt__(self, other):
+        c = self.treeWidget().sortColumn()
+        if  c == 0:
+            return False
+        if c !=  2:
+            return (float(self.text(c)) <  float(other.text(c)))
+        return (self.text(c) < other.text(c))
 
 #class QSpecFileWidget(qt.QWidget):
 class QSpecFileWidget(QSelectorWidget.QSelectorWidget):
@@ -145,36 +142,22 @@ class QSpecFileWidget(QSelectorWidget.QSelectorWidget):
         #self.list.header().resizeSection(4, size)
 
         self.list.header().setStretchLastSection(False)
-        if QTVERSION > '5.0.0':
-            self.list.header().setSectionResizeMode(0, qt.QHeaderView.Interactive)
-            self.list.header().setSectionResizeMode(1, qt.QHeaderView.Interactive)
-            self.list.header().setSectionResizeMode(2, qt.QHeaderView.Interactive)
-            self.list.header().setSectionResizeMode(3, qt.QHeaderView.Interactive)
-            self.list.header().setSectionResizeMode(4, qt.QHeaderView.Interactive)
-            fm = self.list.header().fontMetrics()
-            if hasattr(fm, "width"):
-                size = fm.width("X")
-            else:
-                size = fm.maxWidth()
-            self.list.header().setMinimumSectionSize(size)
-            self.list.header().resizeSection(0, size)
-            #    self.list.header().resizeSection(1, size * 4)
-            self.list.header().resizeSection(2, size * 25)
-            #    self.list.header().resizeSection(3, size * 7)
-            #    self.list.header().resizeSection(4, size * 8)
-
-        elif QTVERSION < '4.2.0':
-            self.list.header().setResizeMode(0, qt.QHeaderView.Stretch)
-            self.list.header().setResizeMode(1, qt.QHeaderView.Stretch)
-            self.list.header().setResizeMode(2, qt.QHeaderView.Interactive)
-            self.list.header().setResizeMode(3, qt.QHeaderView.Stretch)
-            self.list.header().setResizeMode(4, qt.QHeaderView.Stretch)
+        self.list.header().setSectionResizeMode(0, qt.QHeaderView.Interactive)
+        self.list.header().setSectionResizeMode(1, qt.QHeaderView.Interactive)
+        self.list.header().setSectionResizeMode(2, qt.QHeaderView.Interactive)
+        self.list.header().setSectionResizeMode(3, qt.QHeaderView.Interactive)
+        self.list.header().setSectionResizeMode(4, qt.QHeaderView.Interactive)
+        fm = self.list.header().fontMetrics()
+        if hasattr(fm, "width"):
+            size = fm.width("X")
         else:
-            self.list.header().setResizeMode(0, qt.QHeaderView.ResizeToContents)
-            self.list.header().setResizeMode(1, qt.QHeaderView.ResizeToContents)
-            self.list.header().setResizeMode(2, qt.QHeaderView.Interactive)
-            self.list.header().setResizeMode(3, qt.QHeaderView.ResizeToContents)
-            self.list.header().setResizeMode(4, qt.QHeaderView.ResizeToContents)
+            size = fm.maxWidth()
+        self.list.header().setMinimumSectionSize(size)
+        self.list.header().resizeSection(0, size)
+        #    self.list.header().resizeSection(1, size * 4)
+        self.list.header().resizeSection(2, size * 25)
+        #    self.list.header().resizeSection(3, size * 7)
+        #    self.list.header().resizeSection(4, size * 8)
 
         # --- signal handling
         self.list.itemSelectionChanged.connect(self.__selectionChanged)
@@ -186,10 +169,9 @@ class QSpecFileWidget(QSelectorWidget.QSelectorWidget):
                      self.__doubleClicked)
         self.cntTable.sigSpecFileCntTableSignal.connect(self._cntSignal)
 
-        if QTVERSION > '4.2.0':
-            self.list.setSortingEnabled(False)
-            self.list.header().sectionDoubleClicked[int].connect( \
-                         self.__headerSectionDoubleClicked)
+        self.list.setSortingEnabled(False)
+        self.list.header().sectionDoubleClicked[int].connect( \
+                     self.__headerSectionDoubleClicked)
         if OBJECT3D:
             self.object3DBox.clicked.connect(self._setObject3DBox)
         if hasattr(self, 'meshBox'):
@@ -207,13 +189,10 @@ class QSpecFileWidget(QSelectorWidget.QSelectorWidget):
         self.disableScan   = 0 #(type=="mca")
 
         # -- last scan watcher
-        if QTVERSION > '5.0.0':
-            self.lastScanWatcher = qt.QTimer()
-            self.lastScanWatcher.setSingleShot(True)
-            self.lastScanWatcher.setInterval(2000) # 2 seconds
-            self.lastScanWatcher.timeout.connect(self._timerSlot)
-        else:
-            self.lastScanWatcher = None
+        self.lastScanWatcher = qt.QTimer()
+        self.lastScanWatcher.setSingleShot(True)
+        self.lastScanWatcher.setInterval(2000) # 2 seconds
+        self.lastScanWatcher.timeout.connect(self._timerSlot)
 
         # --- context menu
         self.data= None
@@ -344,12 +323,11 @@ class QSpecFileWidget(QSelectorWidget.QSelectorWidget):
             self.scans.append(sn)
             after= item
             i = i + 1
-        if QTVERSION > '5.0.0':
-            self.list.resizeColumnToContents(0)
-            self.list.resizeColumnToContents(1)
-            #self.list.resizeColumnToContents(2)
-            self.list.resizeColumnToContents(3)
-            self.list.resizeColumnToContents(4)
+        self.list.resizeColumnToContents(0)
+        self.list.resizeColumnToContents(1)
+        #self.list.resizeColumnToContents(2)
+        self.list.resizeColumnToContents(3)
+        self.list.resizeColumnToContents(4)
 
     def clear(self):
         self.list.clear()
@@ -470,11 +448,10 @@ class QSpecFileWidget(QSelectorWidget.QSelectorWidget):
                         if updated:
                             self.data.refresh()
                             self.refresh()
-                            if QTVERSION > "5.0.0":
-                                # make sure the item is found and selected after the update
-                                itemList = self.list.findItems(scan, qt.Qt.MatchExactly,1)
-                                if len(itemList) == 1:
-                                    itemList[0].setSelected(True)
+                            # make sure the item is found and selected after the update
+                            itemList = self.list.findItems(scan, qt.Qt.MatchExactly,1)
+                            if len(itemList) == 1:
+                                itemList[0].setSelected(True)
                 if not self.lastScanWatcher.isActive():
                     self.lastScanWatcher.start()
         else:
@@ -534,11 +511,10 @@ class QSpecFileWidget(QSelectorWidget.QSelectorWidget):
                         if updated:
                             self.data.refresh()
                             self.refresh()
-                            if QTVERSION > "5.0.0":
-                                # make sure the item is selected
-                                itemList = self.list.findItems(sn, qt.Qt.MatchExactly,1)
-                                if len(itemList) == 1:
-                                    itemList[0].setSelected(True)
+                            # make sure the item is selected
+                            itemList = self.list.findItems(sn, qt.Qt.MatchExactly,1)
+                            if len(itemList) == 1:
+                                itemList[0].setSelected(True)
             #shortcut selec + remove?
             #for the time being just add
             self._addClicked()
@@ -586,8 +562,7 @@ class QSpecFileWidget(QSelectorWidget.QSelectorWidget):
 
     def __showScanInfo(self, idx = None):
         if idx is None:
-            if QTVERSION > '4.0.0':
-                idx = self.menu_idx
+            idx = self.menu_idx
         _logger.debug("Scan information:")
 
         try:
@@ -624,11 +599,8 @@ class QSpecFileWidget(QSelectorWidget.QSelectorWidget):
         _logger.debug("Overwritten _addClicked method")
 
         #get selected scan keys
-        if QTVERSION < '4.0.0':
-            scan_sel= [sn for sn in self.scans if self.list.findItem(sn,1).isSelected()]
-        else:
-            itemlist = self.list.selectedItems()
-            scan_sel = [str(item.text(1)) for item in itemlist]
+        itemlist = self.list.selectedItems()
+        scan_sel = [str(item.text(1)) for item in itemlist]
 
         #get selected counter keys
         cnt_sel = self.cntTable.getCounterSelection()

{pymca5-5.9.6 → pymca5-5.9.7rc1}/src/PyMca5/PyMcaGui/io/QSpsWidget.py

@@ -40,10 +40,9 @@ _logger = logging.getLogger(__name__)
 SOURCE_TYPE = 'SPS'
 SCAN_MODE = True
 
-if QTVERSION > '4.0.0':
-    class QGridLayout(qt.QGridLayout):
-        def addMultiCellWidget(self, w, r0, r1, c0, c1, *var):
-            self.addWidget(w, r0, c0, 1 + r1 - r0, 1 + c1 - c0)
+class QGridLayout(qt.QGridLayout):
+    def addMultiCellWidget(self, w, r0, r1, c0, c1, *var):
+        self.addWidget(w, r0, c0, 1 + r1 - r0, 1 + c1 - c0)
 
 class SPSFramesMcaWidget(qt.QWidget):
     def __init__(self, parent=None):
@@ -170,13 +169,9 @@ class SPSScanArrayWidget(SpecFileCntTable.SpecFileCntTable):
 
 class SPSMcaArrayWidget(qt.QWidget):
     def __init__(self, parent=None, name="SPS_MCA_DATA", fl=0, title="MCA", size=(0,8192)):
-        if QTVERSION < '4.0.0':
-            qt.QWidget.__init__(self, parent, name, fl)
-            layout= qt.QGridLayout(self, 5, 2)
-        else:
-            qt.QWidget.__init__(self, parent)
-            self.setWindowTitle(name)
-            layout= QGridLayout(self)
+        qt.QWidget.__init__(self, parent)
+        self.setWindowTitle(name)
+        layout= QGridLayout(self)
         layout.setContentsMargins(5, 5, 5, 5)
         layout.setSpacing(0)
 
@@ -184,13 +179,9 @@ class SPSMcaArrayWidget(qt.QWidget):
         font= self.title.font()
         font.setBold(1)
         self.title.setFont(font)
-        if QTVERSION < '4.0.0':
-            layout.addMultiCellWidget(self.title, 0, 0, 0, 1, qt.Qt.AlignCenter)
-            layout.addRowSpacing(0, 40)
-        else:
-            #layout.addMultiCellWidget(self.title, 0, 0, 0, 1, qt.Qt.AlignCenter)
-            layout.addWidget(self.title, 0, 0)
-            layout.setAlignment(self.title, qt.Qt.AlignCenter)
+        #layout.addMultiCellWidget(self.title, 0, 0, 0, 1, qt.Qt.AlignCenter)
+        layout.addWidget(self.title, 0, 0)
+        layout.setAlignment(self.title, qt.Qt.AlignCenter)
         self.setTitle(title)
 
     def setInfo(self, info):
@@ -214,12 +205,8 @@ class SPSMcaArrayWidget(qt.QWidget):
 
 class SPSXiaArrayWidget(qt.QWidget):
     def __init__(self, parent=None, name="SPS_XIA_DATA", fl=0, title="XIA", size=(0,8192)):
-        if QTVERSION < '4.0.0':
-            qt.QWidget.__init__(self, parent, name, fl)
-            layout= qt.QGridLayout(self, 2, 1)
-        else:
-            qt.QWidget.__init__(self, parent)
-            layout= qt.QGridLayout(self)
+        qt.QWidget.__init__(self, parent)
+        layout= qt.QGridLayout(self)
         layout.setContentsMargins(5, 5, 5, 5)
         layout.setSpacing(0)
 
@@ -229,22 +216,14 @@ class SPSXiaArrayWidget(qt.QWidget):
         self.title.setFont(font)
         self.title.setText(title)
 
-        if QTVERSION < '4.0.0':
-            self.detList= qt.QListBox(self)
-            self.detList.setSelectionMode(qt.QListBox.Multi)
+        self.detList= qt.QListWidget(self)
+        self.detList.setSelectionMode(qt.QAbstractItemView.ExtendedSelection)
 
-            layout.addWidget(self.title, 0, 0, qt.Qt.AlignCenter)
-            layout.addRowSpacing(0, 40)
-            layout.addWidget(self.detList, 1, 0)
-        else:
-            self.detList= qt.QListWidget(self)
-            self.detList.setSelectionMode(qt.QAbstractItemView.ExtendedSelection)
-
-            layout.addWidget(self.title, 0, 0)
-            layout.setAlignment(self.title, qt.Qt.AlignCenter)
-            ##layout.addRowSpacing(0, 40)
-            _logger.debug("row spacing")
-            layout.addWidget(self.detList, 1, 0)
+        layout.addWidget(self.title, 0, 0)
+        layout.setAlignment(self.title, qt.Qt.AlignCenter)
+        ##layout.addRowSpacing(0, 40)
+        _logger.debug("row spacing")
+        layout.addWidget(self.detList, 1, 0)
 
     def setTitle(self, title):
         self.title.setText("%s"%title)
@@ -261,33 +240,22 @@ class SPSXiaArrayWidget(qt.QWidget):
             dets= range(self.rows)
 
         self.detList.clear()
-        if QTVERSION < '4.0.0':
-            for idx in range(1, self.rows):
-                self.detList.insertItem("Detector %d"%dets[idx-1])
-        else:
-            for idx in range(1, self.rows):
-                self.detList.addItem("Detector %d"%dets[idx-1])
+        for idx in range(1, self.rows):
+            self.detList.addItem("Detector %d"%dets[idx-1])
 
     def getSelection(self):
         selection= []
-        if QTVERSION < '4.0.0':
-            ylist= [ (idx+1) for idx in range(self.detList.count()) if self.detList.isSelected(idx) ]
-        else:
-            itemlist = self.detList.selectedItems()
-            ylist = [int(str(item.text()).split()[-1]) for item in itemlist]
+        itemlist = self.detList.selectedItems()
+        ylist = [int(str(item.text()).split()[-1]) for item in itemlist]
         for y in ylist:
             selection.append({"plot":"XIA", "x":0, "y":y})
         return selection
 
 class SPS_ImageArray(qt.QWidget):
     def __init__(self, parent=None, name="SPS_ImageArray", fl=0, title="MCA", size=(0,8192)):
-        if QTVERSION < '4.0.0':
-            qt.QWidget.__init__(self, parent, name, fl)
-            layout= qt.QGridLayout(self, 5, 2)
-        else:
-            qt.QWidget.__init__(self, parent)
-            self.setWindowTitle(name)
-            layout= QGridLayout(self)
+        qt.QWidget.__init__(self, parent)
+        self.setWindowTitle(name)
+        layout= QGridLayout(self)
         layout.setContentsMargins(5, 5, 5, 5)
         layout.setSpacing(0)
 
@@ -295,13 +263,9 @@ class SPS_ImageArray(qt.QWidget):
         font= self.title.font()
         font.setBold(1)
         self.title.setFont(font)
-        if QTVERSION < '4.0.0':
-            layout.addMultiCellWidget(self.title, 0, 0, 0, 1, qt.Qt.AlignCenter)
-            layout.addRowSpacing(0, 40)
-        else:
-            #layout.addMultiCellWidget(self.title, 0, 0, 0, 1, qt.Qt.AlignCenter)
-            layout.addWidget(self.title, 0, 0)
-            layout.setAlignment(self.title, qt.Qt.AlignCenter)
+        #layout.addMultiCellWidget(self.title, 0, 0, 0, 1, qt.Qt.AlignCenter)
+        layout.addWidget(self.title, 0, 0)
+        layout.setAlignment(self.title, qt.Qt.AlignCenter)
         self.setTitle(title)
 
     def setInfo(self, info):
@@ -328,12 +292,8 @@ class SPS_ImageArray(qt.QWidget):
 
 class SPS_StandardArray(qt.QWidget):
     def __init__(self, parent=None, name="SPS_StandardArray", fl=0, rows=0, cols=0):
-        if QTVERSION < '4.0.0':
-            qt.QWidget.__init__(self, parent, name, fl)
-            layout= qt.QGridLayout(self, 4, 2)
-        else:
-            qt.QWidget.__init__(self, parent)
-            layout= qt.QGridLayout(self)
+        qt.QWidget.__init__(self, parent)
+        layout= qt.QGridLayout(self)
         layout.setContentsMargins(5, 5, 5, 5)
         layout.setSpacing(0)
 
@@ -347,12 +307,8 @@ class SPS_StandardArray(qt.QWidget):
 
         self.plotCombo= qt.QComboBox(self)
         self.plotCombo.setEditable(0)
-        if QTVERSION < '4.0.0':
-            self.plotCombo.insertItem("Rows")
-            self.plotCombo.insertItem("Columns")
-        else:
-            self.plotCombo.addItem("Rows")
-            self.plotCombo.addItem("Columns")
+        self.plotCombo.addItem("Rows")
+        self.plotCombo.addItem("Columns")
 
         self.xCombo= qt.QComboBox(self)
         self.xCombo.setEditable(0)
@@ -384,49 +340,30 @@ class SPS_StandardArray(qt.QWidget):
             txt= "Row"
             val= self.rows
         self.xCombo.clear()
-        if QTVERSION < '4.0.0':
-            self.xCombo.insertItem("Array Index")
-            self.yList.clear()
-            for x in range(val):
-                self.xCombo.insertItem("%s %d"%(txt,x))
-                self.yList.insertItem("%s %d"%(txt,x))
-            if val==2:
-                self.xCombo.setCurrentItem(0)
-                self.__xChanged(0)
-        else:
-            self.xCombo.addItem("Array Index")
-            self.yList.clear()
-            for x in range(val):
-                self.xCombo.addItem("%s %d"%(txt,x))
-                self.yList.addItem("%s %d"%(txt,x))
-            if val==2:
-                self.xCombo.setCurrentIndex(0)
-                self.__xChanged(0)
+        self.xCombo.addItem("Array Index")
+        self.yList.clear()
+        for x in range(val):
+            self.xCombo.addItem("%s %d"%(txt,x))
+            self.yList.addItem("%s %d"%(txt,x))
+        if val==2:
+            self.xCombo.setCurrentIndex(0)
+            self.__xChanged(0)
 
     def __xChanged(self, index):
         pass
 
     def getSelection(self):
         selection= []
-        if QTVERSION < '4.0.0':
-            idx= self.plotCombo.currentItem()
-        else:
-            idx= self.plotCombo.currentIndex()
+        idx= self.plotCombo.currentIndex()
         if idx==1: plot= "cols"
         else: plot= "rows"
 
-        if QTVERSION < '4.0.0':
-            idx= self.xCombo.currentItem()
-        else:
-            idx= self.xCombo.currentIndex()
+        idx= self.xCombo.currentIndex()
         if idx==0: x= None
         else: x= idx-1
 
-        if QTVERSION < '4.0.0':
-            ylist= [ idx for idx in range(self.yList.count()) if self.yList.isSelected(idx) ]
-        else:
-            itemlist = self.yList.selectedItems()
-            ylist = [int(str(item.text()).split()[-1]) for item in itemlist]
+        itemlist = self.yList.selectedItems()
+        ylist = [int(str(item.text()).split()[-1]) for item in itemlist]
         for y in ylist:
             selection.append({"plot":plot, "x":x, "y":y})
         return selection
@@ -452,10 +389,7 @@ class QSpsWidget(qt.QWidget):
     sigOtherSignals = qt.pyqtSignal(object)
 
     def __init__(self, parent=None, name="SPSSelector", fl=0):
-        if QTVERSION < '4.0.0':
-            qt.QWidget.__init__(self, parent, name, fl)
-        else:
-            qt.QWidget.__init__(self, parent)
+        qt.QWidget.__init__(self, parent)
 
         self.dataSource= None
 
@@ -474,20 +408,12 @@ class QSpsWidget(qt.QWidget):
         specWidget= qt.QWidget(self)
         self.specCombo= qt.QComboBox(specWidget)
         self.specCombo.setEditable(0)
-        if QTVERSION < '4.0.0':
-            self.reload_= qt.QIconSet(qt.QPixmap(icons.reload_))
-            refreshButton= qt.QToolButton(specWidget)
-            refreshButton.setIconSet(self.reload_)
-            self.closeIcon= qt.QIconSet(qt.QPixmap(icons.fileclose))
-            closeButton= qt.QToolButton(specWidget)
-            closeButton.setIconSet(self.closeIcon)
-        else:
-            self.reload_= qt.QIcon(qt.QPixmap(icons.reload_))
-            refreshButton= qt.QToolButton(specWidget)
-            refreshButton.setIcon(self.reload_)
-            self.closeIcon= qt.QIcon(qt.QPixmap(icons.fileclose))
-            closeButton= qt.QToolButton(specWidget)
-            closeButton.setIcon(self.closeIcon)
+        self.reload_= qt.QIcon(qt.QPixmap(icons.reload_))
+        refreshButton= qt.QToolButton(specWidget)
+        refreshButton.setIcon(self.reload_)
+        self.closeIcon= qt.QIcon(qt.QPixmap(icons.fileclose))
+        closeButton= qt.QToolButton(specWidget)
+        closeButton.setIcon(self.closeIcon)
         refreshButton.setSizePolicy(qt.QSizePolicy(qt.QSizePolicy.Fixed, qt.QSizePolicy.Minimum))
         closeButton.setSizePolicy(qt.QSizePolicy(qt.QSizePolicy.Fixed, qt.QSizePolicy.Minimum))
         specLayout= qt.QHBoxLayout(specWidget)
@@ -636,14 +562,9 @@ class QSpsWidget(qt.QWidget):
                 arrayorder= list(arraylist.keys())
                 arrayorder.sort()
                 arrayorder.reverse()
-                if QTVERSION < '4.0.0':
-                    for name in arrayorder:
-                        self.arrayList.insertItem(qt.QListViewItem(self.arrayList,
-                            "", name, str(arraylist[name][0]), str(arraylist[name][1])))
-                else:
-                    for name in arrayorder:
-                        item = (qt.QTreeWidgetItem(self.arrayList,
-                            ["", name, str(arraylist[name][0]), str(arraylist[name][1])]))
+                for name in arrayorder:
+                    item = (qt.QTreeWidgetItem(self.arrayList,
+                        ["", name, str(arraylist[name][0]), str(arraylist[name][1])]))
                 self.refreshDataSelection()
 
         self.__getParamWidget("empty")

{pymca5-5.9.6 → pymca5-5.9.7rc1}/src/PyMca5/PyMcaGui/io/hdf5/HDF5Widget.py

@@ -318,7 +318,10 @@ class H5NodeProxy(object):
 
             self._hasChildren = is_group(node)
             #self._attrs = []
-            self._color = qt.QColor(qt.Qt.black)
+            # get the default text foreground color
+            foregroundTextColor = qt.QApplication.instance().palette().color(qt.QPalette.Text)
+            NXdataColor = qt.QApplication.instance().palette().color(qt.QPalette.BrightText)
+            self._color = qt.QColor(foregroundTextColor)
             if hasattr(node, 'attrs'):
                 attrs = list(node.attrs)
                 for cname in ['class', 'NX_class']:
@@ -332,9 +335,9 @@ class H5NodeProxy(object):
                             _type = "%s" % nodeattr
                         self._type = _type
                         if _type in ["NXdata"]:
-                            self._color = qt.QColor(qt.Qt.blue)
+                            self._color = NXdataColor
                         elif ("default" in attrs):
-                            self._color = qt.QColor(qt.Qt.blue)
+                            self._color = NXdataColor
                         #self._attrs = attrs
                         break
                         #self._type = _type[2].upper() + _type[3:]
@@ -512,7 +515,7 @@ class FileModel(qt.QAbstractItemModel):
             elif role == qt.Qt.ToolTipRole:
                 item = self.getProxyFromIndex(index)
                 if hasattr(item, "color"):
-                    if item.color == qt.Qt.blue:
+                    if item.color == qt.QApplication.instance().palette().color(qt.QPalette.BrightText) or item.color == qt.Qt.blue:
                         return MyQVariant("Item has a double click NXdata associated action")
             return MyQVariant()
         except Exception:

{pymca5-5.9.6 → pymca5-5.9.7rc1}/src/PyMca5/PyMcaGui/io/hdf5/QNexusWidget.py

@@ -859,7 +859,7 @@ class QNexusWidget(qt.QWidget):
                             shape = None
                         self._shapeList.append(shape)
                         self.cntTable.build(self._cntList, self._aliasList, shapelist=self._shapeList)
-            elif (ddict['color'] == qt.Qt.blue) and ("silx" in sys.modules):
+            elif (ddict.get('color') == qt.QApplication.instance().palette().color(qt.QPalette.BrightText) or ddict.get('color') == qt.Qt.blue) and ("silx" in sys.modules):
                 # there is an action to be applied
                 self.showInfoWidget(ddict["file"], ddict["name"], dset=False)
             elif ddict['type'] in ['NXentry', 'Entry']: