X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=VirtualPolymer%2FlistesDB.py;h=957060e5667f9cf107ed64fce3a3d4337423bcad;hb=51bd9f221ff8bbca6f74ab313196b20c6e3b7645;hp=fbef9b46e4359be3468cee5ba1ae62bb776813e3;hpb=978752c11f001a9944bff427f6feebcc0a806b6a;p=tools%2Feficas.git

diff --git a/VirtualPolymer/listesDB.py b/VirtualPolymer/listesDB.py
index fbef9b46..957060e5 100644
--- a/VirtualPolymer/listesDB.py
+++ b/VirtualPolymer/listesDB.py
@@ -10,53 +10,70 @@ import pckdb, class_data, instruction, equation_part, utils
 class sModele :
 # --------------------------------------
 
-   _instance = None
+    _instance = None
 
-   def __new__(cls, *args, **kwargs):
+    def __new__(cls, *args, **kwargs):
         if not cls._instance:
             cls._instance = super(sModele, cls).__new__(
                                 cls, *args, **kwargs)
 
         return cls._instance
 
-   def __init__ (self):
-       self.monModele=class_data.Modele()
+    def __init__ (self):
+        self.monModele=class_data.Modele()
+        self.monPost=class_data.Post_traitement()
 
 
 # --------------------------------------
 class classeListesDB :
 # --------------------------------------
 
-   _instance = None
+    _instance = None
 
-   def __new__(cls, *args, **kwargs):
+    def __new__(cls, *args, **kwargs):
         if not cls._instance:
             cls._instance = super(listesDB, cls).__new__(
                                 cls, *args, **kwargs)
 
         return cls._instance
 
-   def __init__ (self):
-      self.listEquation       = None
-      self.listModele         = None
-      self.listPostTraitement = None
-      self.dicoListAffiche   = {}
-      self.valeurEquationChoisie = None
-
-   def metAJour(self,valeur):
-      if valeur == None : return
-      correspond=pckdb.DBRENAME
-      self.listEquation, self.listModele,self.listPostTraitement=pckdb.read_pckdb(correspond[valeur])
-
-   def getListEquation(self):
-      return self.listEquation
-    
-   def getListModele(self):
-      return self.listModele
-
-   def getListPostTraitement(self):
-      return self.listPostTraitement
-    
-   def getdicoListAffiche(self):
-      return self.dicoListAffiche
+    def __init__ (self):
+        self.listEquation       = None
+        self.listModele         = None
+        self.listPostTraitement = None
+        self.dicoListAffiche   = {}
+        self.valeurEquationChoisie = None
+        self.listeConstantesAAfficher = []
+        self.listeEquationsAAfficher = []
+        self.listeCoefD  = []
+        self.listeCoefB  = []
+        self.dictParametresInitiaux = {}
+        self.listeParametresInitiaux= []
+        self.listeCoefInitiaux= []
+        self.listeCoefASupprimer= []
+        self.dicoCoefAffichageArr   = {}
+        self.dicoModeleFiltre = {}
+        self.dicoMateriauxFiltre = {}
+        self.monModele = None
+        self.listeDiffusion = []
 
+    def metAJour(self,valeur):
+        print ('metAJour')
+        if valeur == None : return
+        correspond=pckdb.DBRENAME
+        self.listEquation, self.listModele,self.listPostTraitement=pckdb.read_pckdb(correspond[valeur])
+        self.dicoListeEquation   = {}
+        for equation in self.listEquation :
+            self.dicoListeEquation[equation.representation]=equation
+
+    def getListEquation(self):
+        return self.listEquation
+
+    def getListModele(self):
+        return self.listModele
+
+    def getListPostTraitement(self):
+        return self.listPostTraitement
+
+    def getdicoListAffiche(self):
+        return self.dicoListAffiche