diff --git a/src/Checker/Adists.py b/src/Checker/Adists.py index 36dce3490fedc914a809ac2c6b5bb93ad0f3c940..5c747203350c238aaf8c2585e7016c00f17de648 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 bc02b6c68ebb7005ad06a6d0f07ff8b91d318e82..40e903f60822d047d9af9726402274880d829344 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 5a7bbd755d514a6d628c3828d95883296bf13d95..85fd8f8ba5e8cdd9a4a7cdc440524efb61bceb61 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 fc10d141af3b003ee0f1d6ea8d4ba5ff4d3a8f4e..79c52682ed3cfcb5f8e37942f78288125e85eb86 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 cbe225ff6de81100711205a181c0416470411fbf..6c0de7c262e6aa57adc9d27b747b11ff754094e4 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 0a2618077615555a6c6e0a6030773de82c066700..4753926bcbdea2c8440f24a0b4266fb6f280e497 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 5d7a4d9baa5a5989e1c8ddf116c1e0a60745fafb..f23b4fbcf217226d40877fdcebdc3917fe6c74d7 100644 --- a/src/View/ui/MainWindow.ui +++ b/src/View/ui/MainWindow.ui @@ -746,7 +746,7 @@ </action> <action name="action_menu_output_kp"> <property name="text"> - <string>Output KP</string> + <string>Output RK</string> </property> </action> <action name="action_menu_run_adists"> diff --git a/src/View/ui/OutputKpAdisTS.ui b/src/View/ui/OutputKpAdisTS.ui index 8c516d868c832e585329602c595297a3698d4083..cb84fb2af52767366cedc33cdc94f2ba30493a7f 100644 --- a/src/View/ui/OutputKpAdisTS.ui +++ b/src/View/ui/OutputKpAdisTS.ui @@ -46,7 +46,7 @@ <item> <widget class="QCheckBox" name="checkBox"> <property name="text"> - <string>Enable / Disable Output KP AdisTS</string> + <string>Enable / Disable Output RK AdisTS</string> </property> <property name="checked"> <bool>true</bool> diff --git a/tests_cases/Enlargement/Enlargement.pamhyr b/tests_cases/Enlargement/Enlargement.pamhyr index 7f3cb02f613fcefd0e3196d8737ef06de486bbce..92b931d2b11fa20988bcd7a1af3b8906e2293812 100644 Binary files a/tests_cases/Enlargement/Enlargement.pamhyr and b/tests_cases/Enlargement/Enlargement.pamhyr differ