pyqttoolkit 0.7.31__tar.gz → 0.7.33__tar.gz

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

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

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

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-08-05T12:00:52+0100",
+ "date": "2024-09-19T13:50:57+0100",
  "dirty": false,
  "error": null,
- "full-revisionid": "82d72d579c7ed494df69c52c651298832961a41e",
- "version": "0.7.31"
+ "full-revisionid": "2d7b0cb04ba79e391600d50e7a3992a22cb4db0b",
+ "version": "0.7.33"
 }
 '''  # END VERSION_JSON
 

{pyqttoolkit-0.7.31 → 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.31 → 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
@@ -847,12 +869,19 @@ class MatPlotLibBase(QWidget):
             return
         if hasattr(self.data, 'x_labels'):
             step = self.data.x_tick_interval if hasattr(self.data, 'x_tick_interval') else None
-            x_ticks, x_labels = self._get_labels(self.data.x_labels, step, horizontal=True)
+            x_ticks, x_labels, x_ticks_rotation = self._get_labels(self.data.x_labels, step, horizontal=True)
             self._axes.set_xticks(x_ticks)
-            self._axes.set_xticklabels(x_labels)
+            if hasattr(self.data, 'x_ticks_rotation'):
+                rotation = x_ticks_rotation if np.isnan(self.data.x_ticks_rotation) else self.data.x_ticks_rotation
+                self._axes.set_xticklabels(
+                    x_labels, rotation=rotation, ha='right' if rotation else 'center')
+                self._adjust_to_xticklabels_height(x_labels, rotation)
+            else:
+                self._axes.set_xticklabels(x_labels)
+
         if hasattr(self.data, 'y_labels'):
             step = self.data.y_tick_interval if hasattr(self.data, 'y_tick_interval') else None
-            y_ticks, y_labels = self._get_labels(self.data.y_labels, step, horizontal=False)
+            y_ticks, y_labels, _ = self._get_labels(self.data.y_labels, step, horizontal=False)
             self._axes.set_yticks(y_ticks)
             self._axes.set_yticklabels(y_labels)
             self._adjust_to_yticklabels_width(y_labels)
@@ -861,28 +890,45 @@ class MatPlotLibBase(QWidget):
         sizes = self._divider.get_horizontal()
         ticklabels_font_family = self._axes.yaxis.get_ticklabels()[0].get_family() if labels else None
         ticklabels_font_size = self._axes.yaxis.get_ticklabels()[0].get_size() if labels else None
-        width, _ = self._get_label_width_height(
-            labels, horizontal=False, font_family=ticklabels_font_family, font_size=ticklabels_font_size)
+        width, _ = self._get_labels_width_height(
+            labels, font_family=ticklabels_font_family, font_size=ticklabels_font_size)
 
         ylabel_font_family = self._axes.yaxis.get_label().get_family()
         ylabel_font_size = self._axes.yaxis.get_label().get_size()
-        _, y_label_width = self._get_label_width_height(
-            [self._axes.get_ylabel()], horizontal=True, font_family=ylabel_font_family, font_size=ylabel_font_size)
+        y_label_width, _ = self._get_labels_width_height(
+            [self._axes.get_ylabel()], font_family=ylabel_font_family, font_size=ylabel_font_size, rotation=90)
      
-        width += y_label_width + 0.2 * self._figure.dpi # Need this offset to account for the tick marks and ylabel
+        width += y_label_width + 0.3 * self._figure.dpi # Need this offset to account for the tick marks and ylabel
         sizes[0] = Size.Fixed(width / self._figure.dpi)
         self._divider.set_horizontal(sizes)
         self.yTickLabelsWidthAdjusted.emit()
 
+    def _adjust_to_xticklabels_height(self, labels, rotation=None):
+        sizes = self._divider.get_vertical()
+        ticklabels_font_family = self._axes.xaxis.get_ticklabels()[0].get_family() if labels else None
+        ticklabels_font_size = self._axes.xaxis.get_ticklabels()[0].get_size() if labels else None
+        _, height = self._get_labels_width_height(
+            labels, font_family=ticklabels_font_family, font_size=ticklabels_font_size, rotation=rotation)
+        
+        xlabel_font_family = self._axes.xaxis.get_label().get_family()
+        xlabel_font_size = self._axes.xaxis.get_label().get_size()
+        _, x_label_height = self._get_labels_width_height(
+            [self._axes.get_xlabel()], font_family=xlabel_font_family, font_size=xlabel_font_size)
+        
+        height += x_label_height + 0.2 * self._figure.dpi # Need this offset to account for the tick marks and xlabel
+        sizes[0] = Size.Fixed(height / self._figure.dpi)
+        self._divider.set_vertical(sizes)
+
     def _get_labels(self, labels, step, horizontal=True):
         (x0, x1), (y0, y1) = self._get_xy_extents()
         start, end = (int(x0), int(x1)) if horizontal else (int(y0), int(y1))
         visible_points = end - start
+        labels_rotation = None
+        axes_bbox = self._axes.get_window_extent(self._figure.canvas.get_renderer()).transformed(self._figure.dpi_scale_trans.inverted())
+        plot_size = (axes_bbox.width if horizontal else axes_bbox.height) * self._figure.dpi
+        width, height = self._get_labels_width_height(labels)
+        size = (width if horizontal else height)
         if not (step and step > 0):
-            width, height = self._get_label_width_height(labels, horizontal=horizontal)
-            axes_bbox = self._axes.get_window_extent(self._figure.canvas.get_renderer()).transformed(self._figure.dpi_scale_trans.inverted())
-            plot_size = (axes_bbox.width if horizontal else axes_bbox.height) * self._figure.dpi
-            size = (width if horizontal else height)
             if plot_size == 0 or size == 0:
                 n_labels = 16
             else:
@@ -892,16 +938,18 @@ class MatPlotLibBase(QWidget):
             step = int(visible_points / n_labels) + 1
         else:
             step = int(step)
+        if horizontal and (visible_points / step) * size > plot_size:
+            labels_rotation = 30
         indexes = list(range(len(labels)))
         display_labels = list(labels)
         for i in indexes:
             if i % step:
                 display_labels[i] = ''
-        return indexes, display_labels
-    
-    def _get_label_width_height(self, labels, horizontal=True, font_family=None, font_size=None):
+        return indexes, display_labels, labels_rotation
+
+    def _get_labels_width_height(self, labels, font_family=None, font_size=None, rotation=None):
         self._cached_label_width_height = self._cached_label_width_height or {}
-        cache_key = ''.join([str(i) for i in (horizontal, font_family, font_size)])
+        cache_key = (tuple(labels), ''.join([str(i) for i in (font_family, font_size)]))
         if cache_key not in self._cached_label_width_height:
             font = MatPlotLibFont(font=font_family) if font_family else MatPlotLibFont.default()
             width = 0
@@ -912,7 +960,8 @@ class MatPlotLibBase(QWidget):
                 width = max(width, next_width)
                 height = max(height, next_height)
             self._cached_label_width_height[cache_key] = width, height
-        return self._cached_label_width_height[cache_key]
+        width, height = self._cached_label_width_height[cache_key]
+        return (abs(width * np.cos(np.radians(rotation))), abs(width * np.sin(np.radians(rotation)) + height)) if rotation is not None else (width, height)
 
     def _create_new_axes(self, nx=1, ny=1) -> Axes:
         axes = Axes(self._figure, self._divider.get_position())

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

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