Merge branch 'main' of https://github.com/Scriptbash/QRaven into main

Scriptbash · Aug 2, 2022 · cecfb51 · cecfb51
2 parents ae72289 + d35d9fe
commit cecfb51
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/qraven/metadata.txt b/qraven/metadata.txt
@@ -6,7 +6,7 @@
 name=QRaven
 qgisMinimumVersion=3.20
 description=A QGIS plugin to help generate input files for Raven
-version=2.1.0
+version=2.1.1
 author=Francis Lapointe
 email=francis.lapointe5@usherbrooke.ca
 

diff --git a/qraven/qraven.py b/qraven/qraven.py
@@ -1610,7 +1610,7 @@ def getRVHparams(self):
         poisource = self.dlg.combo_poisource.currentText()   #Get the source field of the point of interest
 
         if self.dlg.chk_epsgcode.isChecked():   #Get the EPSG code if the checkbox is checkedm
-            epsgcode = self.dlg.txt_epsgcode.text()
+            epsgcode = 'EPSG:'+self.dlg.txt_epsgcode.text()
         else:                                   #Otherwise use the default value of BasinMaker
             epsgcode = 'EPSG:3573'
 
@@ -1819,8 +1819,6 @@ def dockerinit(self):
 
             getDockerResults()
          '''
-        if computerOS == 'windows':
-            os.environ["PATH"] = "C:\\Program Files\\Docker\\Docker\\resources\\bin"
         pythonConsole = self.iface.mainWindow().findChild(QDockWidget, 'PythonConsole')
         if not pythonConsole or not pythonConsole.isVisible():  #If the python console is closed, open it
             self.iface.actionShowPythonDialog().trigger()       #It allows the user to see the BasinMaker progress
@@ -1997,7 +1995,7 @@ def dockerCommand(self,cmd):
         '''Executes the command it receives with subprocess.Popen
         
             param cmd: The command to run (string or tuple)
-        '''
+        ''' 
         if computerOS == 'windows':
             startupinfo = subprocess.STARTUPINFO()
             startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW
@@ -2284,6 +2282,7 @@ def checkOS():
     elif platform == "darwin":
         return "macos", "/"
     elif platform == "win32":
+        os.environ["PATH"] = "C:\\Program Files\\Docker\\Docker\\resources\\bin"    #This is needed so that the docker commands work on Windows
         return "windows", "\\"
 
 computerOS, separator = checkOS()