From 334633f0fbc161eb517df8f97029c6d21dba542b Mon Sep 17 00:00:00 2001 From: Theophile Terraz <theophile.terraz@inrae.fr> Date: Tue, 24 Sep 2024 16:28:23 +0200 Subject: [PATCH] replace kp with rk --- src/Checker/Adists.py | 2 +- src/Modules.py | 4 ++-- src/View/D90AdisTS/translate.py | 6 +++--- src/View/DIFAdisTS/translate.py | 6 +++--- src/View/InitialConditionsAdisTS/translate.py | 6 +++--- src/View/OutputKpAdisTS/Translate.py | 2 +- src/View/ui/MainWindow.ui | 2 +- src/View/ui/OutputKpAdisTS.ui | 2 +- tests_cases/Enlargement/Enlargement.pamhyr | Bin 237568 -> 237568 bytes 9 files changed, 15 insertions(+), 15 deletions(-) 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 @@ </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 8c516d86..cb84fb2a 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 GIT binary patch delta 281 zcmZoTz}IkqZ-TTS8v_G_6%fOK_Cy_HRyGDb`<ok67VwL3@ESAld-1FD8uK6G-^M?g zKc7ElW1}?hW@A}yCPRLhE+8$y$Sf^cmReMtnV)B%XP{?jD9FLA&R<+ono=2Gl$w*8 zSe$AwIbS}DQEOtOnm89w3kQD>1OG<;!~A#n=kdSc@8LhgKmB3@v&zN^f&4;(%<7CN znmIPl)7Rg^RFplr@woz!+WhfxA2WhG`Qu}m&HJC{v4Dg?Z0|SRTu?S=erZWTX-Pap eW^%wcw$1au9p-?_HaGllZ}`u+z2QGo!vX+l%w25& delta 209 zcmZoTz}IkqZ-TTS3j+g#6%fOK@<bhDRu%@maIcLi3;2cDd5szP-}9^U8uK6G-^M?g zKYwGREbnGxS#BmqlZlN6lk?@X7$qk<imLH5GE0k>r4|)u=I0sc8R%JZ0gYtmpU1$z zk^eCN9sYUzZ}`vfPrul}tg>0bAeDdfJbnEw)8F(m`D~ValEw^TIc(nlJdb5MV;hs) zX74xLT+<hIGRd*!mzETimP}vR$s|8H;2Znq1>X*FfYmfN{BLjg&$zweKU2d30GHxJ AG5`Po -- GitLab