-# -*- coding: iso-8859-1 -*-
+# -*- coding: utf-8 -*-
+# Copyright (C) 2014-2022 EDF R&D
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
import sys
import salome
import SALOMEDS
import time
+geompy = None
-def demidisk(study, r1, a1, roty=0, solid_thickness=0):
+def demidisk(r1, a1, roty=0, solid_thickness=0):
if solid_thickness < 1e-7:
with_solid = False
else:
with_solid = True
-
- geompy = geomBuilder.New(study)
O = geompy.MakeVertex(0, 0, 0)
OX = geompy.MakeVectorDXDYDZ(1, 0, 0)
OY = geompy.MakeVectorDXDYDZ(0, 1, 0)
OZ = geompy.MakeVectorDXDYDZ(0, 0, 1)
- v=range(8)
- l=range(8)
+ v=list(range(8))
+ l=list(range(8))
v0 = geompy.MakeVertex(0, 0, 0)
v[0] = geompy.MakeVertex(0, r1/2.0, 0)
v[1] = geompy.MakeVertex(0, r1, 0)
arc1 = geompy.MakeArc(v[1], v7, v[3])
l[0] = geompy.MakeLineTwoPnt(v[1], v[3])
face1 = geompy.MakeFaceWires([arc1, l[0]], 1)
- part1 = geompy.MakePartition([face1], [l[2], l[4], l[5], l[6], l[7]], [], [], geompy.ShapeType["FACE"], 0, [], 0, True)
+ part1 = geompy.MakePartition([face1], [l[2], l[4], l[5], l[6], l[7]], [], [], geompy.ShapeType["FACE"], 0, [], 0)
if with_solid:
# Add some faces corresponding to the solid layer outside
else:
return v, l, arc1, part1
-def pointsProjetes(study, vref, face):
- geompy = geomBuilder.New(study)
+def pointsProjetes(vref, face):
vface = geompy.ExtractShapes(face, geompy.ShapeType["VERTEX"], True)
- vord = range(len(vref))
+ vord = list(range(len(vref)))
plan = geompy.MakePlaneThreePnt(vref[0], vref[1], vref[-1], 10000)
vproj = [ geompy.MakeProjection(vert, plan) for vert in vface ]
for i,v in enumerate(vproj):
vord[dist[0][1]] = vface[i]
return vord
-def arcsProjetes(study, vf, face):
- geompy = geomBuilder.New(study)
+def arcsProjetes(vf, face):
lface = geompy.ExtractShapes(face, geompy.ShapeType["EDGE"], True)
- lord = range(3)
+ lord = list(range(3))
ends = [vf[1], vf[6], vf[7], vf[3]]
for i in range(3):
for lf in lface:
if (((geompy.MinDistance(pts[0], ends[i]) < 0.001) and (geompy.MinDistance(pts[1], ends[i+1]) < 0.001)) or
((geompy.MinDistance(pts[1], ends[i]) < 0.001) and (geompy.MinDistance(pts[0], ends[i+1]) < 0.001))):
lord[i] = lf
- print "arc_%d OK"%i
+ #print "arc_%d OK"%i
break
pass
return lord
-def build_shape(study, r1, r2, h1, h2, solid_thickness=0):
+def build_shape(r1, r2, h1, h2, solid_thickness=0, progressBar=None ):
""" Builds the final shape """
-
+
+ if progressBar is not None:
+ time0 = time.time()
+ print(time.time() -time0)
+
if solid_thickness < 1e-7:
with_solid = False
else:
with_solid = True
- geompy = geomBuilder.New(study)
+ global geompy
+ geompy = geomBuilder.New()
O = geompy.MakeVertex(0, 0, 0)
OX = geompy.MakeVectorDXDYDZ(1, 0, 0)
a1 = 45.0*(1.0 -ratio)/seuilmax
# --- Creation of the jonction faces
- [faci, sect45, arc1, l1, lord90, lord45, edges, arcextru] = jonction(study, r1, r2,\
+ [faci, sect45, arc1, l1, lord90, lord45, edges, arcextru] = jonction(r1, r2,\
h1, h2, a1)
+ if progressBar is not None:
+ progressBar.addSteps(2)
+ print(time.time() -time0)
+
if with_solid:
# The same code is executed again with different external radiuses in order
# to get the needed faces and edges to build the solid layer of the pipe
[faci_ext, sect45_ext, arc1_ext, l1_ext, \
- lord90_ext, lord45_ext, edges_ext, arcextru_ext] = jonction(study, r1 + solid_thickness, r2 + solid_thickness,\
+ lord90_ext, lord45_ext, edges_ext, arcextru_ext] = jonction(r1 + solid_thickness, r2 + solid_thickness,\
h1, h2, a1)
faces_jonction_ext = []
for i,l in enumerate(lord90):
for i,l in enumerate(lord45):
faces_jonction_ext.append(geompy.MakeQuad2Edges(lord45[i],lord45_ext[i]))
- for i,face in enumerate(faces_jonction_ext):
- geompy.addToStudy(faces_jonction_ext[i], "faci_ext_%d"%i)
-
+ if progressBar is not None:
+ progressBar.addSteps(4)
+ print(time.time() -time0)
+
# --- extrusion droite des faces de jonction, pour reconstituer les demi cylindres
if with_solid:
sect45 = geompy.MakeCompound([sect45]+faces_jonction_ext[-3:])
sect45 = geompy.MakeGlueEdges(sect45, 1e-7)
+ if progressBar is not None:
+ progressBar.addSteps(1)
+ print(time.time() -time0)
+
extru1 = geompy.MakePrismVecH(sect45, OX, h1+10)
faces_coupe = faci[5:]
if with_solid:
faces_coupe = faci[5:]+faces_jonction_ext[:3]
- base2 = geompy.MakePartition(faces_coupe, [], [], [], geompy.ShapeType["FACE"], 0, [], 0, True)
+ base2 = geompy.MakePartition(faces_coupe, [], [], [], geompy.ShapeType["FACE"], 0, [], 0)
extru2 = geompy.MakePrismVecH(base2, OZ, h2)
+ if progressBar is not None:
+ progressBar.addSteps(1)
+ print(time.time() -time0)
+
# --- partition et coupe
if with_solid:
demiDisque = geompy.MakeFaceWires([arc1, l1[0]], 1)
demiCylindre = geompy.MakePrismVecH(demiDisque, OX, h1)
+ if progressBar is not None:
+ progressBar.addSteps(1)
+ print(time.time() -time0)
+
box = geompy.MakeBox(0, -2*(r1+h1), -2*(r1+h1), 2*(r1+h1), 2*(r1+h1), 2*(r1+h1))
rot = geompy.MakeRotation(box, OY, 45*math.pi/180.0)
# NOTE: The following Cut takes almost half of the total execution time
garder = geompy.MakeCutList(demiCylindre, [extru2, rot], True)
- geompy.addToStudy(garder,"garder")
+ if progressBar is not None:
+ progressBar.addSteps(9)
+ print(time.time() -time0)
+
faces_coupe = faci[:5]
if with_solid:
faces_coupe.extend(faces_jonction_ext[-7:])
- t4=time.time()
- raccord = geompy.MakePartition([garder], faces_coupe + [arcextru], [], [], geompy.ShapeType["SOLID"], 0, [], 0, True)
+ raccord = geompy.MakePartition([garder], faces_coupe + [arcextru], [], [], geompy.ShapeType["SOLID"], 0, [], 0)
assemblage = geompy.MakeCompound([raccord, extru1, extru2])
assemblage = geompy.MakeGlueFaces(assemblage, 1e-7)
-
+
+ if progressBar is not None:
+ progressBar.addSteps(3)
+ print(time.time() -time0)
+
box = geompy.MakeBox(-1, -(r1+r2+2*solid_thickness), -1, h1, r1+r2+2*solid_thickness, h2)
- geompy.addToStudy(box, "box")
# NOTE: This operation takes about 1/4 of the total execution time
final = geompy.MakeCommonList([box, assemblage], True)
+ if progressBar is not None:
+ progressBar.addSteps(5)
+ print(time.time() -time0)
+
# --- Partie inférieure
- v3, l3, arc3, part3 = demidisk(study, r1, a1, 180.0, solid_thickness)
- geompy.addToStudy(part3,"part3")
+
+ v3, l3, arc3, part3 = demidisk(r1, a1, 180.0, solid_thickness)
extru3 = geompy.MakePrismVecH(part3, OX, h1)
- geompy.addToStudy(extru3,"extru3")
# --- Symétrie
compound = geompy.MakeCompound([final, extru3])
plane = geompy.MakePlane(O,OX,2000)
compound_mirrored = geompy.MakeMirrorByPlane(compound, plane)
- final = geompy.MakeCompound([compound, compound_mirrored])
-
+ compound_total = geompy.MakeCompound([compound, compound_mirrored])
+ final = geompy.MakeGlueFaces(compound_total, 1e-07)
+
+ if progressBar is not None:
+ progressBar.addSteps(1)
+ print(time.time() -time0)
+
return final
-def jonction(study, r1, r2, h1, h2, a1):
+def jonction(r1, r2, h1, h2, a1):
""" Builds the jonction faces and
returns what is needed to build the whole pipe
"""
OZ = geompy.MakeVectorDXDYDZ(0, 0, 1)
# --- sections droites des deux demi cylindres avec le partionnement
- v1, l1, arc1, part1 = demidisk(study, r1, a1, 0.)
- v2, l2, arc2, part2 = demidisk(study, r2, a1, 90.0)
+ v1, l1, arc1, part1 = demidisk(r1, a1, 0.)
+ v2, l2, arc2, part2 = demidisk(r2, a1, 90.0)
# --- extrusion des sections --> demi cylindres de travail, pour en extraire les sections utilisées au niveau du Té
# et enveloppe cylindrique du cylindre principal
plan1 = geompy.MakePlane(O, OX, 4*r1)
planr = geompy.MakeRotation(plan1, OY, 45*math.pi/180.0)
- geompy.addToStudy(planr, 'planr')
sect45 = geompy.MakeCommonList([demicyl1, planr], True)
- geompy.addToStudy(sect45, 'sect45')
-
sect90 = geompy.MakeCommonList([demicyl2, arcextru], True)
- geompy.addToStudy(sect90, 'sect90')
-
+ #geompy.addToStudy(sect90, "sect90")
+
# --- liste ordonnée des points projetés sur les deux sections
- vord45 = pointsProjetes(study, v1, sect45)
- vord90 = pointsProjetes(study, v2, sect90)
- for i,v in enumerate(vord45):
- geompy.addToStudyInFather(sect45, v, 'v%d'%i)
- for i,v in enumerate(vord90):
- geompy.addToStudyInFather(sect90, v, 'v%d'%i)
+ vord45 = pointsProjetes(v1, sect45)
+ vord90 = pointsProjetes(v2, sect90)
# --- identification des projections des trois arcs de cercle, sur les deux sections.
-
- lord45 = arcsProjetes(study, vord45, sect45)
- lord90 = arcsProjetes(study, vord90, sect90)
- for i,l in enumerate(lord45):
- geompy.addToStudyInFather(sect45, l, 'l%d'%i)
- for i,l in enumerate(lord90):
- geompy.addToStudyInFather(sect90, l, 'l%d'%i)
-
+
+ lord45 = arcsProjetes(vord45, sect45)
+ lord90 = arcsProjetes(vord90, sect90)
+
# --- abaissement des quatre points centraux de la section du cylindre secondaire
dz = -r2/2.0
for i in (0, 2, 4, 5):
vord90[i] = geompy.TranslateDXDYDZ(vord90[i], 0, 0, dz, True)
- geompy.addToStudyInFather(sect90, vord90[i], 'vm%d'%i)
+ #geompy.addToStudyInFather(sect90, vord90[i], 'vm%d'%i)
# --- création des deux arêtes curvilignes sur l'enveloppe cylindrique du cylindre principal, à la jonction
lipts = ((6, 6, 4), (7, 7, 5))
for i, ipts in enumerate(lipts):
- print i, ipts
+ #print i, ipts
p0 = vord90[ipts[0]]
p1 = vord45[ipts[1]]
p2 = vord45[ipts[2]]
plan = geompy.MakePlaneThreePnt(p0, p1, p2, 10000)
#geompy.addToStudy(plan, "plan%d"%i)
section = geompy.MakeSection(plan, arcextru, True)
- secpart = geompy.MakePartition([section], [sect45, sect90], [], [], geompy.ShapeType["EDGE"], 0, [], 0, True)
- geompy.addToStudy(secpart, "secpart%d"%i)
+ secpart = geompy.MakePartition([section], [sect45, sect90], [], [], geompy.ShapeType["EDGE"], 0, [], 0)
+ #geompy.addToStudy(secpart, "secpart%d"%i)
lsec = geompy.ExtractShapes(secpart, geompy.ShapeType["EDGE"], True)
for l in lsec:
if (((geompy.MinDistance(pts[0], p0) < 0.001) and (geompy.MinDistance(pts[1], p1) < 0.001)) or
((geompy.MinDistance(pts[1], p0) < 0.001) and (geompy.MinDistance(pts[0], p1) < 0.001))):
curv[i+2] =l
- print "curv_%d OK"%i
+ #print "curv_%d OK"%i
break
# --- creation des arêtes droites manquantes, des faces et volumes pour les quatre volumes de la jonction
edges[5] = geompy.MakeLineTwoPnt(vord45[5], vord90[5])
edges[6] = curv[2]
edges[7] = curv[3]
- for i,l in enumerate(edges):
- print i
- geompy.addToStudy( l, "edge%d"%i)
-
+
ed45 = [None for i in range(8)]
ed45[0] = geompy.MakeLineTwoPnt(vord45[0], vord45[2])
ed45[1] = geompy.MakeLineTwoPnt(vord45[0], vord45[1])
ed45[5] = geompy.MakeLineTwoPnt(vord45[4], vord45[5])
ed45[6] = geompy.MakeLineTwoPnt(vord45[0], vord45[4])
ed45[7] = geompy.MakeLineTwoPnt(vord45[2], vord45[5])
- for i,l in enumerate(ed45):
- geompy.addToStudyInFather(sect45, l, "ed45_%d"%i)
-
+
ed90 = [None for i in range(8)]
ed90[0] = geompy.MakeLineTwoPnt(vord90[0], vord90[2])
ed90[1] = geompy.MakeLineTwoPnt(vord90[0], vord90[1])
ed90[5] = geompy.MakeLineTwoPnt(vord90[4], vord90[5])
ed90[6] = geompy.MakeLineTwoPnt(vord90[0], vord90[4])
ed90[7] = geompy.MakeLineTwoPnt(vord90[2], vord90[5])
- for i,l in enumerate(ed90):
- geompy.addToStudyInFather(sect90, l, "ed90_%d"%i)
faci = []
faci.append(geompy.MakeFaceWires([ed45[6], edges[0], ed90[6], edges[4]], 0))
faci.append(geompy.MakeFaceWires([ed45[2], edges[4], ed90[2], edges[6]], 0))
faci.append(geompy.MakeFaceWires([ed45[5], edges[4], ed90[5], edges[5]], 0))
faci.append(geompy.MakeFaceWires([ed45[4], edges[5], ed90[4], edges[7]], 0))
- faci.append(geompy.MakeFaceWires([ed90[0], ed90[6], ed90[5], ed90[7]], 0))
- faci.append(geompy.MakeFaceWires([ed90[1], ed90[6], ed90[2], lord90[0]], 0))
- faci.append(geompy.MakeFaceWires([ed90[2], ed90[5], ed90[4], lord90[1]], 0))
- faci.append(geompy.MakeFaceWires([ed90[3], ed90[7], ed90[4], lord90[2]], 0))
- for i,f in enumerate(faci):
- geompy.addToStudy(f, "faci_%d"%i)
-
+ faci.append(geompy.MakeFaceWires([ed90[0], ed90[6], ed90[5], ed90[7]], 0))
+ faci.append(geompy.MakeFaceWires([ed90[1], ed90[6], ed90[2], lord90[0]], 0))
+ faci.append(geompy.MakeFaceWires([ed90[2], ed90[5], ed90[4], lord90[1]], 0))
+ faci.append(geompy.MakeFaceWires([ed90[3], ed90[7], ed90[4], lord90[2]], 0))
+
return faci, sect45, arc1, l1, lord90, lord45, edges, arcextru
-if __name__=="__main__":
+def test_t_shape_builder():
"""For testing purpose"""
salome.salome_init()
- theStudy = salome.myStudy
- geompy = geomBuilder.New(theStudy)
- res = build_shape(theStudy, 80., 20., 100., 100., 10.)
- """
- for i,v in enumerate(res):
- geompy.addToStudy(v,"v%d"%i)
- """
-
- #res = demidisk(theStudy, 80, 45, 0, 10)
- #geompy.addToStudy(res[3], "res")
- #for i,v in enumerate(res[0]):
- # geompy.addToStudy(v,"v%d"%i)
- geompy.addToStudy(res, "res")
+ geompy = geomBuilder.New()
+ for r1 in [1., 100.]:
+ for r2 in [0.9*r1, 0.5*r1, 0.1*r1, 0.05*r1]:
+ for thickness in [r1/100., r1/10., r1/2.]:
+ print(r1, r2, thickness)
+ h1 = r1 * 2.0
+ h2 = h1
+ try:
+ res = build_shape(r1, r2, h1, h2, thickness)
+ geompy.addToStudy(res, "res_%f_%f_%f"%(r1,r2, thickness))
+ except:
+ print("problem with res_%f_%f_%f"%(r1,r2, thickness))
+if __name__=="__main__":
+ """For testing purpose"""
+ test_t_shape_builder()
