From 7f2ff9d341535cfad71d817928eebe7395c15239 Mon Sep 17 00:00:00 2001 From: Youcef AOUAD <youcef.aouad@inrae.fr> Date: Mon, 15 Jul 2024 10:06:03 +0200 Subject: [PATCH] time display ald fixed --- .../LateralContributionAdisTS.py | 2 +- .../LateralContributionsAdisTS/Edit/Table.py | 5 +++-- tests_cases/Enlargement/Enlargement.pamhyr | Bin 237568 -> 237568 bytes 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Model/LateralContributionsAdisTS/LateralContributionAdisTS.py b/src/Model/LateralContributionsAdisTS/LateralContributionAdisTS.py index ce027028..f3fbed46 100644 --- a/src/Model/LateralContributionsAdisTS/LateralContributionAdisTS.py +++ b/src/Model/LateralContributionsAdisTS/LateralContributionAdisTS.py @@ -50,7 +50,7 @@ class LateralContributionAdisTS(SQLSubModel): self._end_kp = 0.0 self._data = [] self._header = ["time", "rate"] - self._types = [float, float] + self._types = [self.time_convert, float] LateralContributionAdisTS._id_cnt = max( LateralContributionAdisTS._id_cnt + 1, self.id) diff --git a/src/View/LateralContributionsAdisTS/Edit/Table.py b/src/View/LateralContributionsAdisTS/Edit/Table.py index 303343e7..4d08e547 100644 --- a/src/View/LateralContributionsAdisTS/Edit/Table.py +++ b/src/View/LateralContributionsAdisTS/Edit/Table.py @@ -23,7 +23,8 @@ from datetime import date, time, datetime, timedelta from tools import ( trace, timer, timestamp_to_old_pamhyr_date, - old_pamhyr_date_to_timestamp + old_pamhyr_date_to_timestamp, + timestamp_to_old_pamhyr_date_adists ) from View.Tools.PamhyrTable import PamhyrTableModel @@ -69,7 +70,7 @@ class TableModel(PamhyrTableModel): value = f"{v:.4f}" elif self._data.header[column] == "time": if self._opt_data == "time": - value = timestamp_to_old_pamhyr_date(int(v)) + value = timestamp_to_old_pamhyr_date_adists(int(v)) else: value = str(datetime.fromtimestamp(v)) else: diff --git a/tests_cases/Enlargement/Enlargement.pamhyr b/tests_cases/Enlargement/Enlargement.pamhyr index c2c49f7d14fad138c40a9adf02ba7aaf61914a5a..7f3cb02f613fcefd0e3196d8737ef06de486bbce 100644 GIT binary patch delta 131 zcmZoTz}IkqZ$pbbpOK+~v4NR|v7V{9g@I-BB>DD9@{HRj$upH0@NH+{|H}W0|33c} z{$u>xHwzjp=C|TyV`UH*=CCw1F)%gIGvHxmWe^qSFg7y-@i<vn8Tf@c3_wg~1d|EO Uoc__CNwl3UfoVHi0`o6>0O774GXMYp delta 142 zcmZoTz}IkqZ$pbbpP{9xnTe@^sh)wMxv@#}B>DD9@{HRj$upH0@NHt?|IGi4|0e$# z{{8%$HVYce<M-lbV`UH)<}lDR03vQyFvnQW7{p;gmSINbFd=gop`7+V@l4zQ#51!v F008j39`gVI -- GitLab