Fixed obvious errors(/poor implementations) in untested code parts

Author: PierreRaybaut

qwt/legend.py

@@ -130,7 +130,7 @@ def title(self):
         if isinstance(titleValue, QwtText):
             text = titleValue
         else:
-            text.setText(titleValue)
+            text = QwtText(titleValue)
         return text
 
     def icon(self):

qwt/plot.py

@@ -1504,8 +1504,8 @@ def insertLegend(self, legend, pos=None, ratio=-1):
                 elif lpos == self.BottomLegend:
                     previousInChain = self.footerLabel()
 
-            if previousInChain:
-                qwtSetTabOrder(previousInChain, legend, True)
+                if previousInChain is not None:
+                    qwtSetTabOrder(previousInChain, legend, True)
 
         self.updateLayout()
 

qwt/plot_curve.py

@@ -324,6 +324,7 @@ def setPen(self, *args):
         """
         if len(args) == 3:
             color, width, style = args
+            pen = QPen(color, width, style)
         elif len(args) == 1:
             pen, = args
         else:

qwt/plot_layout.py

@@ -253,7 +253,7 @@ def setAlignCanvasToScales(self, *args):
                 self.__data.alignCanvasToScales[axis] = on
         elif len(args) == 2:
             axisId, on = args
-            if axis in QwtPlot.validAxes:
+            if axisId in QwtPlot.validAxes:
                 self.__data.alignCanvasToScales[axisId] = on
         else:
             raise TypeError("%s().setAlignCanvasToScales() takes 1 or 2 "\

qwt/plot_marker.py

@@ -475,7 +475,8 @@ def setLinePen(self, *args):
                 width = args[1]
                 if len(args) > 2:
                     style = args[2]
-            self.setLinePen(QPen(color, width, style))
+            pen = QPen(color, width, style)
+            self.setLinePen(pen)
         else:
             raise TypeError("%s().setLinePen() takes 1, 2 or 3 argument(s) "\
                             "(%s given)" % (self.__class__.__name__, len(args)))

qwt/plot_renderer.py

@@ -281,14 +281,11 @@ def renderTo(self, plot, dest):
         raster graphics formats.
 
         :param qwt.plot.QwtPlot plot: Plot widget
-        :param str fileName: Path of the file, where the document will be stored
-        :param str format: Format for the document
-        :param QSizeF sizeMM: Size for the document in millimeters.
-        :param int resolution: Resolution in dots per Inch (dpi)
+        :param dest: QPaintDevice, QPrinter or QSvgGenerator instance
         
         .. seealso::
         
-            :py:meth:`renderTo()`, :py:meth:`render()`, 
+            :py:meth:`render()`, 
             :py:meth:`qwt.painter.QwtPainter.setRoundingAlignment()`
         """
         if isinstance(dest, QPaintDevice):
@@ -308,6 +305,8 @@ def renderTo(self, plot, dest):
                 rect.setRect(0, 0, dest.width(), dest.height())
             if rect.isEmpty():
                 rect.setRect(0, 0, 800, 600)
+        else:
+            raise TypeError("Unsupported destination type %s" % type(dest))
         p = QPainter(dest)
         self.render(plot, p, rect)
 
@@ -501,7 +500,7 @@ def renderScale(self, plot, painter, axisId, startDist, endDist,
             y = rect.bottom() - 1.0 - baseDist
             w = rect.width() - startDist - endDist
             align = QwtScaleDraw.TopScale
-        elif axisId == QwtPlot.xBottom:
+        else:  # QwtPlot.xBottom
             x = rect.left() + startDist
             y = rect.top() + baseDist
             w = rect.width() - startDist - endDist

qwt/symbol.py

@@ -196,6 +196,8 @@ def qwtDrawTriangleSymbols(painter, type, points, numPoint, symbol):
             triangle = [QPointF(x1, y2), QPointF(x, y1), QPointF(x2, y2)]
         elif type == QwtTriangle.Down:
             triangle = [QPointF(x1, y1), QPointF(x, y2), QPointF(x2, y1)]
+        else:
+            raise TypeError("Unknown triangle type %s" % type)
         painter.drawPolygon(QPolygonF(triangle))
 
 

qwt/tests/CurveDemo1.py

@@ -92,16 +92,14 @@ def paintEvent(self, event):
     def drawContents(self, painter):
         # draw curves
         r = self.contentsRect()
-        dy = r.height()/len(self.curves)
+        dy = int(r.height()/len(self.curves))
         r.setHeight(dy)
         for curve in self.curves:
             self.xMap.setPaintInterval(r.left(), r.right())
             self.yMap.setPaintInterval(r.top(), r.bottom())
-            engine = painter.device().paintEngine()
-            if engine is not None and engine.hasFeature(QPaintEngine.Antialiasing):
-                painter.setRenderHint(
-                    QPainter.Antialiasing,
-                    curve.testRenderHint(QwtPlotItem.RenderAntialiased))
+            painter.setRenderHint(
+                QPainter.Antialiasing,
+                curve.testRenderHint(QwtPlotItem.RenderAntialiased))
             curve.draw(painter, self.xMap, self.yMap, r)
             self.shiftDown(r, dy)
         # draw titles

qwt/tests/ImagePlotDemo.py

@@ -98,9 +98,10 @@ def draw(self, painter, xMap, yMap, rect):
         # copy
         image = self.image.copy(x1, y1, x2-x1, y2-y1)
         # zoom
-        image = image.scaled(xMap.p2()-xMap.p1()+1, yMap.p1()-yMap.p2()+1)
+        image = image.scaled(int(xMap.p2()-xMap.p1()+1),
+                             int(yMap.p1()-yMap.p2()+1))
         # draw
-        painter.drawImage(xMap.p1(), yMap.p2(), image)
+        painter.drawImage(int(xMap.p1()), int(yMap.p2()), image)
 
 
 class ImagePlot(QwtPlot):