pyqttoolkit 0.7.30__tar.gz → 0.7.32__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyqttoolkit
-Version: 0.7.30
+Version: 0.7.32
 Summary: A toolkit for PyQt 5
 Home-page: https://github.com/Simmovation/pyqttoolkit
 Author: Simmovation Ltd
@@ -12,5 +12,5 @@ Description: # PyQtToolkit
 Platform: any
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
-Provides-Extra: test
 Provides-Extra: publish
+Provides-Extra: test

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

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-07-17T10:07:17+0100",
+ "date": "2024-08-16T06:40:41-0600",
  "dirty": false,
  "error": null,
- "full-revisionid": "fa13871c7fd5ab364e203a9611e279e13ff51cb4",
- "version": "0.7.30"
+ "full-revisionid": "a8f0f66d358fa092957fa5059ebb44995201536b",
+ "version": "0.7.32"
 }
 '''  # END VERSION_JSON
 

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

@@ -29,7 +29,6 @@ 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 import PolarAxes
 
 import pandas as pd
 
@@ -470,6 +469,9 @@ class MatPlotLibBase(QWidget):
         min_ -= diff * skew
         return min_, max_
     
+    def _ensure_x_limit(self, _axes, x_limit):
+        return float(x_limit)
+
     def _do_set_axes_limits(self, axes):
         try:
             self._setting_axis_limits = True
@@ -480,8 +482,8 @@ class MatPlotLibBase(QWidget):
             if self._options_view is not None:
                 if self._options_view.x_limits:
                     self._options_view.setXLimits(
-                        float(np.degrees(x_min) if isinstance(axes, PolarAxes) else x_min),
-                        float(np.degrees(x_max) if isinstance(axes, PolarAxes) else x_max))
+                        self._ensure_x_limit(axes, x_min),
+                        self._ensure_x_limit(axes, x_max))
                 if self._options_view.y_limits:
                     self._options_view.setYLimits(float(y_min), float(y_max))
             axes.set_xlim(*_safe_limits(x_min, x_max))
@@ -845,12 +847,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)
@@ -859,28 +868,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:
@@ -890,16 +916,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
@@ -910,7 +938,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.30 → pyqttoolkit-0.7.32}/pyqttoolkit.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyqttoolkit
-Version: 0.7.30
+Version: 0.7.32
 Summary: A toolkit for PyQt 5
 Home-page: https://github.com/Simmovation/pyqttoolkit
 Author: Simmovation Ltd
@@ -12,5 +12,5 @@ Description: # PyQtToolkit
 Platform: any
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
-Provides-Extra: test
 Provides-Extra: publish
+Provides-Extra: test