Fix for 12314.

This commit is contained in:
akk 2006-05-03 14:16:24 +00:00
parent 6f9578bb5c
commit 3d41c01543
3 changed files with 39 additions and 33 deletions

View File

@ -12,11 +12,12 @@
import salome import salome
import geompy import geompy
geomgui = salome.ImportComponentGUI("GEOM") geomgui = salome.ImportComponentGUI("GEOM")
import salome_ComponentGUI
def addToStudy(shape, name): def addToStudy(shape, name):
i = geompy.addToStudy(shape, name) i = geompy.addToStudy(shape, name)
salome.sg.updateObjBrowser(0) salome.sg.updateObjBrowser(0)
geomgui.createAndDisplayGO(i) if not isinstance(geomgui, type(salome_ComponentGUI)):
geomgui.createAndDisplayGO(i)
return i return i
# Piece # Piece

View File

@ -30,7 +30,7 @@ import salome
import geompy import geompy
import math import math
from time import sleep from time import sleep
import salome_ComponentGUI
geom = salome.lcc.FindOrLoadComponent("FactoryServer", "GEOM") geom = salome.lcc.FindOrLoadComponent("FactoryServer", "GEOM")
myBuilder = salome.myStudy.NewBuilder() myBuilder = salome.myStudy.NewBuilder()
@ -47,14 +47,16 @@ dirz = BasicOp.MakeVectorTwoPnt(point0,pointz1)
torus1 = PrimOp.MakeTorusPntVecRR(point0,dirz,150.,25.) torus1 = PrimOp.MakeTorusPntVecRR(point0,dirz,150.,25.)
id_torus1 = geompy.addToStudy(torus1,"torus1") id_torus1 = geompy.addToStudy(torus1,"torus1")
gg.createAndDisplayGO(id_torus1) if not isinstance(gg, type(salome_ComponentGUI)):
gg.createAndDisplayGO(id_torus1)
torus2 = InsertOp.MakeCopy(torus1) torus2 = InsertOp.MakeCopy(torus1)
vec1 = BasicOp.MakeVectorDXDYDZ(0.,0.,100.) vec1 = BasicOp.MakeVectorDXDYDZ(0.,0.,100.)
torus2 = TrsfOp.TranslateVectorCopy(torus2,vec1) torus2 = TrsfOp.TranslateVectorCopy(torus2,vec1)
id_torus2 = geompy.addToStudy(torus2,"torus2") id_torus2 = geompy.addToStudy(torus2,"torus2")
gg.createAndDisplayGO(id_torus2) if not isinstance(gg, type(salome_ComponentGUI)):
gg.createAndDisplayGO(id_torus2)
cylz1 = PrimOp.MakeCylinderPntVecRH(point0,dirz,25.,100.) cylz1 = PrimOp.MakeCylinderPntVecRH(point0,dirz,25.,100.)
@ -70,7 +72,8 @@ while ind < 6:
name = "cyl%d"%(ind) name = "cyl%d"%(ind)
acyl = TrsfOp.TranslateVectorCopy(acyl,vec_i) acyl = TrsfOp.TranslateVectorCopy(acyl,vec_i)
id_acyl = geompy.addToStudy(acyl,name) id_acyl = geompy.addToStudy(acyl,name)
gg.createAndDisplayGO(id_acyl) if not isinstance(gg, type(salome_ComponentGUI)):
gg.createAndDisplayGO(id_acyl)
shapeList.append(acyl) shapeList.append(acyl)
idList.append(id_acyl) idList.append(id_acyl)
ind = ind +1 ind = ind +1
@ -82,7 +85,8 @@ idList.append(id_torus2)
cage = geompy.MakeCompound(shapeList) cage = geompy.MakeCompound(shapeList)
id_cage = geompy.addToStudy(cage,"cage") id_cage = geompy.addToStudy(cage,"cage")
gg.createAndDisplayGO(id_cage) if not isinstance(gg, type(salome_ComponentGUI)):
gg.createAndDisplayGO(id_cage)
from salome import sg from salome import sg
sleep(1) sleep(1)
@ -102,15 +106,15 @@ for id in idList:
sg.Display(id_torus1) sg.Display(id_torus1)
sg.Display(id_torus2) sg.Display(id_torus2)
sg.Display(id_acyl) sg.Display(id_acyl)
if not isinstance(gg, type(salome_ComponentGUI)):
gg.setTransparency(id_torus1,0.5) gg.setTransparency(id_torus1,0.5)
gg.setDisplayMode(id_torus1,1) gg.setDisplayMode(id_torus1,1)
gg.setDisplayMode(id_torus2,1) gg.setDisplayMode(id_torus2,1)
gg.setDisplayMode(id_acyl,1) gg.setDisplayMode(id_acyl,1)
#gg.setDisplayMode(id_cage,1) #gg.setDisplayMode(id_cage,1)
gg.setColor(id_torus1,0,0,255) gg.setColor(id_torus1,0,0,255)
gg.setColor(id_torus2,255,0,0) gg.setColor(id_torus2,255,0,0)
gg.setColor(id_acyl,0,255,0) gg.setColor(id_acyl,0,255,0)
#gg.setColor(id_cage,255,255,0) #gg.setColor(id_cage,255,255,0)

View File

@ -143,17 +143,18 @@ assemblageId = addToStudy(assemblage, "assemblage")
# Display # Display
# #
gg = ImportComponentGUI("GEOM") gg = ImportComponentGUI("GEOM")
gg.initGeomGen() import salome_ComponentGUI
if not isinstance(gg, type(salome_ComponentGUI)):
gg.createAndDisplayGO(baseId) gg.initGeomGen()
gg.setTransparency(baseId,0.5) gg.createAndDisplayGO(baseId)
gg.setDisplayMode(baseId,1) gg.setTransparency(baseId,0.5)
gg.setColor(baseId,255,0,0) gg.setDisplayMode(baseId,1)
gg.createAndDisplayGO(travId) gg.setColor(baseId,255,0,0)
gg.setTransparency(travId,0.5) gg.createAndDisplayGO(travId)
gg.setDisplayMode(travId,1) gg.setTransparency(travId,0.5)
gg.setColor(travId,255,0,0) gg.setDisplayMode(travId,1)
gg.createAndDisplayGO(weldId) gg.setColor(travId,255,0,0)
gg.setTransparency(weldId,0.5) gg.createAndDisplayGO(weldId)
gg.setDisplayMode(weldId,1) gg.setTransparency(weldId,0.5)
gg.setColor(weldId,0,0,255) gg.setDisplayMode(weldId,1)
gg.setColor(weldId,0,0,255)