X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=PSEN_Eficas%2FopsPSEN.py;h=09c331f4c67e4efb5fc911c76c44bad2000f2cbf;hb=3d4bf5ca25be90014dc77e5cdbcf3593097c9b6e;hp=894cb715ab5d1cadfdbce2210157f3ec9f33545d;hpb=d58ab8e3a458ae7a121d555c8f4daa235a590aa2;p=tools%2Feficas.git

diff --git a/PSEN_Eficas/opsPSEN.py b/PSEN_Eficas/opsPSEN.py
index 894cb715..09c331f4 100755
--- a/PSEN_Eficas/opsPSEN.py
+++ b/PSEN_Eficas/opsPSEN.py
@@ -18,29 +18,34 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-import re
-#from ExtractGeneratorandLoadList import ExtractGeneratorandLoadList
-from ExtractGeneratorandLoadList import ExtractGeneratorandLoadList2
+#from ExtractGeneratorLoadLineandTransfoDico import ExtractGeneratorLoadLineandTransfoDico
+from ExtractGeneratorLoadLineandTransfoDico import ExtractGeneratorLoadLineandTransfoDico2
 
-def INCLUDE(self,chemin_psse,fichier_sav,**args):
+def INCLUDE(self,PSSE_path,sav_file,**args):
    """ 
        Fonction sd_prod pour la macro INCLUDE
    """
    
-   print "INCLUDE", self
+   if sav_file==None: return
    reevalue=0
+   listeADeTruire=[]
+   listeNouveau=[]
+   toClean=False
    if hasattr(self,'fichier_ini'):
        reevalue=1
-       if self.fichier_ini == fichier_sav : return
+       if self.fichier_ini == sav_file : return
+       self.fichier_ini=sav_file
        if hasattr(self,'old_context_fichier_init' ):
+         toClean=True
          for concept in self.old_context_fichier_init.values():
-             self.jdc.delete_concept(concept)
+             #self.jdc.delete_concept(concept)
+             listeADeTruire.append(concept)
          self.jdc_aux=None
          self.contexte_fichier_init={}
-         self.reevalue_sd_jdc()
+         #self.reevalue_sd_jdc()
          self.jdc.reset_context()
 
-   self.fichier_ini=fichier_sav
+   self.fichier_ini=sav_file
    self.contexte_fichier_init = {}
    self.fichier_unite = 999
    self.fichier_err = None
@@ -48,10 +53,11 @@ def INCLUDE(self,chemin_psse,fichier_sav,**args):
     
    unite = 999
 
-   pattern_debut_ligne = re.compile(r'^[0-9].*')
-   try:
-     MachineListOrigin,LoadListOrigin= ExtractGeneratorandLoadList2(fichier_sav,chemin_psse)
-   except :
+   #try :
+   if 1:
+     MachineDico,LoadDico,LineDico,TransfoDico, MotorDico = ExtractGeneratorLoadLineandTransfoDico2(sav_file,PSSE_path)
+   else :
+   #except :
      if self.jdc.appli is not None:
         self.jdc.appli.affiche_alerte("Error", 'An error happened in ExtractGeneratorandLoadList execution ')
         self.g_context = {}
@@ -60,40 +66,26 @@ def INCLUDE(self,chemin_psse,fichier_sav,**args):
         self.fichier_err = str(exc)
         self.contexte_fichier_init = {}
 
-   MachineList=[]
-   LoadList=[]
-   BusBarList=[]
-   for m in MachineListOrigin:
-       if m in LoadListOrigin : BusBarList.append(m)
-       else : MachineList.append(m)
-
-   for m in LoadListOrigin:
-       if m not in MachineListOrigin : LoadList.append(m)
+   
+   for nom in MachineDico.keys():
+      self.fichier_text += "%s=MONGENER(ID='%s',);\n" % (nom, 'a')
+      listeNouveau.append(nom)
 
-   for m in MachineList:
-         nouv=m[0].replace(' ','_')
-         nouveau=nouv.replace('.','_')
-         nom = nouveau+"__"+str(m[1])
-         if pattern_debut_ligne.match(nom): nom='_'+nom
-         id  = str(m[3])
-         self.fichier_text += "%s=MONGENER(ID='%s',);\n" % (nom, id)
+   for nom in LoadDico.keys():
+      self.fichier_text += "%s=MACHARGE(ID='%s',);\n" % (nom, 'a')
+      listeNouveau.append(nom)
+      
+   for nom in LineDico.keys():
+      self.fichier_text += "%s=MALIGNE(ID='%s',);\n" % (nom,'a')
+      listeNouveau.append(nom)
 
-   for m in BusBarList:
-         nouv=m[0].replace(' ','_')
-         nouveau=nouv.replace('.','_')
-         nom = nouveau+"__"+str(m[1])
-         if pattern_debut_ligne.match(nom): nom='_'+nom
-         id  = str(m[3])
-         self.fichier_text += "%s=MONBUSBAR(ID='%s',);\n" % (nom, id)
+   for nom in TransfoDico.keys():
+      self.fichier_text += "%s=MONTRANSFO(ID='%s',);\n" % (nom,'a')
+      listeNouveau.append(nom)
 
-   for m in LoadList:
-         nouv=m[0].replace(' ','_')
-         nouveau=nouv.replace('.','_')
-         nom = nouveau+"__"+str(m[1])
-         if pattern_debut_ligne.match(nom): nom='_'+nom
-         if pattern_debut_ligne.match(nom): print 'match'
-         id  = str(m[3])
-         self.fichier_text += "%s=MACHARGE(ID='%s',);\n" % (nom, id)
+   for nom in MotorDico.keys():
+      self.fichier_text += "%s=MONMOTEUR(ID='%s',);\n" % (nom,'a')
+      listeNouveau.append(nom)
 
    import Extensions.jdc_include
    self.JdC_aux = Extensions.jdc_include.JDC_CATA_INCLUDE(code='PSEN', execmodul=None)
@@ -101,6 +93,16 @@ def INCLUDE(self,chemin_psse,fichier_sav,**args):
    self.old_context_fichier_init = self.contexte_fichier_init
    self.parent.record_unit(unite, self)
 
+   self.jdc.MachineDico=MachineDico
+   self.jdc.LoadDico=LoadDico
+   self.jdc.LineDico=LineDico
+   self.jdc.TransfoDico=TransfoDico
+   self.jdc.MotorDico = MotorDico
+
+   if toClean:
+    for concept in listeADeTruire :
+      if concept.nom not in listeNouveau: self.jdc.delete_concept(concept)
+    self.reevalue_sd_jdc()
 
 def INCLUDE_context(self,d):
    """