Maintenance on viewers

[modules/adao.git] / src / daComposant / daCore / BasicObjects.py

diff --git a/src/daComposant/daCore/BasicObjects.py b/src/daComposant/daCore/BasicObjects.py
index 41c5f106306e49da36699f7c9c7ea240fea51e15..6fcdcf37c18fcca9965fe9af9bdaa5b18483002f 100644 (file)
--- a/src/daComposant/daCore/BasicObjects.py
+++ b/src/daComposant/daCore/BasicObjects.py
@@ -1095,6 +1095,45 @@ class AlgorithmAndParameters(object):
         #
         return 1
 
+# ==============================================================================
+class RegulationAndParameters(object):
+    """
+    Classe générale d'interface d'action pour la régulation et ses paramètres
+    """
+    def __init__(self,
+                 name               = "GenericRegulation",
+                 asAlgorithm        = None,
+                 asDict             = None,
+                 asScript           = None,
+                ):
+        """
+        """
+        self.__name       = str(name)
+        self.__P          = {}
+        #
+        if asAlgorithm is None and asScript is not None:
+            __Algo = ImportFromScript(asScript).getvalue( "Algorithm" )
+        else:
+            __Algo = asAlgorithm
+        #
+        if asDict is None and asScript is not None:
+            __Dict = ImportFromScript(asScript).getvalue( self.__name, "Parameters" )
+        else:
+            __Dict = asDict
+        #
+        if __Dict is not None:
+            self.__P.update( dict(__Dict) )
+        #
+        if __Algo is not None:
+            self.__P.update( {"Algorithm":self.__A} )
+
+    def get(self, key = None):
+        "Vérifie l'existence d'une clé de variable ou de paramètres"
+        if key in self.__P:
+            return self.__P[key]
+        else:
+            return self.__P
+
 # ==============================================================================
 class DataObserver(object):
     """
@@ -1595,15 +1634,13 @@ class CaseLogger(object):
         self.__logSerie = []
         self.__switchoff = False
         self.__viewers = {
-            "TUI":Interfaces._TUIViewer,
-            "DCT":Interfaces._DCTViewer,
-            "SCD":Interfaces._SCDViewer,
+            "TUI" :Interfaces._TUIViewer,
+            "SCD" :Interfaces._SCDViewer,
             "YACS":Interfaces._YACSViewer,
             }
         self.__loaders = {
-            "TUI":Interfaces._TUIViewer,
-            "EPD":Interfaces._EPDViewer,
-            "DCT":Interfaces._DCTViewer,
+            "TUI" :Interfaces._TUIViewer,
+            "COM" :Interfaces._COMViewer,
             }
         if __addViewers is not None:
             self.__viewers.update(dict(__addViewers))