From 2b1b3215c0821d29718b6c82a9c76cbeee52bf89 Mon Sep 17 00:00:00 2001 From: salome <> Date: Fri, 30 Sep 2005 17:41:46 +0000 Subject: [PATCH] =?utf8?q?Int=C3=A9gration=20eficas=5Fnovice?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- Makefile.in | 7 +- resources/EFICAS_en.xml | 4 +- resources/eficasternovice.png | Bin 0 -> 15328 bytes resources/moins.png | Bin 0 -> 108 bytes resources/plus.png | Bin 0 -> 131 bytes resources/select1.png | Bin 0 -> 975 bytes src/EELIH/c_geometrie.py | 144 ---------------------------------- src/EELIH/c_maillage.py | 2 - src/EELIH/geometrie.py | 2 - src/EELIH/publication.py | 18 +---- src/EFICASGUI/EFICASGUI.py | 16 ++++ src/EFICASGUI/SMESH_utils.py | 55 +++++++++++-- src/EFICASGUI/dataEficas.py | 17 ++++ src/EFICASGUI/eficasCL.py | 13 +-- src/EFICASGUI/eficasEtude.py | 6 +- src/Makefile.in | 4 +- 16 files changed, 107 insertions(+), 181 deletions(-) create mode 100644 resources/eficasternovice.png create mode 100644 resources/moins.png create mode 100644 resources/plus.png create mode 100644 resources/select1.png diff --git a/Makefile.in b/Makefile.in index c2a8ba15..228277ba 100644 --- a/Makefile.in +++ b/Makefile.in @@ -20,7 +20,12 @@ EFICASCatalog.xml \ EFICAS_en.xml \ eficashomard.png \ eficas.png \ -eficaster.png +eficaster.png \ +eficasternovice.png \ +moins.png \ +plus.png \ +select1.png \ + BIN_SCRIPT= \ VERSION diff --git a/resources/EFICAS_en.xml b/resources/EFICAS_en.xml index a21d30b9..0e01f3ba 100644 --- a/resources/EFICAS_en.xml +++ b/resources/EFICAS_en.xml @@ -16,7 +16,8 @@ - + + @@ -24,6 +25,7 @@ + diff --git a/resources/eficasternovice.png b/resources/eficasternovice.png new file mode 100644 index 0000000000000000000000000000000000000000..ba943d96ccd9cfe66cead97a46e68213240c6463 GIT binary patch literal 15328 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 literal 0 HcmV?d00001 diff --git a/resources/select1.png b/resources/select1.png new file mode 100644 index 0000000000000000000000000000000000000000..a1a4ee1d52bb1642c35e59cbd98a6d61e1cbbf3c GIT binary patch literal 975 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc3?z4jzqMyzU}gyL32{Ag(XtH+i|A$>yGTanrJv}Vn71?{kepP$n8jbDQ&9P6{DSwHJ5&6t;zVEf4 qiTkGBoX&*C49m@7VrQ-I`_JRw<#IIU%bh(S&w0A~xvX= 1: - print "1 seule géométrie doit être sélectionnée" - - - # liste des faces sélectionnées dans ddl et pression -# liste_faces = [] -# for face in self.appli.etude.ddls: -# if face[0] not in liste_faces: -# liste_faces.append(face[0]) - -# for face in self.appli.etude.chargements: -# if face[0] not in liste_faces: -# liste_faces.append(face[0]) -# if liste_faces != '': - liste_faces = [] - #liste_faces.append('0:1:2:1:1') - #liste_faces.append('0:1:2:1:2') - - # récupération de toutes les sous géométries - for sousGeom in self.appli.etude.sousGeometrie: - SO = salome.myStudy.FindObject(str(sousGeom)) - liste_faces.append(SO.GetID()) - - touteslesvaleurs = self.convertit_entrees_en_valeurs(liste_faces) - #liste_faces = [] - #liste_faces.append('0:1:2:1:2') - #touteslesvaleurs = self.convertit_entrees_en_valeurs(liste_faces) - return touteslesvaleurs - -dict_geom_numgroupe = { } -dict_geom_numface = { } diff --git a/src/EELIH/c_maillage.py b/src/EELIH/c_maillage.py index b351a92e..6da0bebe 100644 --- a/src/EELIH/c_maillage.py +++ b/src/EELIH/c_maillage.py @@ -1,13 +1,11 @@ # -*- coding: utf-8 -*- from panelbase import * - class C_maillage: """ controleur de la classe Maillage, traite les maillages correspondants à la géométrie sélectionnée ou crée un maillage avec le nom saisi - - maillage = référence sur le panneau maillage """ def __init__(self, maillage): self.maillage = maillage diff --git a/src/EELIH/geometrie.py b/src/EELIH/geometrie.py index 49553aa1..9c1c4100 100644 --- a/src/EELIH/geometrie.py +++ b/src/EELIH/geometrie.py @@ -14,8 +14,6 @@ class Geometrie(PanelBase): """ Hérite de la classe mère PanelBase Définit le panneau pour le choix de la géométrie sur laquelle on veut travailler - - pbSelection = bouton pour la sélection dans l'arbre d'étude Salome - - ln = lineedit pour l'affichage de la sélection """ def __init__(self, parent, appli): # hérite de la classe mère des panneaux diff --git a/src/EELIH/publication.py b/src/EELIH/publication.py index 0398e959..00164cb9 100644 --- a/src/EELIH/publication.py +++ b/src/EELIH/publication.py @@ -132,8 +132,6 @@ class Publication(PanelBase): mesh = maillage.Maillage(self.appli.mw.ws, self.appli) self.listeMaillages.append(mesh) self.appli.mw.listePanels.append(mesh) - #self.appli.mw.listePanels.insert(0, self.appli.mw.listePanels[0] + 1) - #del self.appli.mw.listePanels[1] self.updateGeomMaillage(mesh, i) @@ -157,29 +155,17 @@ class Publication(PanelBase): for iorSousGeom in self.appli.mw.geometrie.controleurGeom.dicoSousGeom.keys(): GEOMIor.append(iorSousGeom) maillage.cl.GetOrCreateCL(iorSousGeom) - #self.appli.mw.maillage.cl.traiteCL() maillage.cl.get_geoms() maillage.cl.get_maillages() -# + maillage.cl.MainShapes(0) -# + listeMaillage = maillage.cl.Possibles(0, str(self.appli.etude.geometrie[0])) # insertion des maillages trouvés dans la listbox du panneau maillage # si aucun maillage on disable la listbox # sinon on disable le lineedit pour donner le nom d'un nouveau maillage if listeMaillage != []: maillage.lbMaillage.insertStrList(listeMaillage) - #maillage.lbMaillage.setEnabled(1) - #maillage.lblMaillage.setEnabled(1) - #maillage.lblNouveauMaillage.setEnabled(0) - #maillage.lnNouveauMaillage.setEnabled(0) - #else: - #maillage.lnNouveauMaillage.setEnabled(1) - #maillage.lblNouveauMaillage.setEnabled(1) - #maillage.lbMaillage.setEnabled(0) - #maillage.lblMaillage.setEnabled(0) - - dict_geom_numgroupe = { } dict_geom_numface = { } diff --git a/src/EFICASGUI/EFICASGUI.py b/src/EFICASGUI/EFICASGUI.py index a4d8df4f..17e41c85 100644 --- a/src/EFICASGUI/EFICASGUI.py +++ b/src/EFICASGUI/EFICASGUI.py @@ -114,8 +114,22 @@ def customPopup(popup, theContext, theObject, theParent): import eficasSalome def runEficas(ws): + print "--------------------------------------------------" + print currentStudyId eficasSalome.runEficas(ws,"ASTER",studyId=currentStudyId) +def runEELIH(ws,code="ASTER"): + # Enregistrement dans l étude + import eficasEtude + import appli + print "++++++++++++++++++++++++++++++++++++++++++++++++++++" + print currentStudyId + + MaRef=eficasEtude.Eficas_In_Study(code,studyId=currentStudyId) + # flag = E pour Eficas (enregistrement manuel du fichier de commandes) + flag = 'E' + moi=appli.Appli(MaRef, flag) + def runEficaspourHomard(ws): print "runEficas" eficasSalome.runEficas(ws,"HOMARD") @@ -148,8 +162,10 @@ def runEficasFichier(ws): dict_command={ 941:runEficas, + 943:runEELIH, 946:runEficaspourHomard, 4041:runEficas, + 4043:runEELIH, 4046:runEficaspourHomard, 9042:runEficasFichier, } diff --git a/src/EFICASGUI/SMESH_utils.py b/src/EFICASGUI/SMESH_utils.py index d5be97dd..99a72696 100644 --- a/src/EFICASGUI/SMESH_utils.py +++ b/src/EFICASGUI/SMESH_utils.py @@ -4,7 +4,7 @@ # Author : Paul RASCLE, EDF # Project : SALOME # Copyright : EDF 2003 -# $Header: /home/salome/PlateFormePAL/Bases_CVS_EDF/Modules_EDF/EFICAS_SRC/src/EFICASGUI/SMESH_utils.py,v 1.5 2005/02/03 15:15:09 salome Exp $ +# $Header: /home/salome/PlateFormePAL/Bases_CVS_EDF/Modules_EDF/EFICAS_SRC/src/EFICASGUI/SMESH_utils.py,v 1.6 2005/08/18 09:05:55 salome Exp $ #============================================================================= from omniORB import CORBA @@ -35,6 +35,13 @@ def entryToIor(myStudy,entry): ior = orb.string_to_object(iorString) return ior +def iorStringToIor(iorString): + """ + retourne une référence ior de l'iorString passée en argument + """ + ior = orb.string_to_object(iorString) + return ior + def entryToIorString(myStudy,entry): """ Retourne la sérialisation de l'ior de l'entry passée en @@ -50,6 +57,7 @@ def entryToIorString(myStudy,entry): print "invalid entry: ",entry SO = None if SO != None: + boo,iorso = myBuilder.FindAttribute(SO,"AttributeIOR") if boo == 0: print "no IOR attribute on study object: ", entry @@ -162,16 +170,19 @@ def getSMESHSubShapeIndexes(myStudy, entryList, typenoeudorcell = 0): for idShape in entryList: try: anObject=entryToIor(myStudy,idShape) - Shape=anObject._narrow(GEOM.GEOM_Object) + if not anObject: # l'objet n'a pas encore chargé + strContainer, strComponentName = "FactoryServer", "GEOM" + myComponent = salome.lcc.FindOrLoadComponent( strContainer, strComponentName ) + SCom=myStudy.FindComponent( strComponentName ) + myBuilder = myStudy.NewBuilder() + myBuilder.LoadWith( SCom , myComponent ) + anObject=entryToIor(myStudy,idShape) + + Shape=anObject._narrow(GEOM.GEOM_Object) iorStringMain=orb.object_to_string(Shape) except : print "pb avec l IOR: pas un objet" - if iorStringMain == None: - # C'est le cas ou on a loade un fichier hdf et on est pas passe par geom - # par exemple .... - return refList - myCL=myCLinit.GetOrCreateCL(iorStringMain) refShape = singleEntryToName(myStudy,idShape) if refShape != None: @@ -220,3 +231,33 @@ def VisuGroupe(myStudy,GroupesListe): aGuiDS.ClearSelection() aGuiDS.DisplayByNameInGeom(GroupesListe) +def getSubGeometry(myStudy, list): + IORMainShape = entryToIorString(myStudy,list[1]) + + SO = myStudy.FindObjectIOR(IORMainShape) + childIt = myStudy.NewChildIterator(SO) + childIt.InitEx(1) + childListe = [] + while childIt.More(): + childSO = childIt.Value() + childListe.append(childSO.GetName()) + childIt.Next() + return childListe + +def getSubGeometryIorAndName(myStudy, list): + """ + retourne un dictionnaire avec clé = IOR + valeur = name + """ + dico = {} + IORMainShape = entryToIorString(myStudy,list[1]) + + SO = myStudy.FindObjectIOR(IORMainShape) + childIt = myStudy.NewChildIterator(SO) + childIt.InitEx(1) + while childIt.More(): + childSO = childIt.Value() + if childSO.GetIOR() != '': + dico[childSO.GetIOR()] = childSO.GetName() + childIt.Next() + return dico diff --git a/src/EFICASGUI/dataEficas.py b/src/EFICASGUI/dataEficas.py index 49e352b5..d5683cfa 100644 --- a/src/EFICASGUI/dataEficas.py +++ b/src/EFICASGUI/dataEficas.py @@ -49,3 +49,20 @@ def init(top,code="ASTER",fichier=None,studyId=None): moi=MyEficas(top,code=code) moi.contexte() + +def initNovice(code="ASTER",fichier=None,studyId=None): + # Enregistrement dans l étude + import eficasEtude + MaRef=eficasEtude.Eficas_In_Study(code,studyId=studyId) + + #import eficas + class MyEficas(appli.Appli): + #def exit(self, event=None): + #appli.Appli.exit(self, event=None) + + def contexte(self): + self.salome=MaRef + + moi=MyEficas() + mainwindow.MainWindow(moi) + moi.contexte() \ No newline at end of file diff --git a/src/EFICASGUI/eficasCL.py b/src/EFICASGUI/eficasCL.py index 40c791b2..c415b221 100644 --- a/src/EFICASGUI/eficasCL.py +++ b/src/EFICASGUI/eficasCL.py @@ -5,6 +5,7 @@ import GEOM import SalomePyQt import MonChoixMaillage import string +import EFICASGUI Tag_RefOnShape = 1 dict_CL={} @@ -12,27 +13,25 @@ dict_CL={} class CLinit: def __init__(self): geom = salome.lcc.FindOrLoadComponent("FactoryServer", "GEOM") - self.GroupOp = geom.GetIGroupOperations(salome.myStudyId) + #self.GroupOp = geom.GetIGroupOperations(salome.myStudyId) + self.GroupOp = geom.GetIGroupOperations(EFICASGUI.currentStudyId) self.smesh=None self.geomcompID=None self._d = SalomePyQt.SalomePyQt().getDesktop() self.correspondanceNomIOR = {} self.correspondanceNomIORshape = {} self.dict_listedep={} - print "fin init" def clean(self): dict_CL={} def GetOrCreateCL(self,myShapeName): - print "GetOrCreateCL" , myShapeName if not (dict_CL.has_key(myShapeName)): dict_CL[myShapeName] = CL() return dict_CL[myShapeName] def traiteCL(self): - #print "Debut de TraiteCL" self.get_geoms() self.get_maillages() # Récupere tous les Mesh @@ -123,7 +122,6 @@ class CLinit: for MainID in self.Liste_geoms[GEOMIor]: aSO = salome.myStudy.FindObjectID(MainID) if aSO==None: - print "pb dans MainShapes" return listeNoms attrName = aSO.FindAttribute("AttributeName")[1] anAttr = attrName._narrow(SALOMEDS.AttributeName) @@ -133,6 +131,7 @@ class CLinit: anAttr = IORAttr._narrow(SALOMEDS.AttributeIOR) GEOMShapeIOR = anAttr.Value() self.correspondanceNomIORshape[Name]=GEOMShapeIOR + return listeNoms @@ -166,11 +165,15 @@ class CLinit: return type def get_maillages(self): + salome.myStudy = salome.myStudyManager.GetStudyByID( EFICASGUI.currentStudyId ) + + self.Liste_maillages={} if self.smesh == None : self.smesh = salome.lcc.FindOrLoadComponent("FactoryServer", "SMESH") self.smesh.SetCurrentStudy(salome.myStudy) stringIOR=salome.orb.object_to_string(self.smesh) + SO_smesh=salome.myStudy.FindObjectIOR(stringIOR) if SO_smesh != None: ChildIterator = salome.myStudy.NewChildIterator(SO_smesh) diff --git a/src/EFICASGUI/eficasEtude.py b/src/EFICASGUI/eficasEtude.py index fa2f8b69..0067f2a8 100644 --- a/src/EFICASGUI/eficasEtude.py +++ b/src/EFICASGUI/eficasEtude.py @@ -4,7 +4,7 @@ # Author : Pascale NOYRET, EDF # Project : SALOME # Copyright : EDF 2003 -# $Header: /home/salome/PlateFormePAL/Bases_CVS_EDF/Modules_EDF/EFICAS_SRC/src/EFICASGUI/eficasEtude.py,v 1.3 2005/06/03 07:25:24 salome Exp $ +# $Header: /home/salome/PlateFormePAL/Bases_CVS_EDF/Modules_EDF/EFICAS_SRC/src/EFICASGUI/eficasEtude.py,v 1.4 2005/06/22 18:50:13 salome Exp $ #============================================================================= import salome @@ -44,6 +44,8 @@ class Eficas_In_Study: if self.commId != None: self.aGuiDS.setExternalFileAttribute(self.commId,"FICHIER_EFICAS_"+self.code+suf,fichier) salome.sg.updateObjBrowser(0) + print "((((((((((((((((((((((((((((((((((((((" + print "fin range in study" def creeConfigTxt(self,fichier,dico): sauvegarde = asksaveasfilename(title="fichier config.txt", @@ -58,4 +60,6 @@ class Eficas_In_Study: f.write(ligne) f.close() self.rangeInStudy(sauvegarde) + print "===============================" + print "fin crreConfigTxt" diff --git a/src/Makefile.in b/src/Makefile.in index 4cbcbf35..d62801ee 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -4,7 +4,7 @@ # Author : Paul RASCLE, EDF # Project : SALOME # Copyright : EDF 2001 -# $Header: /home/salome/PlateFormePAL/Bases_CVS_EDF/Modules_EDF/EFICAS_SRC/src/Makefile.in,v 1.2 2004/12/10 16:43:25 salome Exp $ +# $Header: /home/salome/PlateFormePAL/Bases_CVS_EDF/Modules_EDF/EFICAS_SRC/src/Makefile.in,v 1.3 2005/08/03 10:06:01 salome Exp $ #============================================================================== # source path @@ -15,6 +15,6 @@ VPATH=.:@srcdir@ @COMMENCE@ -SUBDIRS = EFICAS EFICASGUI +SUBDIRS = EFICAS EFICASGUI EELIH @MODULE@ -- 2.39.2