diff --git a/src/Model/BoundaryConditionsAdisTS/BoundaryConditionAdisTS.py b/src/Model/BoundaryConditionsAdisTS/BoundaryConditionAdisTS.py index b38c8ae2..363bd685 100644 --- a/src/Model/BoundaryConditionsAdisTS/BoundaryConditionAdisTS.py +++ b/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 diff --git a/src/Model/D90AdisTS/D90AdisTS.py b/src/Model/D90AdisTS/D90AdisTS.py index 442fbca9..4a3ae645 100644 --- a/src/Model/D90AdisTS/D90AdisTS.py +++ b/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 diff --git a/src/Model/D90AdisTS/D90AdisTSSpec.py b/src/Model/D90AdisTS/D90AdisTSSpec.py index 5af1c4bb..5a47b02d 100644 --- a/src/Model/D90AdisTS/D90AdisTSSpec.py +++ b/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 diff --git a/src/Model/DIFAdisTS/DIFAdisTS.py b/src/Model/DIFAdisTS/DIFAdisTS.py index 113bbc70..bdbaf36c 100644 --- a/src/Model/DIFAdisTS/DIFAdisTS.py +++ b/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 diff --git a/src/Model/DIFAdisTS/DIFAdisTSSpec.py b/src/Model/DIFAdisTS/DIFAdisTSSpec.py index 85e8f6c0..8dd897fc 100644 --- a/src/Model/DIFAdisTS/DIFAdisTSSpec.py +++ b/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 diff --git a/src/Model/InitialConditionsAdisTS/InitialConditionsAdisTS.py b/src/Model/InitialConditionsAdisTS/InitialConditionsAdisTS.py index 98b63fd5..e7ea2646 100644 --- a/src/Model/InitialConditionsAdisTS/InitialConditionsAdisTS.py +++ b/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 diff --git a/src/Model/InitialConditionsAdisTS/InitialConditionsAdisTSSpec.py b/src/Model/InitialConditionsAdisTS/InitialConditionsAdisTSSpec.py index e79c505a..7feb2f59 100644 --- a/src/Model/InitialConditionsAdisTS/InitialConditionsAdisTSSpec.py +++ b/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 int(release) < 6: + 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 diff --git a/src/Model/LateralContributionsAdisTS/LateralContributionAdisTS.py b/src/Model/LateralContributionsAdisTS/LateralContributionAdisTS.py index b2b903cf..a1d64a76 100644 --- a/src/Model/LateralContributionsAdisTS/LateralContributionAdisTS.py +++ b/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 diff --git a/src/Model/OutputRKAdists/OutputRKAdists.py b/src/Model/OutputRKAdists/OutputRKAdists.py index 2818d601..8a24c468 100644 --- a/src/Model/OutputRKAdists/OutputRKAdists.py +++ b/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 diff --git a/src/Model/Pollutants/Pollutants.py b/src/Model/Pollutants/Pollutants.py index adb85a1d..080a4dfc 100644 --- a/src/Model/Pollutants/Pollutants.py +++ b/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]), - diametre=float(data[1]), - rho=float(data[2]), - porosity=float(data[3]), - cdc_riv=float(data[4]), - cdc_cas=float(data[5]), - apd=float(data[6]), - ac=float(data[7]), - bc=float(data[8]), - pollutant=self, - status=self._status - ) - ] + self._data = [ + PollutantCharacteristics( + type=int(data[0]), + diametre=float(data[1]), + rho=float(data[2]), + porosity=float(data[3]), + cdc_riv=float(data[4]), + cdc_cas=float(data[5]), + apd=float(data[6]), + ac=float(data[7]), + 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 diff --git a/src/View/RunSolver/Log/Window.py b/src/View/RunSolver/Log/Window.py index 3bd0df70..217275a7 100644 --- a/src/View/RunSolver/Log/Window.py +++ b/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: - for line in f: - line = line.rstrip() - self.find(QTextEdit, "textEdit").append(line) + try: + with open(self._file_name, "r") as f: + for line in f: + 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 = cmd.replace("@file", self._file_name) + cmd = self._config.editor + cmd = cmd.replace("@file", self._file_name) - cmd = cmd.split() - exe = cmd[0] - args = cmd[1:] + cmd = cmd.split() + exe = cmd[0] + args = cmd[1:] - p.start( - exe, args, - ) + p.start( + exe, args, + ) + except Exception as e: + logger_exception(e)