Ported changes from Qwt 6.1.2 to Qwt 6.1.5

Author: PierreRaybaut

.gitignore

@@ -1,5 +1,5 @@
 .spyderproject
-qwt-6.1.2
+qwt-6.*
 qwt/tests/demo.png
 PythonQwt.chm
 PythonQwt.chm.zip

qwt/__init__.py

@@ -28,8 +28,8 @@
 .. _GitHubPage: http://pierreraybaut.github.io/PythonQwt
 .. _GitHub: https://github.com/PierreRaybaut/PythonQwt
 """
-__version__ = '0.5.5'
-QWT_VERSION_STR = '6.1.2'
+__version__ = '0.6.0'
+QWT_VERSION_STR = '6.1.5'
 
 import warnings
 

qwt/column_symbol.py

@@ -129,7 +129,8 @@ def drawBox(self, painter, rect):
         elif self.__data.frameStyle == QwtColumnSymbol.Plain:
             qwtDrawBox(painter, r, self.__data.palette, self.__data.lineWidth)
         else:
-            painter.fillRect(r, self.__data.palette.window())
+            painter.fillRect(r.adjusted(0, 0, 1, 1),
+                             self.__data.palette.window())
 
 
 class QwtColumnRect(object):

qwt/graphic.py

@@ -708,9 +708,8 @@ def updateBoundingRect(self, rect):
         br = QRectF(rect)
         painter = self.paintEngine().painter()
         if painter and painter.hasClipping():
-            #XXX: there's something fishy about the following lines...
             cr = painter.clipRegion().boundingRect()
-            cr = painter.transform().mapRect(br)
+            cr = painter.transform().mapRect(cr)
             br &= cr
         if self.__data.boundingRect.width() < 0:
             self.__data.boundingRect = br

qwt/legend.py

@@ -667,6 +667,7 @@ def setMaxColumns(self, numColumns):
         tl = self.__data.view.gridLayout
         if tl is not None:
             tl.setMaxColumns(numColumns)
+        self.updateGeometry()
 
     def maxColumns(self):
         """

qwt/painter.py

@@ -81,6 +81,8 @@ def drawFocusRect(self, *args):
             opt.initFrom(widget)
             opt.rect = rect
             opt.state |= QStyle.State_HasFocus
+            palette = widget.palette()
+            opt.backgroundColor = palette.color(widget.backgroundRole())
             widget.style().drawPrimitive(QStyle.PE_FrameFocusRect,
                                          opt, painter, widget)
         else:

qwt/plot.py

@@ -20,7 +20,7 @@
 """
 
 from .qt.QtGui import (QWidget, QFont, QSizePolicy, QFrame, QApplication,
-                          QRegion, QPainter, QPalette)
+                       QRegion, QPainter, QPalette)
 from .qt.QtCore import Qt, Signal, QEvent, QSize, QRectF
 
 from .text import QwtText, QwtTextLabel
@@ -1206,9 +1206,12 @@ def updateLayout(self):
             self.__data.footerLabel.hide()
 
         for axisId in self.validAxes:
+            scaleWidget = self.axisWidget(axisId)
             if self.axisEnabled(axisId):
-                self.axisWidget(axisId).setGeometry(scaleRect[axisId])
-                
+                if scaleRect[axisId] != scaleWidget.geometry():
+                    scaleWidget.setGeometry(scaleRect[axisId])
+                    startDist, endDist = scaleWidget.getBorderDistHint()
+                    scaleWidget.setBorderDist(startDist, endDist)
                 if axisId in (self.xBottom, self.xTop):
                     r = QRegion(scaleRect[axisId])
                     if self.axisEnabled(self.yLeft):
@@ -1217,13 +1220,13 @@ def updateLayout(self):
                         r = r.subtracted(QRegion(scaleRect[self.yRight]))
                     r.translate(-scaleRect[axisId].x(), -scaleRect[axisId].y())
 
-                    self.axisWidget(axisId).setMask(r)
+                    scaleWidget.setMask(r)
 
-                if not self.axisWidget(axisId).isVisibleTo(self):
-                    self.axisWidget(axisId).show()
+                if not scaleWidget.isVisibleTo(self):
+                    scaleWidget.show()
 
             else:
-                self.axisWidget(axisId).hide()
+                scaleWidget.hide()
 
         if self.__data.legend:
             if self.__data.legend.isEmpty():

qwt/plot_canvas.py

@@ -568,7 +568,11 @@ def paintEvent(self, event):
         if self.testPaintAttribute(self.BackingStore) and\
            self.__data.backingStore is not None:
             bs = self.__data.backingStore
-            if bs.size() != self.size():
+            if QT_VERSION >= 0x050000:
+                pixelRatio = bs.devicePixelRatio()
+            else:
+                pixelRatio = 1.
+            if bs.size() != self.size()*pixelRatio:
                 bs = QwtPainter.backingStore(self, self.size())
                 if self.testAttribute(Qt.WA_StyledBackground):
                     p = QPainter(bs)

qwt/plot_curve.py

@@ -15,11 +15,10 @@
 
 from .text import QwtText
 from .plot import QwtPlotItem, QwtPlotItem_PrivateData
-from .painter import QwtPainter
 from .math import qwtSqr
 from .graphic import QwtGraphic
-from .plot_series import (QwtPlotSeriesItem, QwtSeriesStore,
-                             QwtSeriesData, QwtPointArrayData)
+from .plot_series import (QwtPlotSeriesItem, QwtSeriesStore, QwtSeriesData,
+                          QwtPointArrayData)
 from .symbol import QwtSymbol
 from .plot_directpainter import QwtPlotDirectPainter
 

qwt/plot_directpainter.py

@@ -211,6 +211,7 @@ def drawSeries(self, seriesItem, from_, to):
             if self.__data.hasClipping:
                 painter.setClipRegion(self.__data.clipRegion)
             qwtRenderItem(painter, canvasRect, seriesItem, from_, to)
+            painter.end()
             if self.testAttribute(self.FullRepaint):
                 plotCanvas.repaint()
                 return
@@ -270,7 +271,7 @@ def eventFilter(self, obj_, event):
                     if plotCanvas:
                         doCopyCache = qwtHasBackingStore(plotCanvas)
                         if doCopyCache:
-                            painter.drawPixmap(plotCanvas.contentsRect().topLeft(),
+                            painter.drawPixmap(plotCanvas.rect().topLeft(),
                                                plotCanvas.backingStore())
                 if not doCopyCache:
                     qwtRenderItem(painter, canvas.contentsRect(),