Merge pull request #15 from deamorim2/master

Update to version 3.2
pghydro · Apr 2, 2021 · 8a150bc · 8a150bc
2 parents 394c897 + b93f03f
commit 8a150bc
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -8,11 +8,11 @@ To use this plugin, you have to install the PgHydro 6.4 extension for PostgreSQL
 
 ## Branches
 
-The master branch has the latest minor release. (3.0)
+The master branch has the latest minor release. (3.2)
 
 The develop branch has the next minor release. (development)
 
-Next LTR: version 3.2 (March 2022)
+Next LTR: version 3.4 (March 2022)
 
 Legacy Code QGIS 2.18 Branch (legacy_code_qgis_2.18)
 

diff --git a/metadata.txt b/metadata.txt
@@ -10,7 +10,7 @@
 name=Pghydro Tools
 qgisMinimumVersion=3.0
 description=PgHydro Tools Interface for PgHydro Extension for PostgreSQL/PostGIS
-version=3.0
+version=3.2
 author=PgHydro Team
 email=pghydro.project@gmail.com
 
@@ -43,6 +43,7 @@ changelog=
         - Execution of Vacuum, Analyse and Reindex after each major processing
         - ...
 	3.0 - Updated to QGIS 3
+	3.2 - Fix bug in watercourse offset
 
 # Tags are comma separated with spaces allowed
 tags=spatial database system, otto pfafstetter, drainage, hydrology, hydrography, hydro

diff --git a/pghydro_tools.py b/pghydro_tools.py
@@ -1640,7 +1640,7 @@ def Principal_Procedure(self):
 
         DrainageLineOffset = self.dlg.lineEdit_DrainageLineOffset.text()
 
-        WaterCourseOffset = (int(DrainageLineOffset)/2)+1
+        WaterCourseOffset = str(int(int(DrainageLineOffset)/2)+1)
 
         self.Turn_OFF_Audit()
 
@@ -1779,7 +1779,7 @@ def Principal_Procedure(self):
             self.print_console_message('Updating Water Course. Please, wait...\n')
 
             sql = """
-            SELECT pghydro.pghfn_UpdateWatercourse("""+str(WaterCourseOffset)+""");
+            SELECT pghydro.pghfn_UpdateWatercourse("""+WaterCourseOffset+""");
             """
 
             self.execute_sql(sql)
@@ -2529,4 +2529,4 @@ def run(self):
         result = self.dlg.exec_()
 
     def closeEvent(self, event):
-        event.accept()
+        event.accept()
diff --git a/pghydro_tools_dialog_base.ui b/pghydro_tools_dialog_base.ui
@@ -3017,7 +3017,7 @@
       </font>
      </property>
      <property name="text">
-      <string>PgHydro Tools Version 3.0</string>
+      <string>PgHydro Tools Version 3.2</string>
      </property>
     </widget>
     <widget class="QLabel" name="label_12">