Merge branch 'scenarios' of https://gitlab.com/pamhyr/pamhyr2 into scenarios

src/Model/BoundaryConditionsAdisTS/BoundaryConditionAdisTS.py

@@ -70,8 +70,11 @@ class Data(SQLSubModel):
     def _db_update(cls, execute, version, data=None):
         major, minor, release = version.strip().split(".")
         created = False
-
         if major == "0" and minor == "0":
+            cls._db_create(execute)
+            created = True
+
+        if major == "0" and minor == "1":
             if int(release) < 7:
                 cls._db_create(execute)
                 created = True
@@ -250,6 +253,10 @@ class BoundaryConditionAdisTS(SQLSubModel):
         created = False
 
         if major == "0" and minor == "0":
+            cls._db_create(execute)
+            created = True
+
+        if major == "0" and minor == "1":
             if int(release) < 7:
                 cls._db_create(execute)
                 created = True

src/Model/D90AdisTS/D90AdisTS.py

@@ -73,7 +73,11 @@ class D90AdisTS(SQLSubModel):
         major, minor, release = version.strip().split(".")
         created = False
 
-        if major == "0" and int(minor) <= 1:
+        if major == "0" and minor == "0":
+            cls._db_create(execute)
+            created = True
+
+        if major == "0" and minor == "1":
             if int(release) < 6:
                 cls._db_create(execute)
                 created = True

src/Model/D90AdisTS/D90AdisTSSpec.py

@@ -72,7 +72,12 @@ class D90AdisTSSpec(SQLSubModel):
         major, minor, release = version.strip().split(".")
         created = False
 
-        if major == 0 and minor < 1:
+
+        if major == "0" and minor == "0":
+            cls._db_create(execute)
+            created = True
+
+        if major == "0" and minor == "1":
             if int(release) < 6:
                 cls._db_create(execute)
                 created = True

src/Model/DIFAdisTS/DIFAdisTS.py

@@ -79,7 +79,11 @@ class DIFAdisTS(SQLSubModel):
         major, minor, release = version.strip().split(".")
         created = False
 
-        if major == "0" and int(minor) <= 1:
+        if major == "0" and minor == "0":
+            cls._db_create(execute)
+            created = True
+
+        if major == "0" and minor == "1":
             if int(release) < 6:
                 cls._db_create(execute)
                 created = True

src/Model/DIFAdisTS/DIFAdisTSSpec.py

@@ -83,7 +83,11 @@ class DIFAdisTSSpec(SQLSubModel):
         major, minor, release = version.strip().split(".")
         created = False
 
-        if major == 0 and minor < 1:
+        if major == "0" and minor == "0":
+            cls._db_create(execute)
+            created = True
+
+        if major == "0" and minor == "1":
             if int(release) < 6:
                 cls._db_create(execute)
                 created = True

src/Model/InitialConditionsAdisTS/InitialConditionsAdisTS.py

@@ -81,7 +81,11 @@ class InitialConditionsAdisTS(SQLSubModel):
         major, minor, release = version.strip().split(".")
         created = False
 
-        if major == "0" and int(minor) <= 1:
+        if major == "0" and minor == "0":
+            cls._db_create(execute)
+            created = True
+
+        if major == "0" and minor == "1":
             if int(release) < 6:
                 cls._db_create(execute)
                 created = True

src/Model/InitialConditionsAdisTS/InitialConditionsAdisTSSpec.py

@@ -79,8 +79,12 @@ class ICAdisTSSpec(SQLSubModel):
         major, minor, release = version.strip().split(".")
         created = False
 
-        if major == 0 and minor < 1:
+        if major == "0" and minor == "0":
-            if int(release) < 6:
+            cls._db_create(execute)
+            created = True
+
+        if major == "0" and minor == "1":
+            if int(release) < 7:
                 cls._db_create(execute)
                 created = True
 

src/Model/LateralContributionsAdisTS/LateralContributionAdisTS.py

@@ -69,7 +69,11 @@ class Data(SQLSubModel):
         major, minor, release = version.strip().split(".")
         created = False
 
-        if major == "0" and int(minor) <= 1:
+        if major == "0" and minor == "0":
+            cls._db_create(execute)
+            created = True
+
+        if major == "0" and minor == "1":
             if int(release) < 7:
                 cls._db_create(execute)
                 created = True
@@ -243,7 +247,11 @@ class LateralContributionAdisTS(SQLSubModel):
         major, minor, release = version.strip().split(".")
         created = False
 
-        if major == "0" and int(minor) <= 1:
+        if major == "0" and minor == "0":
+            cls._db_create(execute)
+            created = True
+
+        if major == "0" and minor == "1":
             if int(release) < 7:
                 cls._db_create(execute)
                 created = True

src/Model/OutputRKAdists/OutputRKAdists.py

@@ -97,7 +97,11 @@ class OutputRKAdists(SQLSubModel):
         major, minor, release = version.strip().split(".")
         created = False
 
-        if major == "0" and int(minor) <= 1:
+        if major == "0" and minor == "0":
+            cls._db_create(execute)
+            created = True
+
+        if major == "0" and minor == "1":
             if int(release) < 7:
                 cls._db_create(execute)
                 created = True

src/Model/Pollutants/Pollutants.py

@@ -152,7 +152,11 @@ class PollutantCharacteristics(SQLSubModel):
         major, minor, release = version.strip().split(".")
         created = False
 
-        if major == "0" and int(minor) <= 1:
+        if major == "0" and minor == "0":
+            cls._db_create(execute)
+            created = True
+
+        if major == "0" and minor == "1":
             if int(release) < 7:
                 cls._db_create(execute)
                 created = True
@@ -344,19 +348,21 @@ class Pollutants(SQLSubModel):
 
     @data.setter
     def data(self, data):
-        self._data = [PollutantCharacteristics(type=int(data[0]),
+        self._data = [
-                                               diametre=float(data[1]),
+            PollutantCharacteristics(
-                                               rho=float(data[2]),
+                type=int(data[0]),
-                                               porosity=float(data[3]),
+                diametre=float(data[1]),
-                                               cdc_riv=float(data[4]),
+                rho=float(data[2]),
-                                               cdc_cas=float(data[5]),
+                porosity=float(data[3]),
-                                               apd=float(data[6]),
+                cdc_riv=float(data[4]),
-                                               ac=float(data[7]),
+                cdc_cas=float(data[5]),
-                                               bc=float(data[8]),
+                apd=float(data[6]),
-                                               pollutant=self,
+                ac=float(data[7]),
-                                               status=self._status
+                bc=float(data[8]),
-                                               )
+                pollutant=self,
-                      ]
+                status=self._status
+            )
+        ]
 
     @classmethod
     def _db_create(cls, execute, ext=""):
@@ -380,7 +386,11 @@ class Pollutants(SQLSubModel):
         major, minor, release = version.strip().split(".")
         created = False
 
-        if major == "0" and int(minor) <= 1:
+        if major == "0" and minor == "0":
+            cls._db_create(execute)
+            created = True
+
+        if major == "0" and minor == "1":
             if int(release) < 7:
                 cls._db_create(execute)
                 created = True

src/View/RunSolver/Log/Window.py

@@ -20,7 +20,7 @@ import tempfile
 import os
 
 from queue import Queue
-from tools import trace, timer
+from tools import trace, timer, logger_exception
 
 from View.Tools.PamhyrWindow import PamhyrDialog, PamhyrWindow
 
@@ -81,25 +81,31 @@ class SolverLogFileWindow(PamhyrWindow):
             self.open_on_editor)
 
     def setup_text(self):
-        with open(self._file_name, "r") as f:
+        try:
-            for line in f:
+            with open(self._file_name, "r") as f:
-                line = line.rstrip()
+                for line in f:
-                self.find(QTextEdit, "textEdit").append(line)
+                    line = line.rstrip()
+                    self.find(QTextEdit, "textEdit").append(line)
+        except Exception as e:
+            logger_exception(e)
 
     def revert(self):
         self.find(QTextEdit, "textEdit").clear()
         self.setup_text()
 
     def open_on_editor(self):
-        p = QProcess(self)
+        try:
+            p = QProcess(self)
 
-        cmd = self._config.editor
+            cmd = self._config.editor
-        cmd = cmd.replace("@file", self._file_name)
+            cmd = cmd.replace("@file", self._file_name)
 
-        cmd = cmd.split()
+            cmd = cmd.split()
-        exe = cmd[0]
+            exe = cmd[0]
-        args = cmd[1:]
+            args = cmd[1:]
 
-        p.start(
+            p.start(
-            exe, args,
+                exe, args,
-        )
+            )
+        except Exception as e:
+            logger_exception(e)