QwtPainter: removed unused methods

Author: PierreRaybaut

CHANGELOG.md

@@ -221,6 +221,7 @@ and [ImagePlotDemo.py](qwt/tests/ImagePlotDemo.py)
 implemented (fitting, rounding, weeding out points, clipping, etc.)
 - Added `QwtScaleDraw.setLabelAutoSize`/`labelAutoSize` methods to set the new
 auto size option (see [documentation](http://pythonhosted.org/PythonQwt/))
+- `QwtPainter`: removed unused methods `drawRoundFrame`, `drawImage` and `drawPixmap`
 
 ## Version 0.4.0
 

qwt/painter.py

@@ -66,12 +66,6 @@ def qwtFillRect(widget, painter, rect, brush):
 class QwtPainterClass(object):
     """A collection of `QPainter` workarounds"""
 
-    def drawImage(self, painter, rect, image):
-        painter.drawImage(rect, image)
-
-    def drawPixmap(self, painter, rect, pixmap):
-        painter.drawPixmap(rect, pixmap)
-
     def drawFocusRect(self, *args):
         if len(args) == 2:
             painter, widget = args
@@ -91,40 +85,6 @@ def drawFocusRect(self, *args):
                 "(s) (%s given)" % len(args)
             )
 
-    def drawRoundFrame(self, painter, rect, palette, lineWidth, frameStyle):
-        """
-        Draw a round frame
-
-        :param QPainter painter: Painter
-        :param QRectF rect: Target rectangle
-        :param QPalette palette: `QPalette.WindowText` is used for plain borders, `QPalette.Dark` and `QPalette.Light` for raised or sunken borders
-        :param int lineWidth: Line width
-        :param int frameStyle: bitwise OR´ed value of `QFrame.Shape` and `QFrame.Shadow`
-        """
-        Plain, Sunken, Raised = list(range(3))
-        style = Plain
-        if (frameStyle & QFrame.Sunken) == QFrame.Sunken:
-            style = Sunken
-        elif (frameStyle & QFrame.Raised) == QFrame.Raised:
-            style = Raised
-        lw2 = 0.5 * lineWidth
-        r = rect.adjusted(lw2, lw2, -lw2, -lw2)
-        if style != Plain:
-            c1 = palette.color(QPalette.Light)
-            c2 = palette.color(QPalette.Dark)
-            if style == Sunken:
-                c1, c2 = c2, c1
-            gradient = QLinearGradient(r.topLeft(), r.bottomRight())
-            gradient.setColorAt(0.0, c1)
-            gradient.setColorAt(1.0, c2)
-            brush = QBrush(gradient)
-        else:
-            brush = palette.brush(QPalette.WindowText)
-        painter.save()
-        painter.setPen(QPen(brush, lineWidth))
-        painter.drawEllipse(r)
-        painter.restore()
-
     def drawFrame(
         self,
         painter,

qwt/symbol.py

@@ -28,7 +28,6 @@
 from qtpy.QtSvg import QSvgRenderer
 
 from qwt.graphic import QwtGraphic
-from qwt.painter import QwtPainter
 
 
 class QwtTriangle(object):
@@ -78,7 +77,7 @@ def qwtDrawPixmapSymbols(painter, points, symbol):
     painter.resetTransform()
     for pos in points:
         pos = QPointF(transform.map(pos)) - pinPoint
-        QwtPainter.drawPixmap(painter, QRect(pos.toPoint(), pm.size()), pm)
+        painter.drawPixmap(QRect(pos.toPoint(), pm.size()), pm)
 
 
 def qwtDrawSvgSymbols(painter, points, renderer, symbol):