Supporting deprecated features (better compatibility with Qwt5) with warnings

Author: Pierre Raybaut

qwt/__init__.py

@@ -1,17 +1,20 @@
 
 QWT_VERSION_STR = '6.1.2'
 
+import warnings
+
 from qwt.qwt_plot import QwtPlot
-from qwt.qwt_symbol import QwtSymbol
+from qwt.qwt_symbol import QwtSymbol as QSbl  # see deprecated section
 from qwt.qwt_scale_engine import QwtLinearScaleEngine, QwtLogScaleEngine
 from qwt.qwt_text import QwtText
 from qwt.qwt_plot_canvas import QwtPlotCanvas
-from qwt.qwt_plot_curve import QwtPlotCurve, QwtPlotItem
+from qwt.qwt_plot_curve import QwtPlotCurve as QPC  # see deprecated section
+from qwt.qwt_plot_curve import QwtPlotItem
 from qwt.qwt_scale_map import QwtScaleMap
 from qwt.qwt_interval import QwtInterval
 from qwt.qwt_legend import QwtLegend
 from qwt.qwt_plot_marker import QwtPlotMarker
-from qwt.qwt_plot_grid import QwtPlotGrid
+from qwt.qwt_plot_grid import QwtPlotGrid as QPG  # see deprecated section
 from qwt.qwt_color_map import QwtLinearColorMap
 
 from qwt.toqimage import toQImage
@@ -26,4 +29,74 @@
 
 from qwt.qwt_plot_renderer import QwtPlotRenderer
 
+
+## ============================================================================
+## Deprecated classes and attributes (to be removed in next major release)
+## ============================================================================
+#  Remove deprecated QwtPlotItem.setAxis (replaced by setAxes)
+#  Remove deprecated QwtPlotCanvas.invalidatePaintCache (replaced by replot)
+## ============================================================================
+class QwtDoubleInterval(QwtInterval):
+    def __init__(self, minValue=0., maxValue=-1., borderFlags=None):
+        warnings.warn("`QwtDoubleInterval` has been removed in Qwt6: "\
+                      "please use `QwtInterval` instead", RuntimeWarning)
+        super(QwtDoubleInterval, self).__init__(minValue, maxValue, borderFlags)
+## ============================================================================
+class QwtLog10ScaleEngine(QwtLogScaleEngine):
+    def __init__(self):
+        warnings.warn("`QwtLog10ScaleEngine` has been removed in Qwt6: "\
+                      "please use `QwtLogScaleEngine` instead",
+                      RuntimeWarning)
+        super(QwtLog10ScaleEngine, self).__init__(10)
+## ============================================================================
+class QwtPlotPrintFilter(object):
+    def __init__(self):
+        raise NotImplementedError("`QwtPlotPrintFilter` has been removed in Qwt6: "\
+                                  "please rely on `QwtPlotRenderer` instead")
+## ============================================================================
+class QwtPlotCurve(QPC):
+    @property
+    def Yfx(self):
+        raise NotImplementedError("`Yfx` attribute has been removed "\
+                            "(curve types are no longer implemented in Qwt6)")
+    @property
+    def Xfy(self):
+        raise NotImplementedError("`Yfx` attribute has been removed "\
+                            "(curve types are no longer implemented in Qwt6)")
+## ============================================================================
+class QwtSymbol(QSbl):
+    def draw(self, painter, *args):
+        warnings.warn("`draw` has been removed in Qwt6: "\
+                      "please rely on `drawSymbol` and `drawSymbols` instead",
+                      RuntimeWarning)
+        from qwt.qt.QtCore import QPointF
+        if len(args) == 2:
+            self.drawSymbols(painter, [QPointF(*args)])
+        else:
+            self.drawSymbol(painter, *args)
+## ============================================================================
+class QwtPlotGrid(QPG):
+    def majPen(self):
+        warnings.warn("`majPen` has been removed in Qwt6: "\
+                      "please use `majorPen` instead",
+                      RuntimeWarning)
+        return self.majorPen()
+    def minPen(self):
+        warnings.warn("`minPen` has been removed in Qwt6: "\
+                      "please use `minorPen` instead",
+                      RuntimeWarning)
+        return self.minorPen()
+    def setMajPen(self, *args):
+        warnings.warn("`setMajPen` has been removed in Qwt6: "\
+                      "please use `setMajorPen` instead",
+                      RuntimeWarning)
+        return self.setMajorPen(*args)
+    def setMinPen(self, *args):
+        warnings.warn("`setMinPen` has been removed in Qwt6: "\
+                      "please use `setMinorPen` instead",
+                      RuntimeWarning)
+        return self.setMinorPen(*args)
+## ============================================================================
+
+
 #TODO: implement QwtClipper: needed for SVG export for example

qwt/qwt_clipper.py

@@ -47,7 +47,7 @@ def intersection(self, p1, p2):
 
 class PointBuffer(object):
     def __init__(self, capacity=0):
-        self.capacity = capacity
+        self.m_capacity = capacity
         self.m_size = 0
         self.m_buffer = None
         if capacity > 0:
@@ -56,8 +56,19 @@ def __init__(self, capacity=0):
     def setPoints(self, numPoints, points):
         self.reserve(numPoints)
         self.m_size = numPoints
-        
-        
+    
+    def reset(self):
+        self.m_size = 0
+    
+    def size(self):
+        return self.m_size
+    
+    def data(self):
+        return self.m_buffer
+    
+    def operator(self, i):
+        return self.m_buffer[i]
+    
 
 
 class QwtClipper(object):

qwt/qwt_interval.py

@@ -237,3 +237,4 @@ def extend(self, value):
             return self
         return QwtInterval(min([value, self.__minValue]),
                            max([value, self.__maxValue]))
+

qwt/qwt_plot.py

@@ -1022,6 +1022,12 @@ def setAxes(self, xAxis, yAxis):
         if yAxis == QwtPlot.yLeft or yAxis == QwtPlot.yRight:
             self.__data.yAxis = yAxis
         self.itemChanged()
+
+    def setAxis(self, xAxis, yAxis):
+        import warnings
+        warnings.warn("`setAxis` has been removed in Qwt6: "\
+                      "please use `setAxes` instead", RuntimeWarning)
+        self.setAxes(xAxis, yAxis)
 
     def setXAxis(self, axis):
         if axis in (QwtPlot.xBottom, QwtPlot.xTop):

qwt/qwt_plot_canvas.py

@@ -522,6 +522,12 @@ def replot(self):
         else:
             self.update(self.contentsRect())
 
+    def invalidatePaintCache(self):
+        import warnings
+        warnings.warn("`invalidatePaintCache` has been removed: "\
+                      "please use `replot` instead", RuntimeWarning)
+        self.replot()
+
     def updateStyleSheetInfo(self):
         if not self.testAttribute(Qt.WA_StyledBackground):
             return