diff --git a/src/Checker/Adists.py b/src/Checker/Adists.py index 36dce349..5c747203 100644 --- a/src/Checker/Adists.py +++ b/src/Checker/Adists.py @@ -37,7 +37,7 @@ class AdistsOutputKpChecker(AbstractModelChecker): self._description = _translate( "Checker", "Check output Kp" ) - self._modules = Modules.OUTPUT_KP + self._modules = Modules.OUTPUT_RK def run(self, study): ok = True diff --git a/src/Modules.py b/src/Modules.py index bc02b6c6..40e903f6 100644 --- a/src/Modules.py +++ b/src/Modules.py @@ -54,7 +54,7 @@ class Modules(IterableFlag): RESERVOIR = auto() SEDIMENT_LAYER = auto() ADDITIONAL_FILES = auto() - OUTPUT_KP = auto() + OUTPUT_RK = auto() # Results RESULTS = auto() @@ -78,7 +78,7 @@ class Modules(IterableFlag): cls.ADDITIONAL_FILES, cls.RESULTS, cls.WINDOW_LIST, - cls.OUTPUT_KP, + cls.OUTPUT_RK, ] @classmethod diff --git a/src/View/D90AdisTS/translate.py b/src/View/D90AdisTS/translate.py index 5a7bbd75..85fd8f8b 100644 --- a/src/View/D90AdisTS/translate.py +++ b/src/View/D90AdisTS/translate.py @@ -30,7 +30,7 @@ class D90AdisTSTranslate(MainTranslate): self._dict["D90 AdisTS"] = _translate( "D90AdisTS", "D90 AdisTS") - self._dict["kp"] = self._dict["unit_kp"] + self._dict["kp"] = self._dict["unit_rk"] self._sub_dict["table_headers"] = { "name": self._dict["name"], @@ -40,7 +40,7 @@ class D90AdisTSTranslate(MainTranslate): self._sub_dict["table_headers_spec"] = { "name": self._dict["name"], "reach": self._dict["reach"], - "start_kp": _translate("Unit", "Start_KP (m)"), - "end_kp": _translate("Unit", "End_KP (m)"), + "start_kp": _translate("Unit", "Start_RK (m)"), + "end_kp": _translate("Unit", "End_RK (m)"), "d90": _translate("Unit", "D90"), } diff --git a/src/View/DIFAdisTS/translate.py b/src/View/DIFAdisTS/translate.py index fc10d141..79c52682 100644 --- a/src/View/DIFAdisTS/translate.py +++ b/src/View/DIFAdisTS/translate.py @@ -30,7 +30,7 @@ class DIFAdisTSTranslate(MainTranslate): self._dict["DIF AdisTS"] = _translate( "DIFAdisTS", "DIF AdisTS") - self._dict["kp"] = self._dict["unit_kp"] + self._dict["kp"] = self._dict["unit_rk"] self._sub_dict["table_headers"] = { "method": self._dict["method"], @@ -42,8 +42,8 @@ class DIFAdisTSTranslate(MainTranslate): self._sub_dict["table_headers_spec"] = { "method": self._dict["method"], "reach": self._dict["reach"], - "start_kp": _translate("Unit", "Start_KP (m)"), - "end_kp": _translate("Unit", "End_KP (m)"), + "start_kp": _translate("Unit", "Start_RK (m)"), + "end_kp": _translate("Unit", "End_RK (m)"), "dif": _translate("Unit", "DIF"), "b": _translate("Unit", "Coeff b"), "c": _translate("Unit", "Coeff c"), diff --git a/src/View/InitialConditionsAdisTS/translate.py b/src/View/InitialConditionsAdisTS/translate.py index cbe225ff..6c0de7c2 100644 --- a/src/View/InitialConditionsAdisTS/translate.py +++ b/src/View/InitialConditionsAdisTS/translate.py @@ -30,7 +30,7 @@ class IcAdisTSTranslate(MainTranslate): self._dict["Initial condition AdisTS"] = _translate( "InitialConditionAdisTS", "Initial condition AdisTS") - self._dict["kp"] = self._dict["unit_kp"] + self._dict["kp"] = self._dict["unit_rk"] self._sub_dict["table_headers"] = { "name": self._dict["name"], @@ -43,8 +43,8 @@ class IcAdisTSTranslate(MainTranslate): self._sub_dict["table_headers_spec"] = { "name": self._dict["name"], "reach": self._dict["reach"], - "start_kp": _translate("Unit", "Start_KP (m)"), - "end_kp": _translate("Unit", "End_KP (m)"), + "start_kp": _translate("Unit", "Start_RK (m)"), + "end_kp": _translate("Unit", "End_RK (m)"), "concentration": self._dict["unit_concentration"], "eg": _translate("Unit", "EG (m)"), "em": _translate("Unit", "EM (m)"), diff --git a/src/View/OutputKpAdisTS/Translate.py b/src/View/OutputKpAdisTS/Translate.py index 0a261807..4753926b 100644 --- a/src/View/OutputKpAdisTS/Translate.py +++ b/src/View/OutputKpAdisTS/Translate.py @@ -36,5 +36,5 @@ class OutputKpAdisTSTranslate(MainTranslate): self._sub_dict["table_headers"] = { "title": self._dict["title"], "reach": self._dict["reach"], - "kp": self._dict["unit_kp"], + "kp": self._dict["unit_rk"], } diff --git a/src/View/ui/MainWindow.ui b/src/View/ui/MainWindow.ui index 5d7a4d9b..f23b4fbc 100644 --- a/src/View/ui/MainWindow.ui +++ b/src/View/ui/MainWindow.ui @@ -746,7 +746,7 @@ - Output KP + Output RK diff --git a/src/View/ui/OutputKpAdisTS.ui b/src/View/ui/OutputKpAdisTS.ui index 8c516d86..cb84fb2a 100644 --- a/src/View/ui/OutputKpAdisTS.ui +++ b/src/View/ui/OutputKpAdisTS.ui @@ -46,7 +46,7 @@ - Enable / Disable Output KP AdisTS + Enable / Disable Output RK AdisTS true diff --git a/tests_cases/Enlargement/Enlargement.pamhyr b/tests_cases/Enlargement/Enlargement.pamhyr index 7f3cb02f..92b931d2 100644 Binary files a/tests_cases/Enlargement/Enlargement.pamhyr and b/tests_cases/Enlargement/Enlargement.pamhyr differ