]> SALOME platform Git repositories - modules/adao.git/commitdiff
Salome HOME
Minor update for saving compatibility V9_13_0a1 V9_13_0a2
authorJean-Philippe ARGAUD <jean-philippe.argaud@edf.fr>
Wed, 12 Jun 2024 06:41:41 +0000 (08:41 +0200)
committerJean-Philippe ARGAUD <jean-philippe.argaud@edf.fr>
Wed, 12 Jun 2024 06:41:41 +0000 (08:41 +0200)
src/daComposant/daCore/Aidsm.py
src/daComposant/daCore/Interfaces.py
src/daComposant/daCore/PlatformInfo.py

index 0fa4cb6ec6c1845e2e9235b386fc71b0d404eb59..91dd08669b8d4410fe269accfb52f3c42a332626 100644 (file)
@@ -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 )
index 786683ab0925387348af885a6fe7a766440a4a96..eb7ed9c6bcad109350214137956fae318ec98da1 100644 (file)
@@ -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
index 147d61352ac6938a8d0550e131a04726bbb2de3e..84d961ebe6aea1988048e8904ae423be73828e06 100644 (file)
@@ -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('.')