bug JPA

diff --git a/InterfaceQT4/editor.py b/InterfaceQT4/editor.py
index 70ede6ba712944f0a88660739bc5b54a1f5c1779..80f103507ae63d20ca3cc7b96ca8507953b3fbbd 100755 (executable)
--- a/InterfaceQT4/editor.py
+++ b/InterfaceQT4/editor.py
@@ -865,7 +865,7 @@ class JDCEditor(Ui_baseWidget,QWidget):
             return 0
 
     #-----------------------------------------------------------#
-    def get_text_JDC(self,format,pourRun=0,formatLigne="beautifie",appli=None):
+    def get_text_JDC(self,format,pourRun=0,formatLigne="beautifie"):
     #-----------------------------------------------------------#
       if self.code == "MAP" and not(generator.plugins.has_key(format)): format = "MAP"
       if generator.plugins.has_key(format):

diff --git a/generator/generator_PSEN.py b/generator/generator_PSEN.py
index 30daec5034ed980fd51efe748e028432891a16d2..19fbcea194f432ce54da4176841962efca013a06 100755 (executable)
--- a/generator/generator_PSEN.py
+++ b/generator/generator_PSEN.py
@@ -53,19 +53,20 @@ class PSENGenerator(DicoImbriqueGenerator):
    extensions=('.comm',)
 
 #----------------------------------------------------------------------------------------
-   def gener(self,obj,format='brut',config=None):
+   def gener(self,obj,format='brut',config=None, appli=None):
 
-      print "je passe dans gener"
       try :
          self.MachineDico = obj.MachineDico
          self.LoadDico = obj.LoadDico
          self.LineDico = obj.LineDico
          self.TransfoDico = obj.TransfoDico
+         self.MotorDico = obj.MotorDico
       except :
          self.MachineDico = None
          self.LoadDico = None
          self.LineDico = None
          self.TransfoDico = None
+         self.MotorDico = None
       
       self.initDico()
       # Cette instruction genere le contenu du fichier de commandes (persistance)
@@ -83,6 +84,7 @@ class PSENGenerator(DicoImbriqueGenerator):
       self.Entete += 'LoadDico = ' + str(self.LoadDico) +'\n'
       self.Entete += 'LineDico = ' + str(self.LineDico) +'\n'
       self.Entete += 'TransfoDico = ' + str(self.TransfoDico) +'\n'
+      self.Entete += 'MotorDico = ' + str(self.MotorDico) + '\n'
       self.Entete +='\n'
 
 

diff --git a/generator/generator_aplat.py b/generator/generator_aplat.py
index 2935310bd87196ccf057ffe734bd61e305fb44b7..d54299b05a95b3da521f93b2c6a29e8e27836872 100644 (file)
--- a/generator/generator_aplat.py
+++ b/generator/generator_aplat.py
@@ -85,7 +85,7 @@ class AplatGenerator:
       fp.write(self.text)
       fp.close()
 
-   def gener(self,obj,format='brut',config=None):
+   def gener(self,obj,format='brut',config=None,appli=None):
       """
           Retourne une représentation du JDC obj sous une forme qui est paramétrée par format.
           Si format vaut 'brut', 'standard' ou 'beautifie', retourne le texte issu de generator

diff --git a/generator/generator_dico.py b/generator/generator_dico.py
index 5de4c9e0f7954d4adb02063f3c8347b2ccd78b3c..a3f752e9ee7635848752e62717209408b1a36ff6 100644 (file)
--- a/generator/generator_dico.py
+++ b/generator/generator_dico.py
@@ -49,7 +49,7 @@ class DicoGenerator(PythonGenerator):
    extensions=('.comm',)
 
 #----------------------------------------------------------------------------------------
-   def gener(self,obj,format='brut',config=None):
+   def gener(self,obj,format='brut',config=None,appli=None):
        
       self.initDico()
       

diff --git a/generator/generator_dicoImbrique.py b/generator/generator_dicoImbrique.py
index a9d937eb7ee15369550461d83666ce5ffb9d61d3..9e5d1f639fefb5be4600541a14dd7739c36ae395 100644 (file)
--- a/generator/generator_dicoImbrique.py
+++ b/generator/generator_dicoImbrique.py
@@ -49,7 +49,7 @@ class DicoImbriqueGenerator(PythonGenerator):
    extensions=('.comm',)
 
 #----------------------------------------------------------------------------------------
-   def gener(self,obj,format='brut',config=None):
+   def gener(self,obj,format='brut',config=None, appli=None):
        
       self.initDico()
       

diff --git a/generator/generator_map.py b/generator/generator_map.py
index a009f759a87bd35b4147250b0fd520de81bf35d6..b0637c9e50cbbd705b058a3ed3b29d15009bc4d9 100644 (file)
--- a/generator/generator_map.py
+++ b/generator/generator_map.py
@@ -50,7 +50,7 @@ class MapGenerator(PythonGenerator):
 
    """
 
-   def gener(self,obj,format='brut',config=None):
+   def gener(self,obj,format='brut',config=None,appli=None):
       self.initDico()
       self.text=PythonGenerator.gener(self,obj,format)
       if obj.isvalid() :self.genereExeMap()

diff --git a/generator/generator_python.py b/generator/generator_python.py
index 9bdd1f26f0f5eb3df8de26830478168bf86e402b..2ea045aca008752bb8ec16849b667fe1810120a4 100644 (file)
--- a/generator/generator_python.py
+++ b/generator/generator_python.py
@@ -547,14 +547,15 @@ class PythonGenerator:
             for val in obj.valeur :
                s =s +self.format_item(val,obj.etape,obj) + ','
                obj.valeurFormatee.append(self.format_item(val,obj.etape,obj))
-            if len(obj.valeur) > 1:
+            if len(obj.valeur) >= 1:
                s = '(' + s + '),'
-            if obj.valeur==[] : s="(),"
+            if obj.valeur==[] or obj.valeur==() : s="(),"
          if obj.nbrColonnes() :
             s=self.formatColonnes(obj.nbrColonnes(),obj.valeur,obj)
       else :
          obj.valeurFormatee=obj.valeur
          s=self.format_item(obj.valeur,obj.etape,obj) + ','
+      print s
       return s
 
 

diff --git a/generator/generator_vers3DSalome.py b/generator/generator_vers3DSalome.py
index dc5931cbb2b5226d5015e3cbfe07c9d2af3560ee..f1be205b45527b4c92b36a89426510583305e0b6 100644 (file)
--- a/generator/generator_vers3DSalome.py
+++ b/generator/generator_vers3DSalome.py
@@ -88,7 +88,7 @@ class vers3DSalomeGenerator(PythonGenerator):
       self.commande = ""
       self.dict_attributs = {} 
 
-   def gener(self,node,config=None):
+   def gener(self,node,config=None,appli=None):
       """
       """
       self.node=node