Merge pull request #38 from pgRouting/develop

Version 2.2

Author: cvvergara

functions/kdijkstra_cost.py

@@ -38,6 +38,7 @@ def prepare(self, canvasItemList):
         resultNodesTextAnnotations = canvasItemList['annotations']
         for anno in resultNodesTextAnnotations:
             anno.setVisible(False)
+            self.iface.mapCanvas().scene().removeItem(anno)
         canvasItemList['annotations'] = []
 
     def getQuery(self, args):
@@ -146,6 +147,8 @@ def draw(self, rows, con, args, geomType, canvasItemList, mapCanvas):
 
             textAnnotation.update()
             resultNodesTextAnnotations.append(textAnnotation)
+            canvasItemList['annotations'] = resultNodesTextAnnotations
+
 
     def __init__(self, ui):
         FunctionBase.__init__(self, ui)

metadata.txt

@@ -8,6 +8,8 @@ qgisMaximumVersion=2.99
 author=Anita Graser, Ko Nagase, Vicky Vergara
 [email protected]
 changelog=2.2.0
+    - Support for pgRouting V2.0 up to v2.5
+    - BBOX is optional
     2.1.0
     - change support sites
     - port to pgRouting 2.1 API by pgRouting team

pgRoutingLayer.py

@@ -203,20 +203,20 @@ def initGui(self):
         self.dock.lineEditDistance.setValidator(QDoubleValidator())
         self.dock.lineEditAlpha.setValidator(QDoubleValidator())
         self.dock.lineEditPaths.setValidator(QIntValidator())
-        self.loadSettings()
 
         #populate the combo with connections
         self.reloadMessage = False
         self.reloadConnections()
+        self.loadSettings()
         Utils.logMessage("startup version " + str(self.version))
         self.reloadMessage = True
 
     def show(self):
         self.iface.addDockWidget(Qt.LeftDockWidgetArea, self.dock)
 
     def unload(self):
-        self.saveSettings()
         self.clear()
+        self.saveSettings()
         # Remove the plugin menu item and icon
         self.iface.removePluginDatabaseMenu("&pgRouting Layer", self.action)
         self.iface.removeDockWidget(self.dock)
@@ -869,8 +869,10 @@ def clear(self):
         for anno in self.canvasItemList['annotations']:
             try:
                 anno.setVisible(False)
+                self.iface.mapCanvas().scene().removeItem(anno)
             except RuntimeError, e:
-                Utils.logMessage("anno.setVisible(False) failed, " + e.message, QgsMessageLog.WARNING)
+                QApplication.restoreOverrideCursor()
+                QMessageBox.critical(self.dock, self.dock.windowTitle(), '%s' % e)
         self.canvasItemList['annotations'] = []
         for path in self.canvasItemList['paths']:
             path.reset(Utils.getRubberBandType(False))
@@ -1202,7 +1204,7 @@ def findNearestLink(self, args, pt):
 
     def loadSettings(self):
         settings = QSettings()
-        idx = self.dock.comboConnections.findText(Utils.getStringValue(settings, '/pgRoutingLayer/Database', ''))
+        idx = self.dock.comboConnections.findText(settings.value('/pgRoutingLayer/Database', type=str))
         if idx >= 0:
             self.dock.comboConnections.setCurrentIndex(idx)
         idx = self.dock.comboBoxFunction.findText(Utils.getStringValue(settings, '/pgRoutingLayer/Function', 'dijkstra'))