Port to QGIS 3

.gitignore

@@ -0,0 +1 @@
+__pycache__

Makefile

@@ -20,7 +20,7 @@
 # CONFIGURATION
 PLUGIN_UPLOAD = $(CURDIR)/plugin_upload.py
 
-QGISDIR=.qgis2
+QGISDIR=.qgis3
 
 # Makefile for a PyQGIS plugin
 
@@ -48,10 +48,10 @@ default: compile
 compile: $(UI_FILES) $(RESOURCE_FILES)
 
 %_rc.py : %.qrc
-	pyrcc4 -o $*_rc.py  $<
+	pyrcc5 -o $*_rc.py  $<
 
 %.py : %.ui
-	pyuic4 -o $@ $<
+	pyuic5 -o $@ $<
 
 %.qm : %.ts
 	lrelease $<
@@ -100,7 +100,7 @@ upload: zip
 # transup
 # update .ts translation files
 transup:
-	pylupdate4 Makefile
+	pylupdate5 Makefile
 
 # transcompile
 # compile translation files into .qm binary format

__init__.py

@@ -23,5 +23,5 @@
 
 def classFactory(iface):
     # load BankFullDetection class from file BankFullDetection
-    from bankfulldetection import BankFullDetection
+    from .bankfulldetection import BankFullDetection
     return BankFullDetection(iface)

bankfulldetection.py

@@ -20,13 +20,14 @@
  ***************************************************************************/
 """
 # Import the PyQt and QGIS libraries
-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
+from qgis.PyQt.QtCore import *
+from qgis.PyQt.QtGui import *
+from qgis.PyQt.QtWidgets import *
 from qgis.core import *
 # Initialize Qt resources from file resources.py
-import resources_rc
+from . import resources_rc
 # Import the code for the dialog
-from bankfulldetectiondialog import BankFullDetectionDialog
+from .bankfulldetectiondialog import BankFullDetectionDialog
 import os.path
 
 

bankfulldetectiondialog.py

@@ -21,13 +21,14 @@
 """
 
 import os
-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
-from ui_bankfulldetection import Ui_BankFullDetection
+from qgis.PyQt.QtCore import *
+from qgis.PyQt.QtGui import *
+from qgis.PyQt.QtWidgets import *
+from .ui_bankfulldetection import Ui_BankFullDetection
 from qgis.core import *
-from tools.XSGenerator import *
-from tools.profiler import ProfilerTool
-from tools.BankElevationDetection import mainFun
+from .tools.XSGenerator import *
+from .tools.profiler import ProfilerTool
+from .tools.BankElevationDetection import mainFun
 
 
 class BankFullDetectionDialog(QDialog, Ui_BankFullDetection):
@@ -53,20 +54,20 @@ def __init__(self,iface):
 
         #~ connections
         #~ self.iface.clicked.connect(self.runXS)
-        QObject.connect(self.genXSbtn, SIGNAL( "clicked()" ), self.genXS)
-        QObject.connect(self.buttonProf, SIGNAL( "clicked()" ), self.runProfile)
-        QObject.connect(self.ShpSaveBtn, SIGNAL( "clicked()" ), self.writeLayer)
-        QObject.connect(self.selXS, SIGNAL( "clicked()" ), self.runProfileXS)
+        self.genXSbtn.clicked.connect(self.genXS)
+        self.buttonProf.clicked.connect(self.runProfile)
+        self.ShpSaveBtn.clicked.connect(self.writeLayer)
+        self.selXS.clicked.connect(self.runProfileXS)
 
 
     def setup_gui(self):
         """ Function to combos creation """
         self.comboVector.clear()
         self.comboDEM.clear()
-        curr_map_layers = QgsMapLayerRegistry.instance().mapLayers()
+        curr_map_layers = QgsProject.instance().mapLayers()
         layerRasters = []
         layerVectors = []
-        for name, layer in curr_map_layers.iteritems():
+        for layer in curr_map_layers.values():
             if layer.type() == QgsMapLayer.VectorLayer:
                 layerVectors.append(unicode(layer.name()))
             elif layer.type() == QgsMapLayer.RasterLayer:
@@ -75,7 +76,7 @@ def setup_gui(self):
         self.comboVector.addItems( layerVectors )
 
     def getLayerByName(self,LayerName):
-        layer = QgsMapLayerRegistry.instance().mapLayersByName(LayerName)[0]
+        layer = QgsProject.instance().mapLayersByName(LayerName)[0]
         return layer
 
 
@@ -126,17 +127,17 @@ def runProfile(self):
         vl = QgsVectorLayer("Polygon", self.vlName, "memory")
         pr = vl.dataProvider()
         fet = QgsFeature()
-        fet.setGeometry( QgsGeometry.fromPolygon( [ ringPoints ] ) )
+        fet.setGeometry( QgsGeometry.fromPolygonXY( [ ringPoints ] ) )
         pr.addFeatures( [fet] )
-        QgsMapLayerRegistry.instance().addMapLayer(vl)
+        QgsProject.instance().addMapLayer(vl)
 
         #check if output file is selected
         shapefilename = self.ShpSaveLine.text()
         if shapefilename == None:
             QMessageBox.critical(self.iface.mainWindow(),QCoreApplication.translate( "message","Error"), QCoreApplication.translate( "message","You have to select output file first"))
         else:
             #~ save vector layer to shapefile
-            error = QgsVectorFileWriter.writeAsVectorFormat(vl, shapefilename, "CP1250", None, "ESRI Shapefile")
+            error = QgsVectorFileWriter.writeAsVectorFormat(vl, shapefilename, "CP1250", vl.sourceCrs(), "ESRI Shapefile")
             if error == QgsVectorFileWriter.NoError:
                 QMessageBox.information( self.iface.mainWindow(),"Info",
                 str("File %s " %(str(unicode(vl.name())).upper())) + QCoreApplication.translate( "message","succesfully saved"))
@@ -153,7 +154,7 @@ def writeLayer(self):
         self.vlName = os.path.splitext(base)[0]
 
     def runProfileXS(self):
-        from matplotlib.backends.backend_qt4agg import NavigationToolbar2QTAgg as NavigationToolbar
+        from matplotlib.backends.backend_qt5agg import NavigationToolbar2QT as NavigationToolbar
 
         #~ take input parameters fron GUI
         rasterName = self.comboDEM.currentText()

metadata.txt

@@ -9,9 +9,9 @@
 
 
 [general]
-name=QFluvial
-qgisMinimumVersion=2.0
-description=Fluvial geomophological tool
+name=Bankfull width detection
+qgisMinimumVersion=3.0
+description=Automatic bankfull width detection
 version=0.1
 author=Pierluigi De Rosa
 [email protected]