print "Le generateur n'a pas ete trouve"
print "Erreur ! Erreur!"
return ""
+ from Extensions.param2 import originalMath
+ originalMath.toOriginal()
self.appli.envoievisu(texte)
-
+ originalMath.toSurcharge()
+
../../Ihm/I_REGLE.py \
../../Ihm/I_UN_PARMI.py \
../../Ihm/I_VALIDATOR.py \
- ../../InterfaceQT4/browser.py \
- ../../InterfaceQT4/compobase.py \
- ../../InterfaceQT4/compobloc.py \
- ../../InterfaceQT4/compocommandecomm.py \
- ../../InterfaceQT4/compocomm.py \
- ../../InterfaceQT4/compoerror.py \
- ../../InterfaceQT4/compofact.py \
- ../../InterfaceQT4/compoformule.py \
- ../../InterfaceQT4/compojdc.py \
- ../../InterfaceQT4/compomacro.py \
- ../../InterfaceQT4/compomclist.py \
- ../../InterfaceQT4/componiveau.py \
- ../../InterfaceQT4/componuplet.py \
- ../../InterfaceQT4/compooper.py \
- ../../InterfaceQT4/compoparam.py \
- ../../InterfaceQT4/compoproc.py \
- ../../InterfaceQT4/composimp.py \
- ../../InterfaceQT4/configuration.py \
- ../../InterfaceQT4/editor.py \
- ../../InterfaceQT4/eficas_go.py \
- ../../InterfaceQT4/gereTraduction.py \
- ../../InterfaceQT4/monChoixCata.py \
- ../../InterfaceQT4/monChoixCode.py \
- ../../InterfaceQT4/monChoixMap.py \
- ../../InterfaceQT4/monCommandePanel.py \
- ../../InterfaceQT4/monCommentairePanel.py \
- ../../InterfaceQT4/monFonctionPanel.py \
- ../../InterfaceQT4/monFormulePanel.py \
- ../../InterfaceQT4/monInactifPanel.py \
- ../../InterfaceQT4/monIncludePanel.py \
- ../../InterfaceQT4/monListeParamPanel.py \
- ../../InterfaceQT4/monMacroPanel.py \
- ../../InterfaceQT4/monMatricePanel.py \
- ../../InterfaceQT4/monMCFactPanel.py \
- ../../InterfaceQT4/monMCListAjoutPanel.py \
- ../../InterfaceQT4/monOptions_ASTER.py \
- ../../InterfaceQT4/monOptions_CUVE2DG.py \
- ../../InterfaceQT4/monOptions_MAP.py \
- ../../InterfaceQT4/monOptions_OPENTURNS_STUDY.py \
- ../../InterfaceQT4/monOptions_OPENTURNS_WRAPPER.py \
- ../../InterfaceQT4/monOptionsPdf.py \
- ../../InterfaceQT4/monParamPanel.py \
- ../../InterfaceQT4/monPixmap.py \
- ../../InterfaceQT4/monPlusieursASSDPanel.py \
- ../../InterfaceQT4/monPlusieursBasePanel.py \
- ../../InterfaceQT4/monPlusieursIntoPanel.py \
- ../../InterfaceQT4/monPoursuitePanel.py \
- ../../InterfaceQT4/monRacinePanel.py \
- ../../InterfaceQT4/monRecherche.py \
- ../../InterfaceQT4/monSelectImage.py \
- ../../InterfaceQT4/monSelectVal.py \
- ../../InterfaceQT4/monUniqueASSDPanel.py \
- ../../InterfaceQT4/monUniqueBasePanel.py \
- ../../InterfaceQT4/monUniqueBoolPanel.py \
- ../../InterfaceQT4/monUniqueCompPanel.py \
- ../../InterfaceQT4/monUniqueIntoPanel.py \
- ../../InterfaceQT4/monUniqueSDCOIntoPanel.py \
- ../../InterfaceQT4/monUniqueSDCOPanel.py \
- ../../InterfaceQT4/monVisu.py \
- ../../InterfaceQT4/politiquesValidation.py \
- ../../InterfaceQT4/qtCommun.py \
- ../../InterfaceQT4/qtEficas.py \
- ../../InterfaceQT4/qtSaisie.py \
- ../../InterfaceQT4/readercata.py \
- ../../InterfaceQT4/ssIhm.py \
- ../../InterfaceQT4/typeNode.py \
- ../../InterfaceQT4/utilIcons.py \
- ../../InterfaceQT4/viewManager.py \
- ../../Tools/optparse.py \
- ../../Tools/textwrap.py \
+ ../../InterfaceQT4/browser.py \
+ ../../InterfaceQT4/compobloc.py \
+ ../../InterfaceQT4/compocomm.py \
+ ../../InterfaceQT4/compofact.py \
+ ../../InterfaceQT4/compoformule.py \
+ ../../InterfaceQT4/compojdc.py \
+ ../../InterfaceQT4/compomacro.py \
+ ../../InterfaceQT4/compomclist.py \
+ ../../InterfaceQT4/compooper.py \
+ ../../InterfaceQT4/compoparam.py \
+ ../../InterfaceQT4/compoproc.py \
+ ../../InterfaceQT4/composimp.py \
+ ../../InterfaceQT4/configuration.py \
+ ../../InterfaceQT4/editor.py \
+ ../../InterfaceQT4/eficas_go.py \
+ ../../InterfaceQT4/feuille.py \
+ ../../InterfaceQT4/gereIcones.py \
+ ../../InterfaceQT4/gereListe.py \
+ ../../InterfaceQT4/gereTraduction.py \
+ ../../InterfaceQT4/getVersion.py \
+ ../../InterfaceQT4/groupe.py \
+ ../../InterfaceQT4/monBoutonValide.py \
+ ../../InterfaceQT4/monChoixCata.py \
+ ../../InterfaceQT4/monChoixCommande.py \
+ ../../InterfaceQT4/monRecherche.py \
+ ../../InterfaceQT4/monViewTexte.py \
+ ../../InterfaceQT4/monVisu.py \
+ ../../InterfaceQT4/monWidget4a6RadioButton.py \
+ ../../InterfaceQT4/monWidgetBloc.py \
+ ../../InterfaceQT4/monWidgetCB.py \
+ ../../InterfaceQT4/monWidgetCommande.py \
+ ../../InterfaceQT4/monWidgetCommentaire.py \
+ ../../InterfaceQT4/monWidgetFactPlie.py \
+ ../../InterfaceQT4/monWidgetFact.py \
+ ../../InterfaceQT4/monWidgetOptionnel.py \
+ ../../InterfaceQT4/monWidgetPlusieursBase.py \
+ ../../InterfaceQT4/monWidgetPlusieursInto.py \
+ ../../InterfaceQT4/monWidgetRadioButton.py \
+ ../../InterfaceQT4/monWidgetSimpBase.py \
+ ../../InterfaceQT4/monWidgetSimpBool.py \
+ ../../InterfaceQT4/monWidgetSimpComplexe.py \
+ ../../InterfaceQT4/monWidgetSimpFichier.py \
+ ../../InterfaceQT4/monWidgetSimpTuple2.py \
+ ../../InterfaceQT4/monWidgetSimpTuple3.py \
+ ../../InterfaceQT4/monWidgetSimpTuple.py \
+ ../../InterfaceQT4/monWidgetSimpTxt.py \
+ ../../InterfaceQT4/MonWidgetSimpTxt.py \
+ ../../InterfaceQT4/politiquesValidation.py \
+ ../../InterfaceQT4/qtEficas.py \
+ ../../InterfaceQT4/qtEficas_with_log.py \
+ ../../InterfaceQT4/qtSaisie.py \
+ ../../InterfaceQT4/readercata.py \
+ ../../InterfaceQT4/ssIhm.py \
+ ../../InterfaceQT4/typeNode.py \
+ ../../InterfaceQT4/utilIcons.py \
+ ../../InterfaceQT4/viewManager.py \
../../Traducteur/calcG.py \
../../Traducteur/changeValeur.py \
../../Traducteur/dictErreurs.py \
../../Traducteur/traduitV9V10.py \
../../Traducteur/utils.py \
../../Traducteur/visiteur.py \
- ../../Utilites/appels.py \
- ../../Utilites/developpeur.py \
- ../../Utilites/execute.py \
- ../../Utilites/funcname.py \
- ../../Utilites/ici.py \
- ../../Utilites/message.py \
- ../../Utilites/modification.py \
- ../../Utilites/pause.py \
../../Validation/V_A_CLASSER.py \
- ../../Noyau/N_VALIDATOR.py
+ ../../Noyau/N_VALIDATOR.py \
+ ../../CarmelCND/PourTraductionCarmel.py
-FORMS = ../../UiQT4/aideQT.ui \
+FORMS= ../../UiQT4/aideQT.ui \
+ ../../UiQT4/desBaseWidget.ui \
../../UiQT4/desChoixCata.ui \
- ../../UiQT4/desChoixCode.ui \
- ../../UiQT4/desChoixMap.ui \
- ../../UiQT4/desCommande.ui \
- ../../UiQT4/desCommentaire.ui \
- ../../UiQT4/desError.ui \
- ../../UiQT4/desFormule.ui \
- ../../UiQT4/desImage.ui \
- ../../UiQT4/desInactif.ui \
- ../../UiQT4/desInclude.ui \
- ../../UiQT4/desListeParam.ui \
- ../../UiQT4/desMatrice.ui \
- ../../UiQT4/desMCFact.ui \
- ../../UiQT4/desMCListAjout.ui \
- ../../UiQT4/desParam.ui \
- ../../UiQT4/desPixmap.ui \
- ../../UiQT4/desPlusieursBase.ui \
- ../../UiQT4/desPlusieursInto.ui \
- ../../UiQT4/desPoursuite.ui \
- ../../UiQT4/desRacine.ui \
+ ../../UiQT4/desChoixCommandes.ui \
../../UiQT4/desRecherche.ui \
../../UiQT4/desSelectVal.ui \
- ../../UiQT4/desUniqueASSD.ui \
- ../../UiQT4/desUniqueBase.ui \
- ../../UiQT4/desUniqueBool.ui \
- ../../UiQT4/desUniqueComp.ui \
- ../../UiQT4/desUniqueInto.ui \
- ../../UiQT4/desUniqueSDCOInto.ui \
- ../../UiQT4/desUniqueSDCO.ui \
../../UiQT4/desViewTexte.ui \
- ../../UiQT4/desVisu.ui \
+ ../../UiQT4/desWidget4a6RadioButton.ui \
+ ../../UiQT4/desWidgetBloc.ui \
+ ../../UiQT4/desWidgetCB.ui \
+ ../../UiQT4/desWidgetCommande.ui \
+ ../../UiQT4/desWidgetCommentaire.ui \
+ ../../UiQT4/desWidgetFactPlie.ui \
+ ../../UiQT4/desWidgetFact.ui \
+ ../../UiQT4/desWidgetOptionnel.ui \
+ ../../UiQT4/desWidgetPlusieursBase.ui \
+ ../../UiQT4/desWidgetPlusieursInto.ui \
+ ../../UiQT4/desWidgetRadioButton.ui \
+ ../../UiQT4/desWidgetSimpBase.ui \
+ ../../UiQT4/desWidgetSimpBool.ui \
+ ../../UiQT4/desWidgetSimpComplexe.ui \
+ ../../UiQT4/desWidgetSimpFichier.ui \
+ ../../UiQT4/desWidgetSimpTuple.ui \
+ ../../UiQT4/desWidgetSimpTxt.ui \
+ ../../UiQT4/desWidgetTuple2.ui \
+ ../../UiQT4/desWidgetTuple3.ui \
../../UiQT4/myMain.ui \
- ../../UiQT4/OptionsCuve.ui \
- ../../UiQT4/OptionsEditeur.ui \
- ../../UiQT4/OptionsMAP.ui \
- ../../UiQT4/OptionsOT.ui \
- ../../UiQT4/OptionsPdf.ui
TRANSLATIONS = ../../UiQT4/eficas_fr.ts ../../UiQT4/eficas_en.ts
-
def __str__(self): return self._name
def __adapt__(self,validator):
return validator.adapt(self._value)
-
def Eval(f):
if isinstance(f,Formula):
f=f.eval()
return f
-#surcharge de la fonction cos de Numeric pour les parametres
-original_ncos=Numeric.cos
def cos(f): return Unop('ncos', f)
-Unop.opmap['ncos']=lambda x: original_ncos(x)
-Numeric.cos=cos
-
-#surcharge de la fonction sin de Numeric pour les parametres
-original_nsin=Numeric.sin
def sin(f): return Unop('nsin', f)
-Unop.opmap['nsin']=lambda x: original_nsin(x)
-Numeric.sin=sin
-
-#surcharge de la fonction array de Numeric pour les parametres
-original_narray=Numeric.array
def array(f,*tup,**args):
"""array de Numeric met en défaut la mécanique des parametres
on la supprime dans ce cas. Il faut que la valeur du parametre soit bien définie
"""
return original_narray(Eval(f),*tup,**args)
-Numeric.array=array
-
-#surcharge de la fonction sin de math pour les parametres
-original_sin=math.sin
def sin(f): return Unop('sin', f)
-Unop.opmap['sin']=lambda x: original_sin(x)
-math.sin=sin
-
-#surcharge de la fonction cos de math pour les parametres
-original_cos=math.cos
-Unop.opmap['cos']=lambda x: original_cos(x)
def cos(f): return Unop('cos', f)
-math.cos=cos
-
-#surcharge de la fonction sqrt de math pour les parametres
-original_sqrt=math.sqrt
+def ceil(f): return Unop('ceil', f)
def sqrt(f): return Unop('sqrt', f)
-Unop.opmap['sqrt']=lambda x: original_sqrt(x)
-math.sqrt=sqrt
-#surcharge de la fonction ceil de math pour les parametres
-original_ceil=math.ceil
-Unop.opmap['ceil']=lambda x: original_ceil(x)
-def ceil(f): return Unop('ceil', f)
-math.ceil=ceil
+def pi2():return Unop('pi')
+
+class OriginalMath(object):
+ _instance = None
+ def __new__(cls, *args, **kwargs):
+ if not cls._instance:
+ cls._instance = super(OriginalMath, cls).__new__(
+ cls, *args, **kwargs)
+
+ return cls._instance
+
+ def __init__(self):
+ if hasattr(self,'pi') :return
+ import math
+ self.toSurcharge()
+
+ def toSurcharge(self):
+ self.numeric_ncos=Numeric.cos
+ self.numeric_nsin=Numeric.sin
+ self.numeric_narray=Numeric.array
+ self.sin=math.sin
+ self.cos=math.cos
+ self.sqrt=math.sqrt
+ self.ceil=math.ceil
+ self.pi=math.pi
+
+ #surcharge de la fonction cos de Numeric pour les parametres
+ original_ncos=Numeric.cos
+ Unop.opmap['ncos']=lambda x: original_ncos(x)
+ Numeric.cos=cos
+
+ #surcharge de la fonction sin de Numeric pour les parametres
+ original_nsin=Numeric.sin
+ Unop.opmap['nsin']=lambda x: original_nsin(x)
+ Numeric.sin=sin
+
+ #surcharge de la fonction array de Numeric pour les parametres
+ original_narray=Numeric.array
+ Numeric.array=array
+
+ #surcharge de la fonction sin de math pour les parametres
+ original_sin=math.sin
+ Unop.opmap['sin']=lambda x: original_sin(x)
+ math.sin=sin
+
+ #surcharge de la fonction cos de math pour les parametres
+ original_cos=math.cos
+ Unop.opmap['cos']=lambda x: original_cos(x)
+ math.cos=cos
+
+ #surcharge de la fonction sqrt de math pour les parametres
+ original_sqrt=math.sqrt
+ Unop.opmap['sqrt']=lambda x: original_sqrt(x)
+ math.sqrt=sqrt
+
+ #surcharge de la fonction ceil de math pour les parametres
+ original_ceil=math.ceil
+ Unop.opmap['ceil']=lambda x: original_ceil(x)
+ math.ceil=ceil
+
+ original_pi=math.pi
+ Unop.opmap['pi']=lambda x: original_pi
+ pi=Variable('pi',pi2)
+ math.pi=pi
+
+ def toOriginal(self):
+ import math
+ try:
+ import Numeric
+ except:
+ import numpy
+ Numeric = numpy
+
+ Numeric.cos=originalMath.numeric_ncos
+ Numeric.sin=originalMath.numeric_nsin
+ Numeric.array=originalMath.numeric_narray
+ math.sin=originalMath.sin
+ math.cos=originalMath.cos
+ math.sqrt=originalMath.sqrt
+ math.ceil=originalMath.ceil
+ math.pi=originalMath.pi
+
+
+originalMath=OriginalMath()
pass
def handleDoubleClickedOnItem(self,item,int):
- print "handleDoubleClickedOnItem on ",item
- print "handleDoubleClickedOnItem on ",item.fenetre
- if item.fenetre == None :
- while not (hasattr (item,'getPanel2')) : item=item.treeParent
- item.affichePanneau()
- self.expandItem(item)
- else:
- print item.fenetre
+ #if item.fenetre == None :
+ # while not (hasattr (item,'getPanel2')) : item=item.treeParent
+ # item.affichePanneau()
+ # self.expandItem(item)
+ #else:
+ # item.fenetre.rendVisible()
+ itemParent=item
+ while not (hasattr (itemParent,'getPanel2')) : itemParent=item.treeParent
+ itemParent.affichePanneau()
+ if itemParent!=item:
item.fenetre.rendVisible()
def choisitPremier(self,name):
""" Construit la liste des enfants de self """
""" Se charge de remettre les noeuds Expanded dans le meme etat """
#print "*********** build_children ",self.item, self.item.GetLabelText()
- #print self.childrenComplete
listeExpanded=[]
for item in self.childrenComplete :
def affichePanneau(self) :
- #print "dans affichePanneau"
+ print "dans affichePanneau", self.item.GetLabelText()
+ #if self.item.GetLabelText()[0]=='VCUT : ' : print y
if self.item.isactif():
panel=self.getPanel2()
else:
if recalcule : jdc.recalcule_etat_correlation()
from InterfaceQT4 import compojdc
# cas ou on detruit dans l arbre sans affichage
- if self.treeParent.fenetre== None : return
if isinstance(self.treeParent,compojdc.Node) :
toselect.affichePanneau()
else :
+ if self.treeParent.fenetre== None : return
self.treeParent.fenetre.reaffiche(toselect)
def deleteMultiple(self,liste=()):
typeNode.PopUpMenuNodeMinimal.createPopUpMenu(self)
- def getPanelGroupe(self,parentQt):
+ def getPanelGroupe(self,parentQt,commande):
maDefinition=self.item.get_definition()
monObjet=self.item.object
monNom=self.item.nom
+ maCommande=commande
if hasattr(parentQt,'niveau'): self.niveau=parentQt.niveau+1
else : self.niveau=1
from monWidgetBloc import MonWidgetBloc
- widget=MonWidgetBloc(self,self.editor,parentQt,maDefinition,monObjet,self.niveau)
+ widget=MonWidgetBloc(self,self.editor,parentQt,maDefinition,monObjet,self.niveau,maCommande)
class BLOCTreeItem(compofact.FACTTreeItem):
class Node(browser.JDCNode,typeNode.PopUpMenuNodePartiel):
- def getPanel( self ):
+ def getPanel2( self ):
"""
"""
- from monCommentairePanel import MonCommentairePanel
- return MonCommentairePanel(self,parent=self.editor)
+ from monWidgetCommentaire import MonWidgetCommentaire
+ return MonWidgetCommentaire(self,self.editor,self.item.object)
def createPopUpMenu(self):
typeNode.PopUpMenuNodePartiel.createPopUpMenu(self)
from monMCFactPanel import MonMCFactPanel
return MonMCFactPanel(self,parent=self.editor)
- def getPanelGroupe(self,parentQt):
+ def getPanelGroupe(self,parentQt,commande):
maDefinition=self.item.get_definition()
monObjet=self.item.object
monNom=self.item.nom
+ maCommande=commande
if hasattr(parentQt,'niveau'): self.niveau=parentQt.niveau+1
else : self.niveau=1
if hasattr(self,'plie') and self.plie==True :
from monWidgetFactPlie import MonWidgetFactPlie
- widget=MonWidgetFactPlie(self,self.editor,parentQt,maDefinition,monObjet,self.niveau)
+ widget=MonWidgetFactPlie(self,self.editor,parentQt,maDefinition,monObjet,self.niveau,maCommande)
else:
from monWidgetFact import MonWidgetFact
- widget=MonWidgetFact(self,self.editor,parentQt,maDefinition,monObjet,self.niveau)
+ widget=MonWidgetFact(self,self.editor,parentQt,maDefinition,monObjet,self.niveau,maCommande)
return widget
def createPopUpMenu(self):
typeNode.PopUpMenuNodeMinimal.createPopUpMenu(self)
- def getPanelGroupe(self,parentQt):
+ def getPanelGroupe(self,parentQt,commande):
maDefinition=self.item.get_definition()
monObjet=self.item.object
monNom=self.item.nom
+ maCommande=commande
+ print parentQt
if hasattr(parentQt,'niveau'): self.niveau=parentQt.niveau+1
else : self.niveau=1
if not (monObjet.isMCList()) :
if hasattr(self,'plie') and self.plie==True :
from monWidgetFactPlie import MonWidgetFactPlie
- widget=MonWidgetFactPlie(self,self.editor,parentQt,maDefinition,monObjet,self.niveau)
+ widget=MonWidgetFactPlie(self,self.editor,parentQt,maDefinition,monObjet,self.niveau,maCommande)
else:
from monWidgetFact import MonWidgetFact
- widget=MonWidgetFact(self,self.editor,parentQt,maDefinition,monObjet,self.niveau)
+ widget=MonWidgetFact(self,self.editor,parentQt,maDefinition,monObjet,self.niveau,maCommande)
else :
from monWidgetBloc import MonWidgetBloc
- widget=MonWidgetBloc(self,self.editor,parentQt,maDefinition,monObjet,self.niveau)
+ widget=MonWidgetBloc(self,self.editor,parentQt,maDefinition,monObjet,self.niveau,maCommande)
return widget
def select(self):
browser.JDCNode.select(self)
- self.treeParent.tree.openPersistentEditor(self,1)
- self.monWidgetNom=self.treeParent.tree.itemWidget(self,1)
- self.treeParent.tree.connect(self.monWidgetNom,SIGNAL("returnPressed()"), self.nomme)
- if self.item.GetIconName() == "ast-red-square" : self.monWidgetNom.setDisabled(True)
- else : self.monWidgetNom.setFocus() ;self.monWidgetNom.setDisabled(False)
+ #self.treeParent.tree.openPersistentEditor(self,1)
+ #self.monWidgetNom=self.treeParent.tree.itemWidget(self,1)
+ #self.treeParent.tree.connect(self.monWidgetNom,SIGNAL("returnPressed()"), self.nomme)
+ #if self.item.GetIconName() == "ast-red-square" : self.monWidgetNom.setDisabled(True)
+ #else : self.monWidgetNom.setFocus() ;self.monWidgetNom.setDisabled(False)
def nomme(self):
nom=str(self.monWidgetNom.text())
"""
"""
klass = None
-
# Attention l ordre des if est important
if self.item.wait_matrice ():
typeNode.PopUpMenuNodeMinimal.createPopUpMenu(self)
- def getPanelGroupe(self,parentQt):
+ def getPanelGroupe(self,parentQt,commande):
maDefinition=self.item.get_definition()
monObjet=self.item.object
monNom=self.item.nom
+ maCommande=commande
# Attention l ordre des if est important
# Attention il faut gerer les blocs et les facteurs
# a gerer comme dans composimp
# Gerer les matrices --> Actuellement pas dans ce type de panneau
+ #print "____________________________", self.item.wait_tuple()
if maDefinition.max == 1 :
if maDefinition.into != [] and maDefinition.into != None:
# a revoir
if len(maDefinition.into) < 4 :
from monWidgetRadioButton import MonWidgetRadioButton
- widget=MonWidgetRadioButton(self,maDefinition,monNom,monObjet,parentQt)
+ widget=MonWidgetRadioButton(self,maDefinition,monNom,monObjet,parentQt,maCommande)
elif len(maDefinition.into) < 7 :
from monWidget4a6RadioButton import MonWidget4a6RadioButton
- widget=MonWidget4a6RadioButton(self,maDefinition,monNom,monObjet,parentQt)
+ widget=MonWidget4a6RadioButton(self,maDefinition,monNom,monObjet,parentQt,maCommande)
else :
from monWidgetCB import MonWidgetCB
- widget=MonWidgetCB(self,maDefinition,monNom,monObjet,parentQt)
+ widget=MonWidgetCB(self,maDefinition,monNom,monObjet,parentQt,maCommande)
elif self.item.wait_bool() :
from monWidgetSimpBool import MonWidgetSimpBool
- widget=MonWidgetSimpBool(self,maDefinition,monNom,monObjet,parentQt)
+ widget=MonWidgetSimpBool(self,maDefinition,monNom,monObjet,parentQt,maCommande)
elif self.item.wait_fichier():
from monWidgetSimpFichier import MonWidgetSimpFichier
- widget=MonWidgetSimpFichier(self,maDefinition,monNom,monObjet,parentQt)
+ widget=MonWidgetSimpFichier(self,maDefinition,monNom,monObjet,parentQt,maCommande)
elif self.item.wait_tuple() :
# Pas fait
- from monWidgetSimpTuple import MonWidgetSimpTuple
- widget=MonWidgetSimpTuple(self,maDefinition,monNom,monObjet,parentQt)
+ if self.item.object.definition.type[0].ntuple == 2:
+ from monWidgetSimpTuple2 import MonWidgetSimpTuple2
+ widget=MonWidgetSimpTuple2(self,maDefinition,monNom,monObjet,parentQt,maCommande)
+ elif self.item.object.definition.type[0].ntuple == 3 :
+ from monWidgetSimpTuple3 import MonWidgetSimpTuple3
+ widget=MonWidgetSimpTuple3(self,maDefinition,monNom,monObjet,parentQt,maCommande)
+ else :
+ print "Pas fait"
elif self.item.wait_complex():
# Pas fait
from monWidgetSimpComplexe import MonWidgetSimpComplexe
- widget=MonWidgetSimpComplexe(self,maDefinition,monNom,monObjet,parentQt)
+ widget=MonWidgetSimpComplexe(self,maDefinition,monNom,monObjet,parentQt,maCommande)
elif self.item.wait_co():
# Pas fait
from monWidgetSimpASSD import MonWidgetSimpASSD
- widget=MonWidgetSimpASSD(self,maDefinition,monNom,monObjet,parentQt)
+ widget=MonWidgetSimpASSD(self,maDefinition,monNom,monObjet,parentQt,maCommande)
elif self.item.wait_Salome() and self.editor.salome:
# Pas fait
from monWidgetSimpSalome import MonWidgetSimpSalome
- widget=MonWidgetSimpSalome(self,maDefinition,monNom,monObjet,parentQt)
+ widget=MonWidgetSimpSalome(self,maDefinition,monNom,monObjet,parentQt,maCommande)
elif self.item.wait_TXM():
# Pas fait
from monWidgetSimpTxt import MonWidgetSimpTxt
- widget=MonWidgetSimpTxt(self,maDefinition,monNom,monObjet,parentQt)
+ widget=MonWidgetSimpTxt(self,maDefinition,monNom,monObjet,parentQt,maCommande)
else :
from monWidgetSimpBase import MonWidgetSimpBase
- widget=MonWidgetSimpBase(self,maDefinition,monNom,monObjet,parentQt)
+ widget=MonWidgetSimpBase(self,maDefinition,monNom,monObjet,parentQt,maCommande)
else :
if maDefinition.into != [] and maDefinition.into != None:
#Pas encore traité
from monWidgetPlusieursInto import MonWidgetPlusieursInto
- widget=MonWidgetPlusieursInto(self,maDefinition,monNom,monObjet,parentQt)
+ widget=MonWidgetPlusieursInto(self,maDefinition,monNom,monObjet,parentQt,maCommande)
else :
from monWidgetPlusieursBase import MonWidgetPlusieursBase
- widget=MonWidgetPlusieursBase(self,maDefinition,monNom,monObjet,parentQt)
+ widget=MonWidgetPlusieursBase(self,maDefinition,monNom,monObjet,parentQt,maCommande)
return widget
"""
La validation est realisee directement par l'objet
"""
- print self.object
- print item
- print self.object.valide_item
return self.object.valide_item(item)
def valide_liste_partielle(self,item,listecourante):
if self.jdc:
self.jdc.appli = self
self.jdc.lang = self.appli.langue
+ print self.jdc.lang
txt_exception = None
if not jdc:
self.jdc.analyse()
from acquiertGroupes import getGroupes
erreur,self.listeGroupes,self.nomMaillage,self.dicoCoord=getGroupes(self.fichierMED)
if erreur != "" : print "a traiter"
- #else :
- # from monBoutonSalome import MonBoutonSalome
- # desBoutonSalome = MonBoutonSalome()
- # icon = QIcon()
- # icon = QIcon(self.appli.repIcon+"/image240.png")
- # desBoutonSalome.pushButton.setIcon(icon)
- # desBoutonSalome.setMinimumSize(QtCore.QSize(453, 103))
-
- # self.openfile=QFileDialog(self.appli,caption='Fichier Med',filter=extensions)
- # self.openfile.layout().addWidget(desBoutonSalome)
- # self.connect(desBoutonSalome.pushButton,SIGNAL("clicked()"),self.BoutonSalomePressed)
- # self.connect(self.openfile,SIGNAL("fileSelected(QString)"),self.BoutonFileSelected)
- # r=self.openfile.exec_()
texteComm="COMMENTAIRE(u'Cree - fichier : "+self.fichierMED +" - Nom Maillage : "+self.nomMaillage+"');\nPARAMETRES()\n"
texteSources=""
texteCond=""
texteNoCond=""
texteVcut=""
+ texteZs=""
for groupe in self.listeGroupes :
if groupe[0:8]=='CURRENT_':
texteSources +=groupe[8:]+"=SOURCE("
if groupe[0:5]=='COND_': texteCond +=groupe[5:]+"=CONDUCTEUR();\n"
if groupe[0:7]=='NOCOND_': texteNoCond +=groupe[7:]+"=NOCOND();\n"
if groupe[0:5]=='VCUT_': texteVcut +='V_'+groupe[5:]+"=VCUT();\n"
- texte=texteComm+texteSources+texteCond+texteNoCond+texteVcut
+ if groupe[0:3]=='ZS_': texteZs +=groupe[3:]+"=ZS();\n"
+ texte=texteComm+texteSources+texteCond+texteNoCond+texteVcut+texteZs
self.newTexteCND=texte
self.modified=1
return texte
from gereIcones import FacultatifOuOptionnel
from qtSaisie import SaisieValeur
+nomMax=26
# ---------------------------------------------------------------------- #
class Feuille(QWidget,ContientIcones,SaisieValeur,FacultatifOuOptionnel):
# --------------------------------------------------------------------- #
- def __init__(self,node,monSimpDef,nom,objSimp,parentQt):
+ def __init__(self,node,monSimpDef,nom,objSimp,parentQt,commande):
#print "Feuille", monSimpDef,nom,objSimp
QWidget.__init__(self,None)
self.node=node
self.nom=nom
self.objSimp=objSimp
self.node.fenetre=self
+ self.maCommande=commande
self.aRedimensionner=0
self.setSuggestion()
def setNom(self):
self.debutToolTip=""
- if len(self.objSimp.nom) >= 17 :
- nom=self.objSimp.nom[0:15]+'...'
- self.label.setText(nom)
- self.debutToolTip=self.objSimp.nom+"\n"
+ nomTraduit=tr(self.objSimp.nom)
+ if len(nomTraduit) >= nomMax :
+ nom=nomTraduit[0:nomMax]+'...'
+ self.label.setText(nomTraduit)
+ self.debutToolTip=nomTraduit+"\n"
else :
- self.label.setText(self.objSimp.nom)
+ self.label.setText(nomTraduit)
def setValeurs(self):
if hasattr(self,'lineEditVal'): self.lineEditVal.setToolTip(suggere)
def setCommentaire(self):
- #print "dans setCommentaire"
-
c = self.debutToolTip
+ if self.node.item.definition.validators : c+=self.node.item.definition.validators.aide()
if self.objSimp.get_fr() != None and self.objSimp.get_fr() != "":
- c2 = '<html><head/><body><p><span style=" font-size:8pt;">'+c+str(self.objSimp.get_fr())+"</span></p></body></html>"
+ c2 = '<html><head/><body><p>'+c+str(self.objSimp.get_fr())+"</p></body></html>"
self.label.setToolTip(c2)
else :
c+=self.finCommentaire()
if c != "" and c != None :
- c=str('<html><head/><body><p><span style=" font-size:8pt; ">')+c+"</span></p></body></html>"
+ #c=str('<html><head/><body><p><span style=" font-size:8pt; ">')+c+"</span></p></body></html>"
+ c=str('<html><head/><body><p>')+c+"</p></body></html>"
self.label.setToolTip(c)
def setIcones(self):
if ( hasattr(self,"BFichier")):
if mctype == "Repertoire":
self.BRepertoire=self.BFichier
- #icon = QIcon(self.repIcon+"/fichier.png")
- #self.BRepertoire.setIcon(icon)
self.connect(self.BRepertoire,SIGNAL("clicked()"),self.BRepertoirePressed)
- #self.BVisuFichier.close()
else :
#icon = QIcon(self.repIcon+"/visuFichier.png")
- #self.BVisuFichier.setIcon(icon)
self.connect(self.BFichier,SIGNAL("clicked()"),self.BFichierPressed)
self.connect(self.BVisuFichier,SIGNAL("clicked()"),self.BFichierVisu)
return
(hasattr(mctype, "enable_salome_selection") and mctype.enable_salome_selection))
if enable_salome_selection:
self.connect(self.BSalome,SIGNAL("pressed()"),self.BSalomePressed)
- #icon = QIcon(self.repIcon+"/flecheSalome.png")
- #self.BSalome.setIcon(icon)
if not(('grma' in repr(mctype)) or ('grno' in repr(mctype))) or not(self.editor.salome):
self.BView2D.close()
else :
- #icon = QIcon(self.repIcon+"/salomeLoupe.png")
- #self.BView2D.setIcon(icon)
self.connect(self.BView2D,SIGNAL("clicked()"),self.BView2DPressed)
else:
self.BSalome.close()
except :
pass
if listeRegles==() and hasattr(self,"RBRegle"): self.RBRegle.close()
- if isinstance(self,MonWidgetCommande):return
- cle_doc = self.node.item.get_docu()
- if cle_doc == None and hasattr(self,"RBInfo") : self.RBInfo.close()
+ cle_doc=None
+ if not hasattr(self,"RBInfo"):return
+ if isinstance(self,MonWidgetCommande) and self.editor.code =="MAP":
+ self.cle_doc = self.chercheDocMAP()
+ else :
+ self.cle_doc = self.node.item.get_docu()
+ if self.cle_doc == None : self.RBInfo.close()
+ else : self.connect (self.RBInfo,SIGNAL("clicked()"),self.viewDoc)
+ def chercheDocMAP(self):
+ try :
+ clef=self.editor.CONFIGURATION.adresse+"/"
+ except :
+ return None
+ for k in self.editor.readercata.cata[0].JdC.dict_groupes.keys():
+ if self.obj.nom in self.editor.readercata.cata[0].JdC.dict_groupes[k]:
+ clef+=k
+ break
+ clef+="/"+ self.obj.nom[0:-5].lower()+"/spec_"+self.obj.nom[0:-5].lower()+".html"
+
+ return clef
+ def viewDoc(self):
+ try :
+ cmd="xdg-open "+self.cle_doc
+ os.system(cmd)
+ except:
+ QMessageBox.warning( self,tr( "Aide Indisponible"),tr( "l'aide n est pas installee "))
+
+
def setPoubelle(self):
if not(hasattr(self,"RBPoubelle")):return
if self.node.item.object.isoblig() :
self.node.delete()
def setValide(self):
+ #print " c est le moment de gerer le passage au suivant"
if not(hasattr (self,'RBValide')) : return
icon = QIcon()
if self.node.item.object.isvalid() :
def echange(self,num1,num2):
# on donne le focus au a celui ou on a bouge
# par convention le 2
- nomLineEdit="labelVal"+str(num1)
- print nomLineEdit
+ nomLineEdit="lineEditVal"+str(num1)
+ #print nomLineEdit
courant=getattr(self,nomLineEdit)
valeurAGarder=courant.text()
- nomLineEdit2="labelVal"+str(num2)
- print nomLineEdit2
+ nomLineEdit2="lineEditVal"+str(num2)
+ #print nomLineEdit2
courant2=getattr(self,nomLineEdit2)
courant.setText(courant2.text())
courant2.setText(valeurAGarder)
self.LineEditEnCours=courant2
def moinsPushed(self):
+ if self.indexDernierLabel < self.monSimpDef.min:
+ self.editor.affiche_infos('nb min de valeurs : '+str(self.monSimpDef.min)+' atteint')
+ return
# on supprime le dernier
if self.NumLineEditEnCours==self.indexDernierLabel :
self.setText("")
else :
for i in range (self.NumLineEditEnCours, self.indexDernierLabel):
aRemonter=i+1
- nomLineEdit="labelVal"+str(aRemonter)
+ nomLineEdit="lineEditVal"+str(aRemonter)
courant=getattr(self,nomLineEdit)
valeurARemonter=courant.text()
- nomLineEdit="labelVal"+str(i)
+ nomLineEdit="lineEditVal"+str(i)
courant=getattr(self,nomLineEdit)
courant.setText(valeurARemonter)
- nomLineEdit="labelVal"+str(self.indexDernierLabel)
+ nomLineEdit="lineEditVal"+str(self.indexDernierLabel)
courant=getattr(self,nomLineEdit)
courant.setText("")
self.changeValeur(changeDePlace=False)
def plusPushed(self):
+ if self.indexDernierLabel == self.monSimpDef.max:
+ self.editor.affiche_infos('nb max de valeurs : '+str(self.monSimpDef.max)+' atteint')
+ return
self.ajoutLineEdit()
if self.NumLineEditEnCours==self.indexDernierLabel : return
- nomLineEdit="labelVal"+str(self.NumLineEditEnCours+1)
+ nomLineEdit="lineEditVal"+str(self.NumLineEditEnCours+1)
courant=getattr(self,nomLineEdit)
valeurADescendre=courant.text()
courant.setText("")
for i in range (self.NumLineEditEnCours+1, self.indexDernierLabel):
aDescendre=i+1
- nomLineEdit="labelVal"+str(aDescendre)
+ nomLineEdit="lineEditVal"+str(aDescendre)
courant=getattr(self,nomLineEdit)
valeurAGarder=courant.text()
courant.setText(valeurADescendre)
class Groupe(QtGui.QWidget,FacultatifOuOptionnel):
"""
"""
- def __init__(self,node,editor,parentQt,definition,obj,niveau):
+ def __init__(self,node,editor,parentQt,definition,obj,niveau,commande=None):
QtGui.QWidget.__init__(self,None)
self.node=node
self.node.fenetre=self
self.niveau=niveau
self.definition=definition
self.parentQt=parentQt
+ self.maCommande=commande
self.listeFocus=[]
self.appliEficas=self.editor.appliEficas
self.repIcon=self.appliEficas.repIcon
# print "pas ", node.item.nom
# continue
if hasattr(self.node,'appartientAUnNoeudPlie') and self.node.appartientAUnNoeudPlie==True : return
- else : widget=node.getPanelGroupe(self)
+ widget=node.getPanelGroupe(self,self.maCommande)
#print node
#print node.item.nom
self.listeFocus.append(node.fenetre)
if self.affiche_alpha==1 :
liste=self.CreeListeCommande(filtre)
for cmd in liste :
-#PNPNPN Possibilite de tr ?
- rbcmd=(QRadioButton(cmd))
+ rbcmd=(QRadioButton(tr(cmd)))
self.buttonGroup.addButton(rbcmd)
self.commandesLayout.addWidget(rbcmd)
rbcmd.mouseDoubleClickEvent=self.mouseDoubleClickEvent
for grp in listeGroupes:
if grp == "CACHE" : continue
label=QLabel(self)
- text=QString.fromUtf8('<html><head/><body><p><span style=\" font-weight:600;\">Groupe : '+grp+'</span></p></body></html>')
+ text=QString.fromUtf8('<html><head/><body><p><span style=\" font-weight:600;\">Groupe : '+tr(grp)+'</span></p></body></html>')
label.setText(text)
self.listeWidget.append(label)
aAjouter=1
if aAjouter == 1 :
self.commandesLayout.addWidget(label)
aAjouter=0
- rbcmd=(QRadioButton(cmd))
+ rbcmd=(QRadioButton(tr(cmd)))
self.buttonGroup.addButton(rbcmd)
self.commandesLayout.addWidget(rbcmd)
rbcmd.mouseDoubleClickEvent=self.mouseDoubleClickEvent
self.nodeSurligne=None
def suivantClicked(self):
- if self.motAChercher!=self.LERecherche.text(): self.recherche()
+ #if self.motAChercher!=self.LERecherche.text(): self.recherche()
if self.listeTrouvee=={} : return
if self.surLigne > len(self.listeTrouvee) -1 : return
if self.nodeSurligne!=None : self.nodeSurligne.update_node_texte_in_black()
#self.listeTrouvee[self.surLigne].update_node_texte_in_blue()
#self.nodeSurligne=self.listeTrouvee[self.surLigne]
self.listeTrouvee[self.surLigne].select()
- self.listeTrouvee[self.surLigne].select()
self.listeTrouvee[self.surLigne].affichePanneau()
self.surLigne=self.surLigne+1
self.PBSuivant.setFocus()
self.motAChercher=self.LERecherche.text()
self.listeTrouvee=self.tree.findItems(self.motAChercher,Qt.MatchContains|Qt.MatchRecursive,1)
self.surLigne=0
- self.suivantClicked()
class MonWidget4a6RadioButton (Ui_Widget4a6RadioButton,MonWidgetRadioButtonCommun):
- def __init__(self,node,monSimpDef,nom,objSimp,parentQt):
- MonWidgetRadioButtonCommun.__init__(self,node,monSimpDef,nom,objSimp,parentQt)
+ def __init__(self,node,monSimpDef,nom,objSimp,parentQt,commande):
+ #print "dans le init de MonWidget4a6RadioButton"
+ MonWidgetRadioButtonCommun.__init__(self,node,monSimpDef,nom,objSimp,parentQt,commande)
def setMaxI(self):
self.maxI=6
class MonWidgetBloc(Ui_WidgetBloc,Groupe):
"""
"""
- def __init__(self,node,editor,parentQt,definition, obj, niveau):
- Groupe.__init__(self,node,editor,parentQt, definition,obj,niveau)
+ def __init__(self,node,editor,parentQt,definition, obj, niveau,commande):
+ Groupe.__init__(self,node,editor,parentQt, definition,obj,niveau,commande)
self.parentQt.commandesLayout.insertWidget(-1,self)
class MonWidgetCB (Ui_WidgetCB,Feuille):
- def __init__(self,node,monSimpDef,nom,objSimp,parentQt):
- Feuille.__init__(self,node,monSimpDef,nom,objSimp,parentQt)
+ def __init__(self,node,monSimpDef,nom,objSimp,parentQt,commande):
+ Feuille.__init__(self,node,monSimpDef,nom,objSimp,parentQt,commande)
self.politique=PolitiqueUnique(self.node,self.editor)
self.determineChoix()
self.setValeursApresBouton()
self.connect(self.CBChoix,SIGNAL("currentIndexChanged(int)"),self.ChoixSaisi)
self.parentQt.commandesLayout.insertWidget(-1,self)
+ self.maCommande.listeAffichageWidget.append(self.CBChoix)
def setValeursApresBouton(self):
if self.objSimp.get_valeur()==None :
"""
def __init__(self,node,editor,etape):
#print "MonWidgetCommande ", self
- Groupe.__init__(self,node,editor,None,etape.definition,etape,1)
+ self.listeAffichageWidget=[]
+ self.inhibe=0
+ Groupe.__init__(self,node,editor,None,etape.definition,etape,1,self)
if (etape.get_type_produit()==None): self.LENom.close()
elif (hasattr (etape, 'sdnom')) and etape.sdnom != "sansnom" : self.LENom.setText(etape.sdnom)
else : self.LENom.setText("")
maPolice= QFont("Times", 10,)
self.setFont(maPolice)
self.repIcon=self.appliEficas.repIcon
- self.labelNomCommande.setText(self.obj.nom)
+ self.labelNomCommande.setText(tr(self.obj.nom))
self.commandesLayout.addStretch()
self.commandesLayout.focusInEvent=self.focusInEvent
self.scrollAreaCommandes.focusInEvent=self.focusInEvent
#self.RBValide.focusInEvent=FacultatifOuOptionnel.focusInEvent
- self.connect(self.bCatalogue,SIGNAL("clicked()"), self.afficheCatalogue)
+ if self.editor.code in ['MAP','Adao','CARMELCND'] : self.bCatalogue.close()
+ else : self.connect(self.bCatalogue,SIGNAL("clicked()"), self.afficheCatalogue)
self.connect(self.LENom,SIGNAL("returnPressed()"),self.nomChange)
self.racine=self.node.tree.racine
if self.node.item.GetIconName() == "ast-red-square" : self.LENom.setDisabled(True)
self.setAcceptDrops(True)
+ self.etablitOrdre()
+
+ if self.editor.code == "CARMELCND" : return #Pas de MC Optionnels pour Carmel
from monWidgetOptionnel import MonWidgetOptionnel
if hasattr(self.editor,'widgetOptionnel') :
self.monOptionnel=self.editor.widgetOptionnel
self.afficheOptionnel()
+ def focusNextPrevChild(self, next):
+ print "je passe dans focusNextPrevChild"
+ print self.focusWidget().objectName()
+ try :
+ i= self.listeAffichageWidget.index(self.focusWidget())
+ except :
+ i = -1
+ if (i==len(self.listeAffichageWidget) -1) and next and not self.inhibe:
+ self.listeAffichageWidget[1].setFocus(7)
+ w=self.focusWidget()
+ self.inhibe=1
+ w.focusPreviousChild()
+ self.inhibe=0
+ return True
+ if i==0 and next==False and not self.inhibe:
+ if hasattr(self.editor.fenetreCentraleAffichee,'scrollArea'):
+ self.editor.fenetreCentraleAffichee.scrollArea.ensureWidgetVisible(self.listeAffichageWidget[-1])
+ self.listeAffichageWidget[-2].setFocus(7)
+ self.inhibe=1
+ w=self.focusWidget()
+ w.focusNextChild()
+ self.inhibe=0
+ return True
+ return QWidget.focusNextPrevChild(self, next)
+
+ def etablitOrdre(self):
+ i=0
+ for l in self.listeAffichageWidget:
+ print l.objectName()
+ while(i +1 < len(self.listeAffichageWidget)):
+ self.setTabOrder(self.listeAffichageWidget[i],self.listeAffichageWidget[i+1])
+ i=i+1
+ # si on boucle on perd l'ordre
+
def nomChange(self):
nom = str(self.LENom.text())
nom = string.strip(nom)
def focusInEvent(self,event):
#print "je mets a jour dans focusInEvent de monWidget Commande "
+ if self.editor.code == "CARMELCND" : return #Pas de MC Optionnels pour Carmel
self.afficheOptionnel()
self.editor.fenetreCentraleAffichee.scrollAreaCommandes.ensureWidgetVisible(f)
def afficheCatalogue(self):
- self.monOptionnel.hide()
+ if self.editor.code != "CARMELCND" : self.monOptionnel.hide()
self.racine.affichePanneau()
if self.node : self.node.select()
else : self.racine.select()
class MonWidgetFact(Ui_WidgetFact,Groupe):
"""
"""
- def __init__(self,node,editor,parentQt,definition, obj, niveau):
+ def __init__(self,node,editor,parentQt,definition, obj, niveau,commande):
#print "init de Fact"
- Groupe.__init__(self,node,editor,parentQt, definition,obj,niveau)
+ Groupe.__init__(self,node,editor,parentQt, definition,obj,niveau,commande)
labeltext,fonte,couleur = self.node.item.GetLabelText()
- #self.groupBox.setTitle(labeltext)
- self.GroupBox.setText(labeltext)
+ self.GroupBox.setText(tr(labeltext))
self.GroupBox.setTextInteractionFlags(Qt.TextSelectableByMouse)
self.parentQt.commandesLayout.insertWidget(-1,self)
def focusInEvent(self,event):
print "je passe dans focusInEvent"
- self.afficheOptionnel()
+ if self.editor.code != "CARMELCND" :self.afficheOptionnel()
class MonWidgetFactPlie(Ui_WidgetFactPlie,Groupe):
"""
"""
- def __init__(self,node,editor,parentQt,definition, obj, niveau):
+ def __init__(self,node,editor,parentQt,definition, obj, niveau,commande):
print "init de FactPlie"
- Groupe.__init__(self,node,editor,parentQt, definition,obj,niveau)
+ Groupe.__init__(self,node,editor,parentQt, definition,obj,niveau,commande)
self.groupBox.setText(self.obj.nom)
self.parentQt.commandesLayout.insertWidget(-1,self)
def affiche(self,liste):
self.show()
labeltext,fonte,couleur = self.parentMC.node.item.GetLabelText()
- self.GeneaLabel.setText(tr("Options pour \n") +labeltext)
+ l=labeltext
+ li=[]
+ while len(l) > 25:
+ li.append(l[0:24])
+ l=l[24:]
+ li.append(l)
+ texte=""
+ for l in li : texte+=l+"\n"
+ texte=texte[0:-2]
+ self.GeneaLabel.setText(tr("Options pour \n") +texte)
for cb in self.dicoCb.keys():
cb.close()
from gereListe import GereListe
from gereListe import LECustom
+dicoLongueur={2:95,3:125,4:154,5:183,6:210}
+hauteurMax=253
+
class MonWidgetPlusieursBase (Ui_WidgetPlusieursBase,Feuille,GereListe):
- def __init__(self,node,monSimpDef,nom,objSimp,parentQt):
+ def __init__(self,node,monSimpDef,nom,objSimp,parentQt,commande):
#print "MonWidgetPlusieursBase", nom
self.index=1
self.indexDernierLabel=0
- Feuille.__init__(self,node,monSimpDef,nom,objSimp,parentQt)
+ Feuille.__init__(self,node,monSimpDef,nom,objSimp,parentQt,commande)
GereListe.__init__(self)
self.listeValeursCourantes=self.node.item.GetListeValeurs()
+ if self.monSimpDef.max != "**" and self.monSimpDef.max < 7:
+ hauteur=dicoLongueur[self.monSimpDef.max]
+ self.resize(self.width(),hauteur)
+ self.setMinimumHeight(hauteur)
+ if self.monSimpDef.max == self.monSimpDef.min : self.setMaximumHeight(hauteur)
+ else :
+ self.resize(self.width(),hauteurMax)
+ self.setMinimumHeight(hauteurMax)
self.parentQt.commandesLayout.insertWidget(1,self)
+ self.maCommande.listeAffichageWidget.append(self.lineEditVal1)
def setValeurs(self):
for i in range(1,aConstruire):
self.ajoutLineEdit()
qApp.processEvents()
- self.scrollArea.ensureWidgetVisible(self.labelVal1)
+ self.scrollArea.ensureWidgetVisible(self.lineEditVal1)
self.listeValeursCourantes=self.node.item.GetListeValeurs()
index=1
for valeur in self.listeValeursCourantes :
val=self.politique.GetValeurTexte(valeur)
- nomLineEdit="labelVal"+str(index)
+ nomLineEdit="lineEditVal"+str(index)
if hasattr(self,nomLineEdit) :
courant=getattr(self,nomLineEdit)
courant.setText(str(val))
def ajoutLineEdit(self,valeur=None):
self.indexDernierLabel=self.indexDernierLabel+1
- nomLineEdit="labelVal"+str(self.indexDernierLabel)
+ nomLineEdit="lineEditVal"+str(self.indexDernierLabel)
if hasattr(self,nomLineEdit) :
self.indexDernierLabel=self.indexDernierLabel-1
return
derniereValeur=None
self.listeValeursCourantes = []
for i in range (1, self.indexDernierLabel+1):
- nomLineEdit="labelVal"+str(i)
+ nomLineEdit="lineEditVal"+str(i)
courant=getattr(self,nomLineEdit)
valeur=courant.text()
if valeur != None and valeur != "" :
courant.setText("")
donneFocus=courant
elif donneFocus==None : donneFocus=courant
- nomDernierLineEdit="labelVal"+str(self.indexDernierLabel)
+ nomDernierLineEdit="lineEditVal"+str(self.indexDernierLabel)
dernier=getattr(self,nomDernierLineEdit)
derniereValeur=dernier.text()
if changeDePlace:
elif self.indexDernierLabel < self.monSimpDef.max :
self.ajoutLineEdit()
if self.indexDernierLabel == self.monSimpDef.max :
- self.scrollArea.setToolTip('nb max de valeurs atteint')
self.editor.affiche_infos('nb max de valeurs atteint')
if self.listeValeursCourantes == [] : return
min,max = self.node.item.GetMinMax()
class MonWidgetPlusieursInto (Ui_WidgetPlusieursInto,Feuille):
- def __init__(self,node,monSimpDef,nom,objSimp,parentQt):
+ def __init__(self,node,monSimpDef,nom,objSimp,parentQt,commande):
#print "MonWidgetPlusieursInto", nom
self.index=1
- Feuille.__init__(self,node,monSimpDef,nom,objSimp,parentQt)
+ Feuille.__init__(self,node,monSimpDef,nom,objSimp,parentQt,commande)
self.listeValeursCourantes=self.node.item.GetListeValeurs()
self.parentQt.commandesLayout.insertWidget(-1,self)
+ self.maCommande.listeAffichageWidget.append(self.lineEditVal1)
def setValeurs(self):
for i in range(1,len(self.listeAAfficher)+1):
self.ajoutCB(i)
for i in range(len(self.listeAAfficher)):
- nomCB="labelVal"+str(i+1)
+ nomCB="lineEditVal"+str(i+1)
courant=getattr(self,nomCB)
courant.setText(str(self.listeAAfficher[i]))
if self.monSimpDef.into[i] in self.listeValeursCourantes :
def ajoutCB(self,index,valeur=None):
- nomCB="labelVal"+str(index)
+ nomCB="lineEditVal"+str(index)
if hasattr(self,nomCB) :
return
nouveauCB = QCheckBox(self.scrollArea)
def changeValeur(self,etat):
self.listeValeursCourantes = []
for i in range (1,len(self.monSimpDef.into)+1):
- nomLineEdit="labelVal"+str(i)
+ nomLineEdit="lineEditVal"+str(i)
courant=getattr(self,nomLineEdit)
if not (courant.isChecked()):continue
valeur=courant.text()
from qtSaisie import SaisieValeur
-
class MonWidgetRadioButtonCommun (Feuille):
- def __init__(self,node,monSimpDef,nom,objSimp,parentQt):
+ def __init__(self,node,monSimpDef,nom,objSimp,parentQt,commande):
self.setMaxI()
- #print "dans MonWidgetRadioButtonCommun", self.maxI
- Feuille.__init__(self,node,monSimpDef,nom,objSimp,parentQt)
+ Feuille.__init__(self,node,monSimpDef,nom,objSimp,parentQt,commande)
self.politique=PolitiqueUnique(self.node,self.editor)
self.dict_bouton={}
self.determineChoix()
self.setValeursApresBouton()
self.parentQt.commandesLayout.insertWidget(-1,self)
+ self.maCommande.listeAffichageWidget.append(self.radioButton_1)
def setValeursApresBouton(self):
bouton.setText(valeur)
self.dict_bouton[valeur]=bouton
self.connect(bouton,SIGNAL("clicked()"),self.boutonclic)
+ bouton.keyPressEvent=self.keyPressEvent
+ setattr(self,nomBouton,bouton)
i=i+1
while i < self.maxI +1 :
nomBouton="radioButton_"+str(i)
SaisieValeur.LEValeurPressed(self,valeur)
self.parentQt.reaffiche()
+
+ def keyPressEvent(self, event):
+ if event.key() == Qt.Key_Right : self.selectSuivant(); return
+ if event.key() == Qt.Key_Left : self.selectPrecedent(); return
+ QWidget.keyPressEvent(self,event)
+
+ def selectSuivant(self):
+ aLeFocus=self.focusWidget()
+ nom=aLeFocus.objectName()[12:]
+ i=nom.toInt()[0]+1
+ if i == len(self.monSimpDef.into) +1 : i=1
+ nomBouton="radioButton_"+str(i)
+ courant=getattr(self,nomBouton)
+ courant.setFocus(True)
+
+ def selectPrecedent(self):
+ aLeFocus=self.focusWidget()
+ nom=aLeFocus.objectName()[12:]
+ i=nom.toInt()[0]-1
+ print i
+ if i == 0 : i= len(self.monSimpDef.into)
+ print i
+ print "_______"
+ nomBouton="radioButton_"+str(i)
+ courant=getattr(self,nomBouton)
+ courant.setFocus(True)
+
+
class MonWidgetRadioButton (Ui_WidgetRadioButton,MonWidgetRadioButtonCommun):
- def __init__(self,node,monSimpDef,nom,objSimp,parentQt):
- MonWidgetRadioButtonCommun.__init__(self,node,monSimpDef,nom,objSimp,parentQt)
+ def __init__(self,node,monSimpDef,nom,objSimp,parentQt,commande):
+ MonWidgetRadioButtonCommun.__init__(self,node,monSimpDef,nom,objSimp,parentQt,commande)
def setMaxI(self):
self.maxI=3
class MonWidgetSimpBase (Ui_WidgetSimpBase,Feuille):
- def __init__(self,node,monSimpDef,nom,objSimp,parentQt):
- Feuille.__init__(self,node,monSimpDef,nom,objSimp,parentQt)
+ def __init__(self,node,monSimpDef,nom,objSimp,parentQt,commande):
+ Feuille.__init__(self,node,monSimpDef,nom,objSimp,parentQt,commande)
self.parentQt.commandesLayout.insertWidget(-1,self)
self.setFocusPolicy(Qt.StrongFocus)
self.connect(self.lineEditVal,SIGNAL("returnPressed()"),self.LEValeurPressed)
+ self.maCommande.listeAffichageWidget.append(self.lineEditVal)
def showEvent(self, event):
if self.prendLeFocus==1 :
valeur=self.node.item.get_valeur()
valeurTexte=self.politique.GetValeurTexte(valeur)
chaine=QString("")
+
if valeurTexte != None :
from decimal import Decimal
if isinstance(valeurTexte,Decimal):
elif repr(valeurTexte.__class__).find("PARAMETRE") > 0:
chaine = QString(repr(valeur))
else :
- try :
- chaine=QString("").setNum(valeurTexte)
- except :
- chaine=QString(str(valeurTexte))
+ #PN ????
+ #try :
+ # chaine=QString("").setNum(valeurTexte)
+ #except :
+ chaine=QString(str(valeurTexte))
self.lineEditVal.setText(chaine)
def LEValeurPressed(self):
- print "LEValeurPressed"
- print SaisieValeur.LEValeurPressed
+ if str(self.lineEditVal.text())=="" or str(self.lineEditVal.text())==None : return
SaisieValeur.LEValeurPressed(self)
self.parentQt.donneFocus()
+ self.setValeurs()
- print "je suis la aussi"
- #PNPNPN - pas fait
#if self.objSimp.parent.nom == "MODEL" :
# if self.objSimp.isvalid():
# self.objSimp.parent.change_fichier="1"
class MonWidgetSimpBool (Ui_WidgetSimpBool,Feuille):
- def __init__(self,node,monSimpDef,nom,objSimp,parentQt):
- Feuille.__init__(self,node,monSimpDef,nom,objSimp,parentQt)
+ def __init__(self,node,monSimpDef,nom,objSimp,parentQt,commande):
+ Feuille.__init__(self,node,monSimpDef,nom,objSimp,parentQt,commande)
self.politique=PolitiqueUnique(self.node,self.editor)
self.connect(self.RBTrue,SIGNAL("clicked()"),self.boutonTrueClic)
self.connect(self.RBFalse,SIGNAL("clicked()"),self.boutonFalseClic)
self.parentQt.commandesLayout.insertWidget(-1,self)
+ self.maCommande.listeAffichageWidget.append(self.RBTrue)
def setValeurs(self):
valeur=self.node.item.get_valeur()
class MonWidgetSimpComplexe (Ui_WidgetSimpComplexe,Feuille):
- def __init__(self,node,monSimpDef,nom,objSimp,parentQt):
- Feuille.__init__(self,node,monSimpDef,nom,objSimp,parentQt)
+ def __init__(self,node,monSimpDef,nom,objSimp,parentQt,commande):
+ Feuille.__init__(self,node,monSimpDef,nom,objSimp,parentQt,commande)
self.parentQt.commandesLayout.insertWidget(-1,self)
self.setFocusPolicy(Qt.StrongFocus)
self.connect(self.LEImag,SIGNAL("returnPressed()"),self.LEImagRPressed)
self.connect(self.RBRI,SIGNAL("clicked()"), self.ValeurPressed )
self.connect(self.RBMP,SIGNAL("clicked()"), self.ValeurPressed )
self.connect(self.LEComp,SIGNAL("returnPressed()"),self.LECompRPressed)
+ self.maCommande.listeAffichageWidget.append(self.LEComp)
+ #self.maCommande.listeAffichageWidget.append(self.RBRI)
+ #self.maCommande.listeAffichageWidget.append(self.RBMP)
+ #self.maCommande.listeAffichageWidget.append(self.LEReel)
+ #self.maCommande.listeAffichageWidget.append(self.LEImag)
def setValeurs(self):
class MonWidgetSimpFichier (Ui_WidgetSimpFichier,MonWidgetSimpBase):
# c est juste la taille des differents widgets de base qui change
- def __init__(self,node,monSimpDef,nom,objSimp,parentQt):
- MonWidgetSimpBase.__init__(self,node,monSimpDef,nom,objSimp,parentQt)
+ def __init__(self,node,monSimpDef,nom,objSimp,parentQt,commande):
+ MonWidgetSimpBase.__init__(self,node,monSimpDef,nom,objSimp,parentQt,commande)
+ # deja fait dans MonWidgetSimpBase
+ #self.maCommande.listeAffichageWidget.append(self.lineEditVal)
class MonWidgetSimpTxt (Ui_WidgetSimpTxt,MonWidgetSimpBase):
# c est juste la taille des differents widgets de base qui change
- def __init__(self,node,monSimpDef,nom,objSimp,parentQt):
- MonWidgetSimpBase.__init__(self,node,monSimpDef,nom,objSimp,parentQt)
+ def __init__(self,node,monSimpDef,nom,objSimp,parentQt,commande):
+ MonWidgetSimpBase.__init__(self,node,monSimpDef,nom,objSimp,parentQt,commande)
+ # deja fait dans MonWidgetSimpBase
+ #self.maCommande.listeAffichageWidget.append(self.lineEditVal)
+ print self.lineEditVal
#
# Modules Python
import types, string
+from Accas import PARAMETRE
from Extensions.i18n import tr
if self.parent.modified == 'n' : self.parent.init_modif()
ancienne_val = self.node.item.get_valeur()
valeur,validite,commentaire =self.TesteUneValeur(valeurentree)
+ if validite and ('R' in self.node.item.object.definition.type) and not(isinstance(valeur,PARAMETRE)) :
+ s=valeurentree
+ if (s.find('.')== -1 and s.find('e')== -1 and s.find('E')==-1) : s=s+'.'
+ valeur,validite,commentaire =self.TesteUneValeur(s)
if validite :
validite=self.node.item.set_valeur(valeur)
if self.node.item.isvalid():
self.actionCode.setEnabled(True)
self.menuAide.addAction(self.actionCode)
- def MAP(self):
+
+ def ajoutExecution(self):
self.menuExecution = self.menubar.addMenu(QApplication.translate("Eficas", "Execution", None, QApplication.UnicodeUTF8))
self.actionExecution = QAction(self)
icon6 = QIcon(self.repIcon+"/roue.png")
self.actionExecution.setText(QApplication.translate("Eficas", "Execution ", None, QApplication.UnicodeUTF8))
self.connect(self.actionExecution,SIGNAL("activated()"),self.run)
+ def ajoutSauveExecution(self):
self.actionSaveRun = QAction(self)
icon7 = QIcon(self.repIcon+"/export_MAP.png")
- #icon7 = QIcon(self.repIcon+"/saveRun.png")
self.actionSaveRun.setIcon(icon7)
self.actionSaveRun.setObjectName("actionSaveRun")
self.menuExecution.addAction(self.actionSaveRun)
self.actionSaveRun.setText(QApplication.translate("Eficas", "Save Run", None, QApplication.UnicodeUTF8))
self.connect(self.actionSaveRun,SIGNAL("activated()"),self.saveRun)
- self.menuOptions = self.menubar.addMenu("menuOptions")
- self.menuOptions.addAction(self.actionParametres_Eficas)
- self.menuOptions.setTitle(tr("Options"))
+ def griserActionsStructures(self):
+ self.actionCouper.setEnabled(False)
+ self.actionColler.setEnabled(False)
+ self.actionCopier.setEnabled(False)
+ self.actionSupprimer.setEnabled(False)
+
+ def enleverNewInclude(self):
+ self.actionNouvel_Include.setVisible(False)
+
+ def enleverRechercherDsCatalogue(self):
+ self.actionRechercherDsCatalogue.setVisible(False)
def ZCRACKS(self):
+ self.enleverNewInclude()
self.toolBar.addSeparator()
- self.menuExecution = self.menubar.addMenu(QApplication.translate("Eficas", "Execution", None, QApplication.UnicodeUTF8))
- self.actionExecution = QAction(self)
- icon6 = QIcon(self.repIcon+"/compute.png")
- self.actionExecution.setIcon(icon6)
- self.actionExecution.setObjectName("actionExecution")
- self.menuExecution.addAction(self.actionExecution)
- if not(self.actionExecution in self.toolBar.actions()):
- self.toolBar.addAction(self.actionExecution)
- self.actionExecution.setText(QApplication.translate("Eficas", "Execution ", None, QApplication.UnicodeUTF8))
- self.connect(self.actionExecution,SIGNAL("activated()"),self.run)
+ self.ajoutExecution()
self.menuOptions = self.menubar.addMenu("menuOptions")
self.menuOptions.addAction(self.actionParametres_Eficas)
self.menuOptions.setTitle(tr("Options"))
+ def ADAO(self):
+ self.griserActionsStructures()
+ self.enleverNewInclude()
+ self.enleverRechercherDsCatalogue()
def ASTER(self) :
self.menuTraduction = self.menubar.addMenu("menuTraduction")
def CARMEL3D(self):
#if self.salome == 0 : return
+ self.enleverNewInclude()
self.menuMesh = self.menubar.addMenu("menuMesh")
self.menuMesh.setObjectName("Mesh")
self.menuMesh.addAction(self.actionChercheGrpMaille)
+ self.griserActionsStructures()
def CARMELCND(self):
- self.menuMesh = self.menubar.addMenu("Maillage")
- self.menuMesh.setObjectName("Mesh")
- self.menuMesh.addAction(self.actionChercheGrp)
- self.menuExecution = self.menubar.addMenu(QApplication.translate("Eficas", "Execution", None, QApplication.UnicodeUTF8))
- self.actionExecution = QAction(self)
- icon6 = QIcon(self.repIcon+"/compute.png")
- self.actionExecution.setIcon(icon6)
- self.actionExecution.setObjectName("actionExecution")
- self.menuExecution.addAction(self.actionExecution)
- if not(self.actionExecution in self.toolBar.actions()):
- self.toolBar.addAction(self.actionExecution)
- self.actionExecution.setText(QApplication.translate("Eficas", "Execution ", None, QApplication.UnicodeUTF8))
- self.connect(self.actionExecution,SIGNAL("activated()"),self.run)
+ self.enleverNewInclude()
+ self.enleverRechercherDsCatalogue()
+ self.ajoutExecution()
+ self.ajoutSauveExecution()
+ self.griserActionsStructures()
+
+ def MAP(self):
+ self.enleverNewInclude()
+ self.toolBar.addSeparator()
+ self.ajoutExecution()
+ self.ajoutSauveExecution()
+ self.menuOptions = self.menubar.addMenu("menuOptions")
+ self.menuOptions.addAction(self.actionParametres_Eficas)
+ self.menuOptions.setTitle(tr("Options"))
def ChercheGrpMesh(self):
def __init__(self):
pass
- def InitListBoxASSD(self):
- listeNomsSD = self.node.item.get_sd_avant_du_bon_type()
- for aSD in listeNomsSD:
- self.listBoxASSD.addItem( aSD)
- QObject.connect(self.listBoxASSD, SIGNAL("doubleClicked(QListWidgetItem*)" ), self.ClicASSD )
- min,max = self.node.item.GetMinMax()
- l= self.node.item.GetListeValeurs()
-
- if (min == 1 and min == max and len(listeNomsSD)==1 and (l==[] or l==None)):
- if ('R' not in self.node.item.get_type()) :
- self.listBoxASSD.setCurrentRow(0)
-
-
- def BuildLBValeurs(self):
- self.LBValeurs.clear()
- listeValeurs=self.node.item.GetListeValeurs()
- #print self.node.item.definition.validators
- for valeur in listeValeurs:
- try :
- val=self.politique.GetValeurTexte(valeur)
- except :
- val=valeur
- self.LBValeurs.addItem(str(val))
- if listeValeurs != None and listeValeurs != [] :
- self.LBValeurs.setCurrentRow(len(listeValeurs) - 1)
-
-
- def RemplitPanel(self,listeDejaLa=[],alpha=0):
- self.listBoxVal.clear()
- # Traitement particulier pour le validator VerifExistence
- # dont les valeurs possibles peuvent changer : into variable
- if hasattr(self.node.item.definition.validators,'set_MCSimp'):
- obj=self.node.item.getObject()
- self.node.item.definition.validators.set_MCSimp(obj)
- if self.node.item.isvalid() == 0 :
- liste=[]
- for item in listeDejaLa:
- if self.node.item.definition.validators.verif_item(item)==1:
- liste.append(item)
- self.node.item.set_valeur(liste)
- self.BuildLBValeurs()
- self.listeValeursCourantes=liste
- self.editor.affiche_infos(tr("Attention, valeurs modifiees"), Qt.red)
- listeDejaLa=liste
- lChoix=self.node.item.get_liste_possible(listeDejaLa)
- if ((len(lChoix) < 10 ) and (hasattr (self,'BAlpha'))) : self.BAlpha.close()
- if alpha==1 : lChoix.sort()
- for valeur in lChoix :
- self.listBoxVal.addItem( str(valeur) )
- if len(lChoix) == 1 :
- self.listBoxVal.setCurrentRow(0)
- self.listBoxVal.item(0).setSelected(1)
- self.bOk.setFocus()
-
-
- def ClicASSD(self):
- if self.listBoxASSD.currentItem()== None : return
- valeurQstring=self.listBoxASSD.currentItem().text()
- commentaire = tr("Valeur selectionnee : ")
- commentaire+=valeurQstring
- self.Commentaire.setText(commentaire)
- valeur=str(valeurQstring)
- validite,commentaire=self.politique.RecordValeur(valeur)
- self.Commentaire.setText(QString(commentaire))
- self.editor.affiche_infos(commentaire)
-
- def ClicValeur(self):
- if self.listBoxVal.currentItem()== None : return
- valeurQstring=self.listBoxVal.currentItem().text()
- valeur=str(valeurQstring)
- validite,commentaire=self.politique.RecordValeur(valeur)
- #self.Commentaire.setText(QString(commentaire))
- self.editor.affiche_infos(commentaire)
-
- def BOkPressed(self):
- if self.listBoxVal.currentItem()==None :
- commentaire = tr("Pas de valeur selectionnee" )
- self.Commentaire.setText(QString(commentaire))
- else :
- self.ClicValeur()
-
- def BOk2Pressed(self):
- if str(self.lineEditVal.text())== "" :
- commentaire = tr("Pas de valeur entree" )
- self.Commentaire.setText(QString(commentaire))
- else :
- self.LEValeurPressed()
def LEValeurPressed(self,valeur=None):
if valeur == None :
self.setValide()
- def TraiteLEValeurTuple(self) :
- listeValeurs=[]
- valeurBrute=str(self.LEValeur.text())
- listeValeursSplit=valeurBrute.split(',')
- for val in listeValeursSplit :
- try :
- valeur=eval(val,{})
- except :
- valeur=val
- listeValeurs.append(valeur)
- return listeValeurs
+ #def TraiteLEValeurTuple(self,valeurBrute=None) :
+ # listeValeurs=[]
+ # if valeurBrute== None :valeurBrute=str(self.LEValeur.text())
+ # listeValeursSplit=valeurBrute.split(',')
+ # for val in listeValeursSplit :
+ # try :
+ # valeur=eval(val,{})
+ # except :
+ # valeur=val
+ # listeValeurs.append(valeur)
+ # return listeValeurs
def TraiteLEValeur(self,valeurTraitee=None) :
# lit la chaine entree dans le line edit
return listeValeurs,1
-class SaisieSDCO :
- def __init__(self):
- pass
-
- def LESDCOReturnPressed(self):
- """
- Lit le nom donné par l'utilisateur au concept de type CO qui doit être
- la valeur du MCS courant et stocke cette valeur
- """
- self.editor.init_modif()
- anc_val = self.node.item.get_valeur()
- if anc_val != None:
- # il faut egalement propager la destruction de l'ancien concept
- self.node.item.delete_valeur_co(valeur=anc_val)
- # et on force le recalcul des concepts de sortie de l'etape
- self.node.item.object.etape.get_type_produit(force=1)
- # et le recalcul du contexte
- self.node.item.object.etape.parent.reset_context()
- nomConcept = str(self.LESDCO.text())
- if nomConcept == "" : return
-
- test,commentaire=self.node.item.set_valeur_co(nomConcept)
- if test:
- commentaire=tr("Valeur du mot-clef enregistree")
- self.node.update_node_valid()
- else :
- cr = self.node.item.get_cr()
- commentaire = tr("Valeur du mot-clef non autorisee :")+cr.get_mess_fatal()
- self.node.item.set_valeur_co(anc_val)
- self.Commentaire.setText(QString.fromUtf8(QString(commentaire)))
self.cata_info = ""
def info(self):
- return _(u": vérifie les types dans un tuple")
+ return _(u"tuple de la forme :")+str(self.typeDesTuples)
def info_erreur_liste(self):
- return _(u"Les types entrés ne sont pas permis")
+ return _(u"Les types ne sont pas : ") +str(self.typeDesTuples)
def default(self, valeur):
- # if valeur in self.liste : raise ValError("%s est un doublon" %
- # valeur)
return valeur
def is_list(self):
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>Aide</class>
- <widget class="QWidget" name="Aide" >
- <property name="geometry" >
+ <widget class="QWidget" name="Aide">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<height>480</height>
</rect>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string>Aide</string>
</property>
- <layout class="QGridLayout" name="gridLayout" >
- <item row="0" column="0" colspan="4" >
- <widget class="QTextBrowser" name="TB1" />
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0" colspan="4">
+ <widget class="QTextBrowser" name="TB1"/>
</item>
- <item row="1" column="0" >
- <widget class="QPushButton" name="PBIndex" >
- <property name="minimumSize" >
+ <item row="1" column="0">
+ <widget class="QPushButton" name="PBIndex">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
- <property name="text" >
+ <property name="text">
<string>Index</string>
</property>
</widget>
</item>
- <item row="1" column="1" >
- <widget class="QPushButton" name="PBBack" >
- <property name="enabled" >
+ <item row="1" column="1">
+ <widget class="QPushButton" name="PBBack">
+ <property name="enabled">
<bool>true</bool>
</property>
- <property name="minimumSize" >
+ <property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
- <property name="text" >
+ <property name="text">
<string>Back</string>
</property>
</widget>
</item>
- <item row="1" column="2" >
- <widget class="QPushButton" name="PBForward" >
- <property name="enabled" >
+ <item row="1" column="2">
+ <widget class="QPushButton" name="PBForward">
+ <property name="enabled">
<bool>true</bool>
</property>
- <property name="minimumSize" >
+ <property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
- <property name="text" >
+ <property name="text">
<string>Forward</string>
</property>
</widget>
</item>
- <item row="1" column="3" >
- <spacer name="spacer1" >
- <property name="orientation" >
+ <item row="1" column="3">
+ <spacer name="spacer1">
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>311</width>
<height>20</height>
</item>
</layout>
</widget>
- <layoutdefault spacing="6" margin="11" />
+ <layoutdefault spacing="6" margin="11"/>
<pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <tabstops>
+ <tabstop>PBIndex</tabstop>
+ <tabstop>PBBack</tabstop>
+ <tabstop>PBForward</tabstop>
+ <tabstop>TB1</tabstop>
+ </tabstops>
<resources/>
<connections/>
</ui>
<property name="leftMargin">
<number>0</number>
</property>
+ <property name="topMargin">
+ <number>2</number>
+ </property>
<property name="rightMargin">
<number>0</number>
</property>
+ <property name="bottomMargin">
+ <number>2</number>
+ </property>
<item>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<height>35</height>
</size>
</property>
+ <property name="focusPolicy">
+ <enum>Qt::StrongFocus</enum>
+ </property>
<property name="styleSheet">
<string notr="true">border : 0px</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QRadioButton" name="radioButton_1">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>32</height>
- </size>
- </property>
<property name="text">
<string>RadioButton</string>
</property>
</item>
<item>
<widget class="QRadioButton" name="radioButton_2">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
<property name="text">
<string>RadioButton</string>
</property>
</item>
<item>
<widget class="QRadioButton" name="radioButton_3">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
<property name="text">
<string>RadioButton</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<widget class="QRadioButton" name="radioButton_4">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>32</height>
- </size>
- </property>
<property name="text">
<string>RadioButton</string>
</property>
</item>
<item>
<widget class="QRadioButton" name="radioButton_5">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
<property name="text">
<string>RadioButton</string>
</property>
</item>
<item>
<widget class="QRadioButton" name="radioButton_6">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
<property name="text">
<string>RadioButton</string>
</property>
<height>31</height>
</size>
</property>
+ <property name="focusPolicy">
+ <enum>Qt::StrongFocus</enum>
+ </property>
<property name="styleSheet">
<string notr="true">border : 0px</string>
</property>
<header>monBoutonValide.h</header>
</customwidget>
</customwidgets>
+ <tabstops>
+ <tabstop>radioButton_1</tabstop>
+ <tabstop>radioButton_4</tabstop>
+ <tabstop>RBValide</tabstop>
+ <tabstop>RBPoubelle</tabstop>
+ </tabstops>
<resources/>
<connections/>
</ui>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
+ <property name="spacing">
+ <number>6</number>
+ </property>
<item>
<widget class="QFrame" name="frame_2">
<property name="sizePolicy">
<enum>QFrame::Raised</enum>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
+ <property name="spacing">
+ <number>0</number>
+ </property>
<item>
<spacer name="horizontalSpacer_5">
<property name="orientation">
<height>31</height>
</size>
</property>
+ <property name="focusPolicy">
+ <enum>Qt::ClickFocus</enum>
+ </property>
<property name="toolTip">
<string>Affiche le rapport de validité de la commande</string>
</property>
</widget>
</item>
<item>
- <spacer name="horizontalSpacer">
+ <spacer name="toto">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>162</width>
+ <width>2</width>
<height>40</height>
</size>
</property>
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
- <enum>QSizePolicy::Maximum</enum>
+ <enum>QSizePolicy::Ignored</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>78</width>
+ <width>2</width>
<height>40</height>
</size>
</property>
<height>31</height>
</size>
</property>
+ <property name="focusPolicy">
+ <enum>Qt::ClickFocus</enum>
+ </property>
<property name="toolTip">
<string>Lance un script associé à la commande</string>
</property>
<height>31</height>
</size>
</property>
+ <property name="focusPolicy">
+ <enum>Qt::ClickFocus</enum>
+ </property>
<property name="toolTip">
<string>ouvre un navigateur sur l'aide contextuelle</string>
</property>
<height>31</height>
</size>
</property>
+ <property name="focusPolicy">
+ <enum>Qt::ClickFocus</enum>
+ </property>
<property name="toolTip">
<string>affiche les régles de validité</string>
</property>
<height>31</height>
</size>
</property>
+ <property name="focusPolicy">
+ <enum>Qt::ClickFocus</enum>
+ </property>
<property name="toolTip">
<string>Détruit la commande</string>
</property>
<height>31</height>
</size>
</property>
+ <property name="focusPolicy">
+ <enum>Qt::ClickFocus</enum>
+ </property>
<property name="toolTip">
<string>Affiche les commandes possibles</string>
</property>
</string>
</property>
<property name="text">
- <string>&Catalogue</string>
+ <string>&Commandes</string>
</property>
<property name="shortcut">
<string>Shift+A, Alt+A, Alt+A, Alt+A</string>
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>WidgetCommentaire</class>
+ <widget class="QWidget" name="WidgetCommentaire">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>1031</width>
+ <height>203</height>
+ </rect>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="windowTitle">
+ <string>DCommandeUnique</string>
+ </property>
+ <property name="toolTip">
+ <string/>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">background-color : rgb(224,223,222);
+font : 'times' 9px</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <item>
+ <widget class="QFrame" name="frame_2">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::Box</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Raised</enum>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <spacer name="horizontalSpacer_5">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>13</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="MonBoutonValide" name="RBValide">
+ <property name="minimumSize">
+ <size>
+ <width>17</width>
+ <height>31</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>21</width>
+ <height>31</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>Affiche le rapport de validité de la commande</string>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">border : 0px</string>
+ </property>
+ <property name="text">
+ <string>...</string>
+ </property>
+ <property name="icon">
+ <iconset>
+ <normaloff>../../../../../../home/A96028/Install_EficasV1/ArbreEficas/Editeur/icons/ast-green-ball.png</normaloff>../../../../../../home/A96028/Install_EficasV1/ArbreEficas/Editeur/icons/ast-green-ball.png</iconset>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>21</width>
+ <height>31</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_3">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>13</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QLabel" name="labelNomCommande">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>150</width>
+ <height>31</height>
+ </size>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Raised</enum>
+ </property>
+ <property name="text">
+ <string><html><head/><body><p><span style=" color:#0000ff;">Commentaire</span></p></body></html></string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Maximum</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>78</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QToolButton" name="RBPoubelle">
+ <property name="minimumSize">
+ <size>
+ <width>21</width>
+ <height>31</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>21</width>
+ <height>31</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>Détruit la commande</string>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">border : 0px</string>
+ </property>
+ <property name="text">
+ <string>...</string>
+ </property>
+ <property name="icon">
+ <iconset>
+ <normaloff>../../../../../../home/A96028/Install_EficasV1/ArbreEficas/Editeur/icons/deleteRond.png</normaloff>../../../../../../home/A96028/Install_EficasV1/ArbreEficas/Editeur/icons/deleteRond.png</iconset>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>21</width>
+ <height>31</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ <zorder>RBValide</zorder>
+ <zorder>labelNomCommande</zorder>
+ <zorder>horizontalSpacer_3</zorder>
+ <zorder>RBPoubelle</zorder>
+ <zorder>horizontalSpacer_5</zorder>
+ </widget>
+ </item>
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout_4">
+ <property name="spacing">
+ <number>0</number>
+ </property>
+ <property name="sizeConstraint">
+ <enum>QLayout::SetFixedSize</enum>
+ </property>
+ <item>
+ <spacer name="verticalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>5</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="bCatalogue">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>160</width>
+ <height>31</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>Affiche les commandes possibles</string>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">background-color:rgb(104,110,149);
+color :white;
+border-radius : 12px
+</string>
+ </property>
+ <property name="text">
+ <string>&Catalogue</string>
+ </property>
+ <property name="shortcut">
+ <string>Shift+A, Alt+A, Alt+A, Alt+A</string>
+ </property>
+ <property name="autoDefault">
+ <bool>true</bool>
+ </property>
+ <property name="default">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="verticalSpacer_3">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>5</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QScrollArea" name="scrollAreaCommandes">
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>81</height>
+ </size>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">background : rgb(247,247,247)
+
+
+</string>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="verticalScrollBarPolicy">
+ <enum>Qt::ScrollBarAsNeeded</enum>
+ </property>
+ <property name="widgetResizable">
+ <bool>true</bool>
+ </property>
+ <widget class="QWidget" name="scrollAreaWidgetContents">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>1013</width>
+ <height>117</height>
+ </rect>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <layout class="QVBoxLayout" name="commandesLayout">
+ <property name="spacing">
+ <number>6</number>
+ </property>
+ <item>
+ <widget class="QLineEdit" name="commentaireLE">
+ <property name="styleSheet">
+ <string notr="true">background:rgb(240, 240, 240)</string>
+ </property>
+ <property name="frame">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11"/>
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <customwidgets>
+ <customwidget>
+ <class>MonBoutonValide</class>
+ <extends>QToolButton</extends>
+ <header>monBoutonValide.h</header>
+ </customwidget>
+ </customwidgets>
+ <tabstops>
+ <tabstop>commentaireLE</tabstop>
+ <tabstop>RBPoubelle</tabstop>
+ <tabstop>bCatalogue</tabstop>
+ <tabstop>RBValide</tabstop>
+ <tabstop>scrollAreaCommandes</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
</size>
</property>
<property name="text">
- <string>TextLabel</string>
+ <string><html><head/><body><p><span style=" font-style:italic;">TextLabel</span></p></body></html></string>
</property>
</widget>
</item>
<rect>
<x>0</x>
<y>0</y>
- <width>594</width>
+ <width>514</width>
<height>251</height>
</rect>
</property>
<zorder></zorder>
<zorder></zorder>
</widget>
+ <tabstops>
+ <tabstop>scrollArea</tabstop>
+ <tabstop>RBValide</tabstop>
+ <tabstop>RBHaut</tabstop>
+ <tabstop>RBBas</tabstop>
+ <tabstop>RBMoins</tabstop>
+ <tabstop>RBPlus</tabstop>
+ <tabstop>RBVoisListe</tabstop>
+ <tabstop>RBSalome</tabstop>
+ <tabstop>RBSalomeVue</tabstop>
+ <tabstop>BSelectFichier</tabstop>
+ <tabstop>RBPoubelle</tabstop>
+ </tabstops>
<resources/>
<connections/>
</ui>
</property>
<property name="minimumSize">
<size>
- <width>220</width>
+ <width>300</width>
<height>24</height>
</size>
</property>
<height>35</height>
</size>
</property>
+ <property name="focusPolicy">
+ <enum>Qt::ClickFocus</enum>
+ </property>
<property name="styleSheet">
<string notr="true">border : 0px</string>
</property>
<height>31</height>
</size>
</property>
+ <property name="focusPolicy">
+ <enum>Qt::ClickFocus</enum>
+ </property>
<property name="styleSheet">
<string notr="true">border : 0px</string>
</property>
<header>monBoutonValide.h</header>
</customwidget>
</customwidgets>
+ <tabstops>
+ <tabstop>LEComp</tabstop>
+ <tabstop>RBRI</tabstop>
+ <tabstop>RBMP</tabstop>
+ <tabstop>LEReel</tabstop>
+ <tabstop>LEImag</tabstop>
+ <tabstop>RBPoubelle</tabstop>
+ <tabstop>RBValide</tabstop>
+ </tabstops>
<resources/>
<connections/>
</ui>
<x>0</x>
<y>0</y>
<width>1064</width>
- <height>37</height>
+ <height>41</height>
</rect>
</property>
<property name="sizePolicy">
</property>
<property name="minimumSize">
<size>
- <width>220</width>
+ <width>300</width>
<height>24</height>
</size>
</property>
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>58</width>
+ <width>70</width>
<height>20</height>
</size>
</property>
<header>monBoutonValide.h</header>
</customwidget>
</customwidgets>
+ <tabstops>
+ <tabstop>lineEditVal</tabstop>
+ <tabstop>BFichier</tabstop>
+ <tabstop>BVisuFichier</tabstop>
+ <tabstop>RBPoubelle</tabstop>
+ <tabstop>RBValide</tabstop>
+ </tabstops>
<resources/>
<connections/>
</ui>
<widget class="QLabel" name="label">
<property name="minimumSize">
<size>
- <width>178</width>
+ <width>300</width>
<height>24</height>
</size>
</property>
<height>35</height>
</size>
</property>
+ <property name="focusPolicy">
+ <enum>Qt::ClickFocus</enum>
+ </property>
<property name="styleSheet">
<string notr="true">border : 0px</string>
</property>
<height>30</height>
</size>
</property>
+ <property name="focusPolicy">
+ <enum>Qt::ClickFocus</enum>
+ </property>
<property name="styleSheet">
<string notr="true">border : 0px</string>
</property>
<height>30</height>
</size>
</property>
+ <property name="focusPolicy">
+ <enum>Qt::ClickFocus</enum>
+ </property>
<property name="styleSheet">
<string notr="true">border:0px</string>
</property>
<height>31</height>
</size>
</property>
+ <property name="focusPolicy">
+ <enum>Qt::ClickFocus</enum>
+ </property>
<property name="styleSheet">
<string notr="true">border : 0px</string>
</property>
<header>monBoutonValide.h</header>
</customwidget>
</customwidgets>
+ <tabstops>
+ <tabstop>lineEditVal</tabstop>
+ <tabstop>BSalome</tabstop>
+ <tabstop>BView2D</tabstop>
+ <tabstop>RBValide</tabstop>
+ <tabstop>RBPoubelle</tabstop>
+ </tabstops>
<resources/>
<connections/>
</ui>
<height>35</height>
</size>
</property>
+ <property name="focusPolicy">
+ <enum>Qt::ClickFocus</enum>
+ </property>
<property name="styleSheet">
<string notr="true">border : 0px</string>
</property>
<height>16777215</height>
</size>
</property>
+ <property name="focusPolicy">
+ <enum>Qt::StrongFocus</enum>
+ </property>
<property name="styleSheet">
<string notr="true">background:rgb(235,235,235);
border:0px;</string>
<height>31</height>
</size>
</property>
+ <property name="focusPolicy">
+ <enum>Qt::ClickFocus</enum>
+ </property>
<property name="styleSheet">
<string notr="true">border : 0px</string>
</property>
<header>monBoutonValide.h</header>
</customwidget>
</customwidgets>
+ <tabstops>
+ <tabstop>lineEditVal1</tabstop>
+ <tabstop>lineEditVal2</tabstop>
+ <tabstop>RBValide</tabstop>
+ </tabstops>
<resources/>
<connections/>
</ui>
<height>35</height>
</size>
</property>
+ <property name="focusPolicy">
+ <enum>Qt::ClickFocus</enum>
+ </property>
<property name="styleSheet">
<string notr="true">border : 0px</string>
</property>
<height>16777215</height>
</size>
</property>
+ <property name="focusPolicy">
+ <enum>Qt::StrongFocus</enum>
+ </property>
<property name="styleSheet">
<string notr="true">background:rgb(235,235,235);
border:0px;</string>
<height>16777215</height>
</size>
</property>
+ <property name="focusPolicy">
+ <enum>Qt::StrongFocus</enum>
+ </property>
<property name="styleSheet">
<string notr="true">background:rgb(235,235,235);
border:0px;</string>
</property>
</widget>
</item>
+ <item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
<item>
<widget class="QToolButton" name="RBPoubelle">
<property name="minimumSize">
<height>31</height>
</size>
</property>
+ <property name="focusPolicy">
+ <enum>Qt::ClickFocus</enum>
+ </property>
<property name="styleSheet">
<string notr="true">border : 0px</string>
</property>
import Accas
debutTextePhys ="[VERSION\n NUM 1\n FILETYPE PHYS\n]\n"
-debutTextePhys+="[MATERIALS\n [CONDUCTOR\n"
+debutTextePhys+="[MATERIALS\n"
texteConductor =" [CONDUCTIVITY\n LAW LINEAR\n"
texteConductor+=" HOMOGENEOUS TRUE\n"
texteConductor+=" ISOTROPIC TRUE\n"
debutTexteParam+="[PROBLEM\n NAME HARMONIC\n]\n"
debutTexteParam+="[CAR_FILES\n NAME "
-debutTexteBav ="[ZSURFACIC\n NAME BAV\n [CONDUCTIVITY\n"
-debutTexteBav+=" LAW LINEAR\n"
-debutTexteBav+=" HOMOGENEOUS TRUE\n"
-debutTexteBav+=" ISOTROPIC TRUE\n"
-debutTexteBav+=" VALUE COMPLEX "
-texteBav2 =" 0.0000000000000000E+00\n ]\n"
-texteBav2 +=" [PERMEABILITY\n LAW LINEAR\n"
-texteBav2 +=" HOMOGENEOUS TRUE\n"
-texteBav2 +=" ISOTROPIC TRUE\n VALUE COMPLEX "
-finTexteBav =" 0.0000000000000000E+00\n ]\n]\n"
+debutTexteZs0 =" [ZSURFACIC\n NAME "
+debutTexteZs ="\n [CONDUCTIVITY\n"
+debutTexteZs+=" LAW LINEAR\n"
+debutTexteZs+=" HOMOGENEOUS TRUE\n"
+debutTexteZs+=" ISOTROPIC TRUE\n"
+debutTexteZs+=" VALUE COMPLEX "
+texteZs2 =" 0.0000000000000000E+00\n ]\n"
+texteZs2 +=" [PERMEABILITY\n LAW LINEAR\n"
+texteZs2 +=" HOMOGENEOUS TRUE\n"
+texteZs2 +=" ISOTROPIC TRUE\n VALUE COMPLEX "
+finTexteZs =" 0.0000000000000000E+00\n ]\n ]\n"
def entryPoint():
"""
# ecriture
#----------------------------------------------------------------------------------------
- def writeDefault(self,fn) :
+ def writeDefault(self,file) :
+#file ne sert pas
self.texteIngendof=""
self.texteParam=debutTexteParam
self.chercheFichier()
self.traiteSourceVCut()
- self.traiteZs_Bav()
- fileIngendof = fn[:fn.rfind(".")] + '.ingendof'
+ fn=self.fnBase
+ fileIngendofDeb = fn[:fn.rfind(".")] + '.ingendof'
+ fileIngendof = os.path.join(self.sauveDirectory,fileIngendofDeb)
f = open( str(fileIngendof), 'wb')
f.write( self.texteIngendof )
f.close()
- f = open( str("/tmp/toto"), 'wb')
- f.write( self.texteIngendof )
- f.close()
self.textePhys=debutTextePhys
self.traiteMateriaux()
- filePhys = fn[:fn.rfind(".")] + '.phys'
+ filePhysDeb = fn[:fn.rfind(".")] + '.phys'
+ filePhys = os.path.join(self.sauveDirectory,filePhysDeb)
f = open( str(filePhys), 'wb')
f.write( self.textePhys )
f.close()
- fileParam = fn[:fn.rfind(".")] + '.param'
+ fileParamDeb = fn[:fn.rfind(".")] + '.param'
+ fileParam = os.path.join(self.sauveDirectory,fileParamDeb)
self.traiteParam()
f = open( str(fileParam), 'wb')
f.write( self.texteParam )
f.close()
- self.texteCMD="[ \n GLOBAL \n] \n[ \nVISU \nDomaine \nMED \nELEMENT \n] "
- fileCMD = fn[:fn.rfind(".")] + '.cmd'
+ self.texteCMD="[ \n GLOBAL \n] \n[ \nVISU \n"+self.fnBase.split(".med")[0]+"\nMED \nELEMENT \n] "
+ fileCMDDeb = fn[:fn.rfind(".")] + '.cmd'
+ fileCMD =os.path.join(self.sauveDirectory,fileCMDDeb)
f = open( str(fileCMD), 'wb')
f.write( self.texteCMD )
f.close()
nomBaseFichier=os.path.basename(fileParam).split(".med")[0]
self.texteInfcarmel=nomBaseFichier
- fileInfcarmel = fn[:fn.rfind(".")] + '.infcarmel'
+ fileInfcarmelDeb = fn[:fn.rfind(".")] + '.infcarmel'
+ fileInfcarmel=os.path.join(self.sauveDirectory,fileInfcarmelDeb)
f = open( str(fileInfcarmel), 'wb')
f.write( self.texteInfcarmel )
f.close()
self.texteInpostpro=nomBaseFichier+"\n"+nomBaseFichier.split(".param")[0]+'.xmat\n'+nomBaseFichier.split(".param")[0]+'.cmd'
- fileInpostpro = fn[:fn.rfind(".")] + '.inpostprocess'
+ fileInpostproDeb = fn[:fn.rfind(".")] + '.inpostprocess'
+ fileInpostpro = os.path.join(self.sauveDirectory,fileInpostproDeb)
f = open( str(fileInpostpro), 'wb')
f.write( self.texteInpostpro )
f.close()
debut=e.valeur[17:]
liste=debut.split(" - ")
nomFichier=liste[0]
- print 'nom=',nomFichier
- print 'e.va=',e.valeur.split(" ")[-1]
- print 'liste=',liste
+ #print 'nom=',nomFichier
+ #print 'e.va=',e.valeur.split(" ")[-1]
+ #print 'liste=',liste
nomDomaine=e.valeur.split(" ")[-1]
break
+ self.sauveDirectory=os.path.dirname(nomFichier)
+ self.fnBase=os.path.basename(nomFichier)
self.texteIngendof =os.path.basename(nomFichier)+"\n"
self.texteParam += os.path.basename(nomFichier).split(".med")[0]+".car\n]\n"
self.texteParam +="[PHYS_FILES\n NAME "+os.path.basename(nomFichier).split(".med")[0]+".phys\n]\n"
#----------------------------------------------------------------------------------------
-# analyse du dictionnaire pour trouver les sources et les VCut
+# analyse du dictionnaire pour trouver les sources et les VCut et les ZS
#----------------------------------------------------------------------------------------
def traiteSourceVCut(self) :
listeSource=[]
listeVCut=[]
+ self.listeZS=[]
self.texteSourcePhys="[SOURCES\n"
for k in self.dictMCVal.keys():
if k.find ("______SOURCE__") > -1 :
if k.find ("______VCUT__") > -1 :
noms=k.split("_____")
if noms[0] not in listeVCut : listeVCut.append(noms[0])
+ if k.find ("______ZS") > -1 :
+ noms=k.split("_____")
+ if noms[0] not in self.listeZS : self.listeZS.append(noms[0])
listeSource.sort()
for source in listeSource:
debutKey=source+"______SOURCE__"
- texteSource=self.dictMCVal[debutKey+"NomDomaine"]+"\n"
+ texteSource=self.dictMCVal[debutKey+"EnveloppeConnexeInducteur"]+"\n"
texteSource+="2\n"
for val in self.dictMCVal[debutKey+"VecteurDirecteur"] :
texteSource+=str(val)+" "
for val in self.dictMCVal[debutKey+"Centre"] :
texteSource+=str(val)+" "
texteSource+="\n"
- texteSource+=str(self.dictMCVal[debutKey+"SectionDomaine"])+"\n"
+ texteSource+=str(self.dictMCVal[debutKey+"SectionBobine"])+"\n"
self.texteIngendof+=texteSource
self.texteSourcePhys+=" [STRANDED_INDUCTOR\n"
self.texteSourcePhys+=" NAME "+source+"\n"
if self.dictMCVal["__PARAMETRES__TypedeFormule"]=="APHI" :self.texteIngendof+="1\n"
else : self.texteIngendof+="2\n"
-#----------------------------------------------------------------------------------------
- def traiteZs_Bav(self):
-#----------------------------------------------------------------------------------------
- if "__ZS_BAV__Permeabilite" in self.dictMCVal.keys():
- self.texteSourcePhys+=debutTexteBav
- self.texteSourcePhys+=str(self.dictMCVal["__ZS_BAV__Conductivite"])
- self.texteSourcePhys+=texteBav2
- self.texteSourcePhys+=str(self.dictMCVal["__ZS_BAV__Permeabilite"])
- self.texteSourcePhys+=finTexteBav
#----------------------------------------------------------------------------------------
if noms[0] not in listeNoCond : listeNoCond.append(noms[0])
for c in listeCond:
+ self.textePhys +=" [CONDUCTOR\n"
self.textePhys +=" NAME "+c+"\n"
self.textePhys +=texteConductor
self.textePhys+=" VALUE COMPLEX "
self.textePhys+=str(self.dictMCVal[c+"______CONDUCTEUR__Conductivite"])
self.textePhys+=texteConducto2
self.textePhys+=" VALUE COMPLEX "
- self.textePhys+=str(self.dictMCVal[c+"______CONDUCTEUR__Permeabilite"])
+ self.textePhys+=str(self.dictMCVal[c+"______CONDUCTEUR__PermeabiliteRelative"])
self.textePhys+=" 0.0000000000000000E+00\n ]\n ]\n"
for c in listeNoCond:
self.textePhys +=" NAME "+c+"\n"
self.textePhys += texteNoCond
self.textePhys+=" VALUE COMPLEX "
- self.textePhys+=str(self.dictMCVal[c+"______NOCOND__Permeabilite"])
+ self.textePhys+=str(self.dictMCVal[c+"______NOCOND__PermeabiliteRelative"])
self.textePhys+=" 0.0000000000000000E+00\n ]\n ]\n"
+ for zs in self.listeZS:
+ self.textePhys+=debutTexteZs0+zs
+ self.textePhys+=debutTexteZs
+ self.textePhys+=str(self.dictMCVal[zs+"______ZS__Conductivite"])
+ self.textePhys+=texteZs2
+ self.textePhys+=str(self.dictMCVal[zs+"______ZS__PermeabiliteRelative"])
+ self.textePhys+=finTexteZs
+
self.textePhys+="]\n"
self.textePhys+=self.texteSourcePhys
# Creation du fichier Param
#----------------------------------------------------------------------------------------
def traiteParam(self):
- self.texteParam +="[FREQUENCY\n SINGLE "+str(self.dictMCVal["__PARAMETRES__Frequence_en_Hz"])+"\n]\n"
+ self.texteParam +="[FREQUENCY\n SINGLE "+str(self.dictMCVal["__PARAMETRES__Frequence"])+"\n]\n"
self.texteParam +="[SOLVER\n NAME BICGCR\n"
self.texteParam +=" [ITERATIVE_PARAM\n"
self.texteParam +=" NITERMAX "+str(self.dictMCVal["__PARAMETRES__Nb_Max_Iterations"])+"\n"
def writeDefault(self, fn):
fileSTD = fn[:fn.rfind(".")] + '.py'
- f = open( str(fileSTD), 'wb')
- f.write( self.texteSTD )
- f.close()
+ with open(fileSTD, 'w') as f:
+ f.write(self.texteSTD)
def getGenerateur (self):
print "IDM: getGenerateur dans generator_openturns_study.py"
