Refactor datetime axis support: replace DateTimeScaleDraw with QwtDateTimeScaleDraw and update related tests

Author: PierreRaybaut

CHANGELOG.md

@@ -36,7 +36,6 @@
   * This class provides a dialog for displaying synchronized plots.
   * This is a complementary class to `SyncPlotWindow`, providing a modal dialog interface for synchronized plotting.
 * Native datetime axis support:
-  * Added `DateTimeScaleDraw` class in `plotpy.styles.scaledraw` for formatting axis labels as date/time strings
   * Added `BasePlot.set_axis_datetime()` method to easily configure an axis for datetime display
   * Added `BasePlot.set_axis_limits_from_datetime()` method to set axis limits using datetime objects directly
   * Supports customizable datetime format strings using Python's `strftime` format codes

plotpy/plot/base.py

@@ -53,7 +53,6 @@
     PolygonMapItem,
     PolygonShape,
 )
-from plotpy.plot.scaledraw import DateTimeScaleDraw
 from plotpy.styles.axes import AxesParam, AxeStyleParam, AxisParam, ImageAxesParam
 from plotpy.styles.base import GridParam, ItemParameters
 
@@ -532,7 +531,7 @@ def format_coordinate_value(self, value: float, axis_id: str | int) -> str:
         # Check if this axis is using datetime scale
         if self.get_axis_scale(axis_id) == "datetime":
             try:
-                scale_draw: DateTimeScaleDraw = self.axisScaleDraw(axis_id)
+                scale_draw: qwt.QwtDateTimeScaleDraw = self.axisScaleDraw(axis_id)
                 dt = datetime.fromtimestamp(value)
                 return dt.strftime(scale_draw.get_format())
             except (ValueError, OSError, OverflowError):
@@ -1149,7 +1148,7 @@ def set_axis_scale(self, axis_id: int, scale: str, autoscale: bool = True) -> No
 
         if scale != self.get_axis_scale(axis_id):
             if scale == "datetime":
-                self.setAxisScaleDraw(axis_id, DateTimeScaleDraw())
+                self.setAxisScaleDraw(axis_id, qwt.QwtDateTimeScaleDraw())
             else:
                 self.setAxisScaleDraw(axis_id, qwt.QwtScaleDraw())
 
@@ -1210,10 +1209,18 @@ def set_axis_datetime(
             >>> plot.set_axis_datetime("bottom", format="%Y-%m-%d", rotate=0)
         """
         axis_id = self.get_axis_id(axis_id)
-        scale_draw = DateTimeScaleDraw(format=format, rotate=rotate, spacing=spacing)
+        scale_draw = qwt.QwtDateTimeScaleDraw(format=format, spacing=spacing)
         self.setAxisScaleDraw(axis_id, scale_draw)
         scale_engine = qwt.QwtDateTimeScaleEngine()
         self.setAxisScaleEngine(axis_id, scale_engine)
+        if rotate != 0:
+            self.setAxisLabelRotation(axis_id, rotate)
+            if rotate < 0:
+                self.setAxisLabelAlignment(axis_id, QC.Qt.AlignLeft | QC.Qt.AlignBottom)
+            else:
+                self.setAxisLabelAlignment(
+                    axis_id, QC.Qt.AlignRight | QC.Qt.AlignBottom
+                )
         self.do_autoscale()
 
     def set_axis_limits_from_datetime(

plotpy/plot/scaledraw.py

@@ -10,10 +10,10 @@
 from datetime import datetime
 
 import numpy as np
+import qwt
 from guidata.qthelpers import qt_app_context
 
 from plotpy.builder import make
-from plotpy.plot.scaledraw import DateTimeScaleDraw
 from plotpy.tests import vistools as ptv
 
 
@@ -31,7 +31,7 @@ def test_datetime_axis():
         # Test 1: Set datetime axis with default format
         plot.set_axis_datetime("bottom")
         scale_draw = plot.axisScaleDraw(plot.xBottom)
-        assert isinstance(scale_draw, DateTimeScaleDraw)
+        assert isinstance(scale_draw, qwt.QwtDateTimeScaleDraw)
         assert scale_draw.get_format() == "%Y-%m-%d %H:%M:%S"
 
         # Test 2: Set datetime axis with custom format (time only)