Merge pull request #25 from sanak/hotfix/issue20

Hotfix/issue20

Author: sanak

functions/tsp_euclid.py

@@ -72,10 +72,6 @@ def getExportQuery(self, args):
 
     def draw(self, rows, con, args, geomType, canvasItemList, mapCanvas):
         resultPathsRubberBands = canvasItemList['path']
-        rubberBand = None
-        rubberBand = QgsRubberBand(mapCanvas, Utils.getRubberBandType(False))
-        rubberBand.setColor(QColor(255, 0, 0, 128))
-        rubberBand.setWidth(4)
         i = 0
         for row in rows:
             if i == 0:
@@ -103,10 +99,10 @@ def draw(self, rows, con, args, geomType, canvasItemList, mapCanvas):
             if geom.wkbType() == QGis.WKBMultiLineString:
                 for line in geom.asMultiPolyline():
                     for pt in line:
-                        rubberBand.addPoint(pt)
+                        resultPathsRubberBands.addPoint(pt)
             elif geom.wkbType() == QGis.WKBLineString:
                 for pt in geom.asPolyline():
-                    rubberBand.addPoint(pt)
+                    resultPathsRubberBands.addPoint(pt)
             prevrow = row
             lastrow = row
 
@@ -129,10 +125,10 @@ def draw(self, rows, con, args, geomType, canvasItemList, mapCanvas):
         if geom.wkbType() == QGis.WKBMultiLineString:
             for line in geom.asMultiPolyline():
                 for pt in line:
-                    rubberBand.addPoint(pt)
+                    resultPathsRubberBands.addPoint(pt)
         elif geom.wkbType() == QGis.WKBLineString:
             for pt in geom.asPolyline():
-                rubberBand.addPoint(pt)
+                resultPathsRubberBands.addPoint(pt)
 
 
 

pgRoutingLayer.py

@@ -859,7 +859,10 @@ def clear(self):
             marker.setVisible(False)
         self.canvasItemList['markers'] = []
         for anno in self.canvasItemList['annotations']:
-            anno.setVisible(False)
+            try:
+                anno.setVisible(False)
+            except RuntimeError, e:
+                Utils.logMessage("anno.setVisible(False) failed, " + e.message, QgsMessageLog.WARNING)
         self.canvasItemList['annotations'] = []
         for path in self.canvasItemList['paths']:
             path.reset(Utils.getRubberBandType(False))