From d34a1611b358dd2b65c06126c25c663f49d78376 Mon Sep 17 00:00:00 2001 From: Jean-Philippe ARGAUD Date: Wed, 12 Jun 2024 08:41:41 +0200 Subject: [PATCH] Minor update for saving compatibility --- src/daComposant/daCore/Aidsm.py | 3 ++- src/daComposant/daCore/Interfaces.py | 8 ++++---- src/daComposant/daCore/PlatformInfo.py | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/daComposant/daCore/Aidsm.py b/src/daComposant/daCore/Aidsm.py index 0fa4cb6..91dd086 100644 --- a/src/daComposant/daCore/Aidsm.py +++ b/src/daComposant/daCore/Aidsm.py @@ -156,7 +156,8 @@ class Aidsm(object): elif Concept == "NoDebug": self.setNoDebug() elif Concept == "Observer": - self.setObserver( Variable, Template, String, Script, Info, + self.setObserver( + Variable, Template, String, Script, Info, ObjectFunction, CrossObs, SyncObs, Scheduler ) elif Concept == "UserPostAnalysis": self.setUserPostAnalysis( Template, String, Script ) diff --git a/src/daComposant/daCore/Interfaces.py b/src/daComposant/daCore/Interfaces.py index 786683a..eb7ed9c 100644 --- a/src/daComposant/daCore/Interfaces.py +++ b/src/daComposant/daCore/Interfaces.py @@ -162,10 +162,10 @@ class _TUIViewer(GenericCaseViewer): if k not in __local: continue # noqa: E701 __v = __local[k] if __v is None: continue # noqa: E701 - if k == "SyncObs" and not __v: continue # noqa: E241,E271,E272,E701 if k == "Checked" and not __v: continue # noqa: E241,E271,E272,E701 if k == "ColMajor" and not __v: continue # noqa: E241,E271,E272,E701 if k == "CrossObs" and not __v: continue # noqa: E241,E271,E272,E701 + if k == "SyncObs" and __v: continue # noqa: E241,E271,E272,E701 if k == "InputFunctionAsMulti" and not __v: continue # noqa: E241,E271,E272,E701 if k == "PerformanceProfile" and __v: continue # noqa: E241,E271,E272,E701 if k == "Stored" and not __v: continue # noqa: E241,E271,E272,E701 @@ -557,10 +557,10 @@ class _SCDViewer(GenericCaseViewer): __text += "%s_config['Data'] = %s\n"%(__command, __v) __text = __text.replace("''", "'") __vectorIsScript = True - elif __k in ('Stored', 'Checked', 'ColMajor', 'CrossObs', 'SyncObs', 'InputFunctionAsMulti', 'nextStep'): + elif __k in ('Stored', 'Checked', 'ColMajor', 'CrossObs', 'InputFunctionAsMulti', 'nextStep'): if bool(__v): __text += "%s_config['%s'] = '%s'\n"%(__command, __k, int(bool(__v))) - elif __k in ('PerformanceProfile', 'noDetails'): + elif __k in ('PerformanceProfile', 'SyncObs', 'noDetails'): if not bool(__v): __text += "%s_config['%s'] = '%s'\n"%(__command, __k, int(bool(__v))) else: @@ -725,10 +725,10 @@ class _ReportViewer(GenericCaseViewer): if k not in __local: continue # noqa: E701 __v = __local[k] if __v is None: continue # noqa: E701 - if k == "SyncObs" and not __v: continue # noqa: E241,E271,E272,E701 if k == "Checked" and not __v: continue # noqa: E241,E271,E272,E701 if k == "ColMajor" and not __v: continue # noqa: E241,E271,E272,E701 if k == "CrossObs" and not __v: continue # noqa: E241,E271,E272,E701 + if k == "SyncObs" and __v: continue # noqa: E241,E271,E272,E701 if k == "InputFunctionAsMulti" and not __v: continue # noqa: E241,E271,E272,E701 if k == "PerformanceProfile" and __v: continue # noqa: E241,E271,E272,E701 if k == "Stored" and not __v: continue # noqa: E241,E271,E272,E701 diff --git a/src/daComposant/daCore/PlatformInfo.py b/src/daComposant/daCore/PlatformInfo.py index 147d613..84d961e 100644 --- a/src/daComposant/daCore/PlatformInfo.py +++ b/src/daComposant/daCore/PlatformInfo.py @@ -158,7 +158,7 @@ class PlatformInfo(object): "platform.mac_ver", str(platform.mac_ver()[0] + "(" + __macosxv10[key] + ")")) # noqa: E128 __macosxv11 = { '11': 'Big Sur', '12': 'Monterey', '13': 'Ventura', # noqa: E241 - '14': 'Sonoma', + '14': 'Sonoma', '15': 'Sequoia', # noqa: E241 } for key in __macosxv11: __details = platform.mac_ver()[0].split('.') -- 2.39.2