pyqttoolkit 0.7.32__tar.gz → 0.7.33__tar.gz

{pyqttoolkit-0.7.32 → pyqttoolkit-0.7.33}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyqttoolkit
-Version: 0.7.32
+Version: 0.7.33
 Summary: A toolkit for PyQt 5
 Home-page: https://github.com/Simmovation/pyqttoolkit
 Author: Simmovation Ltd

{pyqttoolkit-0.7.32 → pyqttoolkit-0.7.33}/pyqttoolkit/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-08-16T06:40:41-0600",
+ "date": "2024-09-19T13:50:57+0100",
  "dirty": false,
  "error": null,
- "full-revisionid": "a8f0f66d358fa092957fa5059ebb44995201536b",
- "version": "0.7.32"
+ "full-revisionid": "2d7b0cb04ba79e391600d50e7a3992a22cb4db0b",
+ "version": "0.7.33"
 }
 '''  # END VERSION_JSON
 

{pyqttoolkit-0.7.32 → pyqttoolkit-0.7.33}/pyqttoolkit/models/span.py

@@ -1,31 +1,36 @@
-# pyqttoolkit
-# Copyright (C) 2018-2019, Simmovation Ltd.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
-from PyQt5.QtCore import QObject
-
-class SpanModel(QObject):
-    def __init__(self, parent, left, right):
-        QObject.__init__(self, parent)
-        self._left = left
-        self._right = right
-    
-    @property
-    def left(self):
-        return self._left
-
-    @property
-    def right(self):
-        return self._right
+# pyqttoolkit
+# Copyright (C) 2018-2019, Simmovation Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+from PyQt5.QtCore import QObject
+
+class SpanModel(QObject):
+    def __init__(self, parent, left, right, radians=False):
+        QObject.__init__(self, parent)
+        self._left = left
+        self._right = right
+        self._radians = radians
+    
+    @property
+    def left(self):
+        return self._left
+
+    @property
+    def right(self):
+        return self._right
+
+    @property
+    def radians(self):
+        return self._radians

{pyqttoolkit-0.7.32 → pyqttoolkit-0.7.33}/pyqttoolkit/views/plot/matplotlib/base.py

@@ -29,6 +29,7 @@ from matplotlib.figure import Figure
 from matplotlib.widgets import RectangleSelector, SpanSelector
 from mpl_toolkits.axes_grid1 import Size, Divider
 from mpl_toolkits.axes_grid1.mpl_axes import Axes
+from matplotlib.projections.polar import PolarAxes
 
 import pandas as pd
 
@@ -53,9 +54,25 @@ def _safe_limits(lower, upper):
     upper = _to_finite(upper)
     return min(lower, upper), max(lower, upper)
 
-class _SpanSelector(SpanSelector):
+def _cartesian_polar_selector(base_class):
+    class _CartesianPolarSelector(base_class):
+        def __init__(self, *args, **kwargs):
+            super().__init__(*args, **kwargs)
+            self._polar_projection = isinstance(self.ax, PolarAxes)
+        
+        def _get_data(self, event):
+            if self._polar_projection:
+                xdata = event.xdata + 2 * np.pi if event.xdata < 0 else event.xdata
+                ydata = np.clip(event.ydata, *self.ax.get_ybound())
+                return xdata, ydata
+            else:
+                return super()._get_data(event)
+    
+    return _CartesianPolarSelector
+
+class _SpanSelector(_cartesian_polar_selector(SpanSelector)):
     def __init__(self, *args, **kwargs):
-        SpanSelector.__init__(self, *args, **kwargs)
+        super().__init__(*args, **kwargs)
         self._select_none_handler = None
         self._min_span = 1.0
 
@@ -80,7 +97,7 @@ class _SpanSelector(SpanSelector):
     def set_min_span(self, min_span):
         self._min_span = min_span
 
-class _RectangleSelector(RectangleSelector):
+class _RectangleSelector(_cartesian_polar_selector(RectangleSelector)):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
@@ -670,11 +687,16 @@ class MatPlotLibBase(QWidget):
         self._span.active = True
         self._span_center_mouse_event = self._span_left_mouse_event = self._span_right_mouse_event = None
 
-    def _update_span_rect(self, x_min, x_max=None):
-        self._span.rect.set_x(x_min)
+    def _do_update_span_rect(self, span_tool, x_min, x_max):
+        if span_tool is None:
+            return
+        span_tool.rect.set_x(x_min)
         if x_max:
-            self._span.rect.set_width(x_max - x_min)
-        self._span.handles.set_data(self._span.extents)
+            span_tool.rect.set_width(x_max - x_min)
+        span_tool.handles.set_data(span_tool.extents)
+
+    def _update_span_rect(self, x_min, x_max=None):
+        self._do_update_span_rect(self._span, x_min, x_max)
     
     def _round_to_bin_width(self, x_min, x_max):
         return x_min, x_max

{pyqttoolkit-0.7.32 → pyqttoolkit-0.7.33}/pyqttoolkit.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyqttoolkit
-Version: 0.7.32
+Version: 0.7.33
 Summary: A toolkit for PyQt 5
 Home-page: https://github.com/Simmovation/pyqttoolkit
 Author: Simmovation Ltd