PySide 6 support; imrpove styling; fix contour plotting

Author: jornbr

.github/workflows/publish_to_pypi.yml

@@ -24,6 +24,7 @@ jobs:
         path: dist/
   publish-to-pypi:
     name: Publish to PyPI
+    needs: build
     if: startsWith(github.ref, 'refs/tags/')
     runs-on: ubuntu-latest
     environment:

.gitignore

@@ -1,3 +1,4 @@
 /pyncview.egg-info
 /dist
 /build
+__pycache__

pyncview/multiplot.py

@@ -257,7 +257,7 @@ def plot(self,startmessageloop=True):
             if createQApp:
                 app = QtWidgets.QApplication([' '])
             else:
-                app = QtWidgets.qApp
+                app = QtWidgets.QApplication.instance()
 
             # Create figure dialog
             dialog = xmlplot.gui_qt4.FigureDialog(None,quitonclose=True)

pyncview/pyncview.py

@@ -563,7 +563,10 @@ def onAnimate(self):
         # Make sure that the toolbar does not extend beyond the desktop
         # Qt 4.3 does not show the toolbar at all if that happens...
         pos = self.windowAnimate.pos()
-        desktopgeometry = QtWidgets.QApplication.desktop().availableGeometry(sender)
+        if hasattr(QtWidgets.QApplication, 'desktop'):
+            desktopgeometry = QtWidgets.QApplication.desktop().availableGeometry(sender)
+        else:
+            desktopgeometry = sender.screen().availableGeometry()
         minx = desktopgeometry.left()
         maxx = desktopgeometry.right()-self.windowAnimate.frameGeometry().width()
         miny = desktopgeometry.top()
@@ -945,7 +948,10 @@ def hideEvent(self,event):
         if self.settings['WindowPosition/Maximized'].getValue():
             self.showMaximized()
         elif self.settings['WindowPosition/Width'].getValue():
-            desktoprct = QtWidgets.QApplication.desktop().availableGeometry()
+            if hasattr(QtWidgets.QApplication, 'desktop'):
+                desktoprct = QtWidgets.QApplication.desktop().availableGeometry()
+            else:
+                desktoprct = self.screen().availableGeometry()
             w = min(desktoprct.width(), self.settings['WindowPosition/Width'].getValue())
             h = min(desktoprct.height(),self.settings['WindowPosition/Height'].getValue())
             x = max(0,min(desktoprct.width() -w,self.settings['WindowPosition/X'].getValue()))
@@ -1116,7 +1122,7 @@ def load(self,paths):
         # Create a name for the data store based on the file name,
         # but make sure it is unique.
         basestorename,ext = os.path.splitext(os.path.basename(path))
-        basestorename = re.sub('\W','_',basestorename)
+        basestorename = re.sub(r'\W','_',basestorename)
         if basestorename[0].isdigit(): basestorename = '_'+basestorename
         storename,i = basestorename,0
         while storename in curstorenames:

pyproject.toml

@@ -7,7 +7,7 @@ name = "pyncview"
 dynamic = ["version"]
 readme = "README.md"
 dependencies = [
-  "xmlplot>=0.9.28",
+  "xmlplot>=0.9.30",
 ]
 authors = [
   {name = "Jorn Bruggeman", email = "[email protected]"}