differents bug d affichage + dumpXSD optionnel

diff --git a/InterfaceQT4/configuration.py b/InterfaceQT4/configuration.py
index ccf730636f3d7679e25711ea57f43266b5dac8df..fe3ad7f673d243a21f133adc9c66efdb545334f3 100644 (file)
--- a/InterfaceQT4/configuration.py
+++ b/InterfaceQT4/configuration.py
@@ -126,6 +126,8 @@ class configBase(object):
       self.repIcones=None
       self.differencieSiDefaut=False
       self.typeDeCata='Python'
+      self.dumpXSD=False
+      self.afficheIhm=True
 
 
  

diff --git a/InterfaceQT4/editorSsIhm.py b/InterfaceQT4/editorSsIhm.py
index ef19a6c2750920ce2c895a369a95c19ec4ceb309..bcda1c0c93153e257b1053b71e8b4e232df0ab90 100755 (executable)
--- a/InterfaceQT4/editorSsIhm.py
+++ b/InterfaceQT4/editorSsIhm.py
@@ -89,7 +89,6 @@ class JDCEditorSsIhm :
               from InterfaceQT4   import readercata
            self.readercata  = readercata.ReaderCata( self, self.appliEficas )
            self.appliEficas.readercata=self.readercata
-           self.readercata.dumpToXml()
            self.appliEficas.code=self.code
         else :
            self.readercata=self.appliEficas.readercata
@@ -98,6 +97,7 @@ class JDCEditorSsIhm :
 
         self.format =  self.appliEficas.format_fichier
 
+        if self.appliEficas.maConfiguration.dumpXSD==True : self.appliEficas.dumpXsd()
         self.dict_reels={}
         self.liste_simp_reel=[]
         self.dicoNouveauxMC={}
@@ -136,12 +136,12 @@ class JDCEditorSsIhm :
         self.nouveau=0
         if self.fichier is not None:        #  fichier jdc fourni
             if jdc==None :
-               print ('PNPN : chgt try en if')
-               #try :
-               if 1 :
+               #print ('PNPN : chgt try en if')
+               try :
+               #if 1 :
                    self.jdc = self.readFile(self.fichier)
-               #except :
-               #    print ("mauvaise lecture")
+               except :
+                   print ("mauvaise lecture")
                if self.salome :
                   try :
                      self.appliEficas.addJdcInSalome( self.fichier)
@@ -200,7 +200,7 @@ class JDCEditorSsIhm :
              p.readfile(fn)
 
              if p.text=="" : self.nouveau=1
-             print ('PNPN --> CIST a faire')
+             #print ('PNPN --> CIST a faire')
 
              pareil,texteNew=self.verifieChecksum(p.text)
              if  not pareil :
@@ -254,7 +254,7 @@ class JDCEditorSsIhm :
 
 
         #jdc=self.readercata.cata[0].JdC( procedure =texte,
-        print (self.readercata.cata)
+        #print (self.readercata.cata)
         jdc=self.readercata.cata.JdC( procedure =texte,
                                          appli=self,
                                          cata=self.readercata.cata,
@@ -337,8 +337,11 @@ class JDCEditorSsIhm :
     #-----------------------#
        if 'dico' in generator.plugins:
          self.generator=generator.plugins['dico']()
+         #print (self.generator)
          jdc_formate=self.generator.gener(self.jdc)
+         #print (jdc_formate)
          dico=self.generator.Dico
+         #print (dico)
          return dico
 
     #-----------------------#
@@ -485,6 +488,7 @@ class JDCEditorSsIhm :
     #---------------------#
       if 'dicoImbrique' in generator.plugins:
          self.generator=generator.plugins['dicoImbrique']()
+         #print (self.generator)
          jdc_formate=self.generator.gener(self.jdc)
          dico=self.generator.Dico
          return dico

diff --git a/InterfaceQT4/monGroupeOptionnel.py b/InterfaceQT4/monGroupeOptionnel.py
index 9d6eaa2e04f6e5f0c89191c1e78cb08d13330a78..2ebdbc0ec768ddb294ea53b1954c11577ece2432 100644 (file)
--- a/InterfaceQT4/monGroupeOptionnel.py
+++ b/InterfaceQT4/monGroupeOptionnel.py
@@ -94,16 +94,8 @@ class MonPBButtonCustom(QWidget,Ui_customPB):
       QWidget.__init__(self)
       self.setupUi(self)
       if couleur != None :
-         print ( 'je change pour ', texte)
          self.monPb.setText(texte)
-         self.monPb.setStyleSheet( "background:rgb(229,62,30);\n"
-"border-radius : 10px;\n"
-"border-width : 30 px;\n"
-"border-color : beige;\n"
-"\n"
-"")
-
-
+         self.monPb.setStyleSheet('QPushButton {background-color: #A3C1DA; color: red;}')
          #mapalette=self.monPb.palette()
          #mapalette.setColor( QPalette.ButtonText, Qt.red )
          #self.monPb.setPalette( mapalette )
@@ -139,7 +131,7 @@ class MonGroupeOptionnel (QWidget,Ui_groupeOptionnel):
   """
   """
   def __init__(self,liste,liste_rouge,parentQt,parentMC):
-     #print "dans init de monWidgetOptionnel ", parentQt, liste,parentMC
+     #print ("dans init de monWidgetOptionnel ", parentQt, liste,parentMC)
      QWidget.__init__(self,None)
      self.setupUi(self)
      self.listeChecked=[]

diff --git a/InterfaceQT4/monWidgetCommande.py b/InterfaceQT4/monWidgetCommande.py
index b28021e41b549a4f4058a8a382beb87365d1a5c8..25fbd3df12cd72f4db38bcc34fb203911a046ab9 100644 (file)
--- a/InterfaceQT4/monWidgetCommande.py
+++ b/InterfaceQT4/monWidgetCommande.py
@@ -117,7 +117,7 @@ class MonWidgetCommande(Ui_WidgetCommande,Groupe):
         self.editor.inhibeSplitter=0
         self.monOptionnel=self.editor.widgetOptionnel
       self.afficheOptionnel()
-      spacerItem = QSpacerItem(21, 20, QSizePolicy.Expanding, QSizePolicy.Expanding)
+      spacerItem = QSpacerItem(21, 500, QSizePolicy.Expanding, QSizePolicy.Expanding)
       #spacerItem = QSpacerItem(21, 20, QSizePolicy.Preferred, QSizePolicy.Preferred)
       #self.commandesLayout.addItem(spacerItem)
       self.verticalLayoutCommande.addItem(spacerItem)

diff --git a/InterfaceQT4/monWidgetCommandeDeplie1Niveau.py b/InterfaceQT4/monWidgetCommandeDeplie1Niveau.py
index 88a80fd165b67e1915c843b0405aea287de59548..9fa4cbd15c7c82981d71c3f3ac1888b9f45ea274 100644 (file)
--- a/InterfaceQT4/monWidgetCommandeDeplie1Niveau.py
+++ b/InterfaceQT4/monWidgetCommandeDeplie1Niveau.py
@@ -27,6 +27,7 @@ import traceback
 
 from PyQt5.QtGui import QIcon
 from InterfaceQT4.monWidgetCommande import MonWidgetCommande
+from PyQt5.QtWidgets  import QSpacerItem, QSizePolicy
 
 class MonWidgetCommandeDeplie1Niveau(MonWidgetCommande):
 # Attention au MCLIST qui ne sont pas des MCFACT
@@ -37,6 +38,8 @@ class MonWidgetCommandeDeplie1Niveau(MonWidgetCommande):
       #print ("debut de ---------------------- init de MonWidgetCommandeDeplie1Niveau ",node.item.nom)
       MonWidgetCommande.__init__(self,node,editor,etape)
       self.node.plieToutEtReaffiche=self.plieToutEtReaffiche
+      spacerItem = QSpacerItem(21, 600, QSizePolicy.Expanding, QSizePolicy.Expanding)
+      self.verticalLayoutCommande.addItem(spacerItem)
 
   def afficheMots(self):
       # Attention

diff --git a/InterfaceQT4/monWidgetPlusieursBase.py b/InterfaceQT4/monWidgetPlusieursBase.py
index ff349a9be93558dd8d29201200c07eb15db49926..0e7948779248d4d35799871bd97cf4a82c9fcaf2 100644 (file)
--- a/InterfaceQT4/monWidgetPlusieursBase.py
+++ b/InterfaceQT4/monWidgetPlusieursBase.py
@@ -35,13 +35,13 @@ from PyQt5.QtCore    import QTimer, QSize, Qt
 # Modules Eficas
 from Extensions.i18n import tr
 
-from .feuille                import Feuille
-from desWidgetPlusieursBase import Ui_WidgetPlusieursBase 
-from .politiquesValidation   import PolitiquePlusieurs
-from .qtSaisie               import SaisieValeur
-from .gereListe              import GereListe
-from .gereListe              import GerePlie
-from .gereListe              import LECustom
+from InterfaceQT4.feuille                import Feuille
+from UiQT5.desWidgetPlusieursBase        import Ui_WidgetPlusieursBase 
+from InterfaceQT4.politiquesValidation   import PolitiquePlusieurs
+from InterfaceQT4.qtSaisie               import SaisieValeur
+from InterfaceQT4.gereListe              import GereListe
+from InterfaceQT4.gereListe              import GerePlie
+from InterfaceQT4.gereListe              import LECustom
 
 dicoLongueur={2:95,3:125,4:154,5:183,6:210,float('inf'):210}
 hauteurMax=253

diff --git a/InterfaceQT4/qtEficasSsIhm.py b/InterfaceQT4/qtEficasSsIhm.py
index 4e5ec872e17d341eee81cefdc4979801999a62b0..d068b5f8055968c8f23964ccb8519c5a6e10fccc 100755 (executable)
--- a/InterfaceQT4/qtEficasSsIhm.py
+++ b/InterfaceQT4/qtEficasSsIhm.py
@@ -153,6 +153,11 @@ class AppliSsIhm:
         ok = editor.saveFileAs()
         print ('ok ',ok)
 
+    def dumpXsd(self):
+        current_cata    = CONTEXT.getCurrentCata()
+        current_cata.dumpXsd()
+        if self.maConfiguration.afficheIhm==False : exit()
+
 #,self.fileSaveAs
 #,self.fileClose
 #,self.fileExit

diff --git a/InterfaceQT4/readercata.py b/InterfaceQT4/readercata.py
index a1cec75d3382b226e5e4afd83edf231aaaed3616..a3d54df9dd47d7aac512455db2ee2415c017dc5b 100644 (file)
--- a/InterfaceQT4/readercata.py
+++ b/InterfaceQT4/readercata.py
@@ -230,7 +230,6 @@ class ReaderCata (ReaderCataCommun):
       if self.appliEficas.ssIhm == False : self.appliEficas.setWindowTitle(self.titre)
       self.appliEficas.titre=self.titre
       self.QWParent.titre=self.titre
-      #self.dumpXsd()
 
 
    def importCata(self,cata):
@@ -341,16 +340,11 @@ class ReaderCata (ReaderCataCommun):
            #else : print (niveau+1)*"   ", nom
 
 
-   def dumpToXml(self):
+   def dumpToXsdEficas(self):
+       # Pas sur qu on ait jamais besoin de cela
        pass
        #from Efi2Xsd import readerEfficas
        #newSchema=   xml = open('Cata_MED_FAM.xml').read()
        #SchemaMed = efficas.CreateFromDocument(xml)
        #SchemaMed.alimenteCata(self.cata)
 
-   def dumpXsd(self):
-       from Efi2Xsd.dumpToXsd import dumpXsd
-       print ('dumpToXsd : ', self)
-       dumpXsd(self)
-
-