mauvais positionnement fleche include dans Salome

diff --git a/UiQT4/desInclude.ui b/UiQT4/desInclude.ui
index 291b7b33a0facc18bcb7783e0ae06bce2064a4ce..189df4af991404dcbfd5a1d88f9439ad65124aad 100644 (file)
--- a/UiQT4/desInclude.ui
+++ b/UiQT4/desInclude.ui
@@ -202,7 +202,7 @@
        <property name="geometry" >
         <rect>
          <x>30</x>
-         <y>40</y>
+         <y>10</y>
          <width>440</width>
          <height>41</height>
         </rect>
@@ -217,8 +217,8 @@
       <widget class="QLineEdit" name="LENomFichier" >
        <property name="geometry" >
         <rect>
-         <x>18</x>
-         <y>117</y>
+         <x>20</x>
+         <y>50</y>
          <width>450</width>
          <height>40</height>
         </rect>
@@ -239,8 +239,8 @@
       <widget class="QPushButton" name="BBrowse" >
        <property name="geometry" >
         <rect>
-         <x>280</x>
-         <y>240</y>
+         <x>20</x>
+         <y>270</y>
          <width>161</width>
          <height>41</height>
         </rect>
@@ -258,8 +258,8 @@
       <widget class="QPushButton" name="BChangeFile" >
        <property name="geometry" >
         <rect>
-         <x>280</x>
-         <y>290</y>
+         <x>20</x>
+         <y>320</y>
          <width>161</width>
          <height>41</height>
         </rect>
@@ -300,6 +300,9 @@ p, li { white-space: pre-wrap; }
     </widget>
    </item>
   </layout>
+  <zorder>bOk</zorder>
+  <zorder>Commentaire</zorder>
+  <zorder>TWChoix</zorder>
  </widget>
  <layoutdefault spacing="6" margin="11" />
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>

diff --git a/generator/generator_map.py b/generator/generator_map.py
index a6fd4e2ff00fd9694cdc22844afc4d6003dd3cc0..477f487ce09d1e1cc3445e8c12fc954b24710315 100644 (file)
--- a/generator/generator_map.py
+++ b/generator/generator_map.py
@@ -55,7 +55,6 @@ class MapGenerator(PythonGenerator):
 
    def initialise(self,config):
       self.config=config
-      self.dictMCVal={}
       self.listeCODE=[]
       self.text=""
       self.textCode=""
@@ -86,8 +85,11 @@ class MapGenerator(PythonGenerator):
       self.initialise(config)
       text=PythonGenerator.gener(self,obj,format)
       self.verifie()
-      for code in self.listeCODE:
-          print code
+      for elt in self.listeCODE:
+          code=elt.keys()[0]
+          dico=elt[code]
+          self.dictMCVal={}
+          self.dictMCVal[code]=dico
           if code in self.__class__.__dict__.keys():
              codeYACS=str(code)+"YACS"
              texteCode=apply(self.__class__.__dict__[codeYACS],(self,))
@@ -101,29 +103,22 @@ class MapGenerator(PythonGenerator):
          ce dictionnaire a pour clef la genealogie du MCSimp suivi de sa valeur
 
       '''
-      for code in self.dictMCVal.keys():
+      for elt in self.listeCODE:
+          code=elt.keys()[0]
+          dico=elt[code]
+          self.dictMCVal={}
+          self.dictMCVal[code]=dico
           if code in self.__class__.__dict__.keys():
              texteCode=apply(self.__class__.__dict__[code],(self,execution))
              self.texteExecution=self.texteExecution+texteCode
 
    def generPROC_ETAPE(self,obj):
-      self.listeCODE.append(obj.nom)
-      self.clefDico=obj.nom
-      if not( self.dictMCVal.has_key(self.clefDico)):
-         self.dictMCVal[self.clefDico]={}
-         self.DictTemp=self.dictMCVal[self.clefDico]
-      else:
-         tempo=self.dictMCVal[self.clefDico]
-         self.DictTemp={}
-         import types
-         if type(tempo) == types.TupleType:
-            tempo.append(self.DictTemp)
-            self.dictMCVal[self.clefDico]=tempo
-         else:
-            self.dictMCVal[self.clefDico]=[tempo,self.DictTemp]
+      clefDico=obj.nom
+      self.DictTemp={}
       s=PythonGenerator.generPROC_ETAPE(self,obj)
-      print self.listeCODE
-      print self.dictMCVal
+      dico={}
+      dico[obj.nom]=self.DictTemp
+      self.listeCODE.append(dico)
       return s