diff --git a/src/Model/LateralContributionsAdisTS/LateralContributionAdisTS.py b/src/Model/LateralContributionsAdisTS/LateralContributionAdisTS.py index ce027028658db1b36cdc42f9d431ac6f22abe9bd..f3fbed46d07deef79e2b9cbc4837a69986d1e4ee 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 303343e752ee3cecdf9ef159e05403e1a349bde7..4d08e5472f07421f55519b67bff911c851fa4753 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 Binary files a/tests_cases/Enlargement/Enlargement.pamhyr and b/tests_cases/Enlargement/Enlargement.pamhyr differ