Merge branch 'develop' into 'master'

merge develop into master

See merge request Scientific-IT-Systems/python-gr!289

Author: jheinen

examples/pygrwidgetpyside6_ex.py

@@ -65,7 +65,7 @@ def set_draw_flag(self):
     def paintEvent(self, ev):
         super(GraphicsWidget, self).paintEvent(ev)
         painter = QtGui.QPainter(self)
-        painter.drawText(15, 15, "Contour Example using PySide2/GRWidget ...")
+        painter.drawText(15, 15, "Contour Example using PySide6/GRWidget ...")
 
 
 if __name__ == '__main__':

examples/pyside6_ex.py

@@ -0,0 +1,101 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+GR / PySide interoperability example
+"""
+
+import sys
+import os
+from PySide6 import QtCore, QtGui, QtWidgets, Shiboken
+from gr.pygr import *
+
+class GrWidget(QtWidgets.QWidget) :
+    def __init__(self, *args) :
+        QtWidgets.QWidget.__init__(self)
+        
+        self.setupUi(self)
+
+        os.environ["GKS_WSTYPE"] = "381"
+        os.environ["GKS_DOUBLE_BUF"] = "True"
+
+        self.connect(self.DrawButton, QtCore.SIGNAL("clicked()"), self.draw)
+        self.connect(self.QuitButton, QtCore.SIGNAL("clicked()"), self.quit)
+        self.w = 500
+        self.h = 500
+        self.sizex = 1
+        self.sizey = 1
+
+    def setupUi(self, Form) :
+
+        Form.setWindowTitle("GrWidget")
+        Form.resize(QtCore.QSize(500, 500).expandedTo(Form.minimumSizeHint()))
+
+        self.DrawButton = QtWidgets.QPushButton(Form)
+        self.DrawButton.setText("Draw")
+        self.DrawButton.setGeometry(QtCore.QRect(290, 5, 100, 25))
+        self.DrawButton.setObjectName("draw")
+
+        self.QuitButton = QtWidgets.QPushButton(Form)
+        self.QuitButton.setText("Quit")
+        self.QuitButton.setGeometry(QtCore.QRect(395, 5, 100, 25))
+        self.QuitButton.setObjectName("quit")
+
+        QtCore.QMetaObject.connectSlotsByName(Form)
+
+    def quit(self) :
+        gr.emergencyclosegks()
+        self.close()
+
+    def draw(self) :
+        self.setStyleSheet("background-color:white;")
+
+        x = range(0, 128)
+        y = range(0, 128)
+        z = readfile(os.path.join(os.path.dirname(os.path.realpath(__file__)),
+                                  "kws.dat"), separator='$')
+        zrange = max(z) - min(z)
+        h = [min(z) + i * 0.025 * zrange for i in range(0, 40)]
+
+        gr.clearws()
+        gr.setwswindow(0, self.sizex, 0, self.sizey)
+        gr.setviewport(0.075 * self.sizex, 0.95 * self.sizex, 0.075 * self.sizey, 0.95 * self.sizey)
+        gr.setwindow(1, 128, 1, 128)
+        gr.setspace(min(z), max(z), 0, 90)
+        gr.setcharheight(0.018)
+        gr.setcolormap(-3)
+        gr.surface(x, y, z, 5)
+        gr.contour(x, y, h, z, -1)
+        gr.axes(5, 5, 1, 1, 2, 2, 0.0075)
+        self.update()
+
+    def resizeEvent(self, event):
+        self.w = event.size().width()
+        self.h = event.size().height()
+        if self.w > self.h:
+          self.sizex = 1
+          self.sizey = float(self.h)/self.w
+        else:
+          self.sizex = float(self.w)/self.h
+          self.sizey = 1
+        self.draw()
+
+    def paintEvent(self, ev) :
+        self.painter = QtGui.QPainter()
+        self.painter.begin(self)
+        self.painter.drawText(15, 15, "Contour Example using PySide ...")
+        os.environ['GKSconid'] = "%x!%x" % (int(Shiboken.getCppPointer(self)[0]), int(Shiboken.getCppPointer(self.painter)[0]))
+        gr.updatews()
+        self.painter.end()
+
+    def screenChangedEvent(self, event):
+        gr.configurews()
+        self.update()
+
+app = QtWidgets.QApplication(sys.argv)
+if not sys.platform == "linux2" :
+    app.setStyle('Windows')
+
+w = GrWidget()
+w.show()
+
+sys.exit(app.exec())

gr/pygr/mlab.py

@@ -4619,7 +4619,8 @@ def _plot_args(args, fmt='xys'):
     global _plt
     args = list(args)
     parsed_args = []
-    while args:
+    column = 0
+    while args or column > 0:
         # Try to read x, y, z and c
         x = y = z = c = None
         if fmt == 'xyuv':
@@ -4655,20 +4656,32 @@ def _plot_args(args, fmt='xys'):
             except TypeError:
                 x = y = z = c = None
 
-        if x is None:
-            a = _convert_to_array(args.pop(0), may_be_2d=True)
+        if x is None or column > 0:
+            if column == 0:
+                a = np.array(args[0])
 
-            if len(a.shape) == 2:
-                x, y = a[:, 0], a[:, 1]
+            if len(a.shape) == 2 and a.shape[0] == 2:
+                x, y = a[0, :], a[1, :]
+                args.pop(0)
             else:
                 if fmt == 'xys':
-                    try:
-                        x = a
-                        y = _convert_to_array(args[0], xvalues=x)
-                        args.pop(0)
-                    except (TypeError, IndexError):
-                        y = a
-                        x = np.arange(1, len(a) + 1)
+                    if len(a.shape) == 2:
+                        x = np.arange(1, a.shape[1] + 1)
+                        y = a[column, :]
+                        if column + 1 < a.shape[0]:
+                            column += 1
+                        else:
+                            column = 0
+                            break
+                    else:
+                        a = _convert_to_array(args.pop(0), may_be_2d=True)
+                        try:
+                            x = a
+                            y = _convert_to_array(args[0], xvalues=x)
+                            args.pop(0)
+                        except (TypeError, IndexError):
+                            y = a
+                            x = np.arange(1, len(a) + 1)
                 elif fmt == 'y':
                     y = a
                     x = np.arange(1, len(a) + 1)

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist   = py38,py39,py310,py311,py312
+envlist   = py38,py39,py310,py311,py312,py313
 skipsdist = True
 [testenv]
 passenv   = GR_TEST_BASE_PATH,GR_VERSION