From df81dd75636c073b4f5e74395403e023d6904ae1 Mon Sep 17 00:00:00 2001 From: imn Date: Mon, 14 Nov 2016 15:25:39 +0300 Subject: [PATCH] Delete "activeStudy" in python scripts --- src/Tools/geom_plugins.py | 4 +-- src/Tools/t_shape/t_shape_builder.py | 40 ++++++++++++--------------- src/Tools/t_shape/t_shape_dialog.py | 9 ++---- src/Tools/t_shape/t_shape_progress.py | 4 +-- 4 files changed, 23 insertions(+), 34 deletions(-) diff --git a/src/Tools/geom_plugins.py b/src/Tools/geom_plugins.py index 07baf9ce1..f1aa482e2 100644 --- a/src/Tools/geom_plugins.py +++ b/src/Tools/geom_plugins.py @@ -21,13 +21,11 @@ import salome_pluginsmanager -def t_shape_fluid(context): - activeStudy = context.study +def t_shape_fluid(): #from salome.geom.t_shape import t_shape_builder from salome.geom.t_shape import t_shape_dialog dialog = t_shape_dialog.getDialog() - dialog.setContext(context) dialog.show() salome_pluginsmanager.AddFunction('T shape fluid', diff --git a/src/Tools/t_shape/t_shape_builder.py b/src/Tools/t_shape/t_shape_builder.py index 1f3af53aa..a65a9ec6d 100644 --- a/src/Tools/t_shape/t_shape_builder.py +++ b/src/Tools/t_shape/t_shape_builder.py @@ -29,13 +29,11 @@ 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) @@ -101,8 +99,7 @@ def demidisk(study, r1, a1, roty=0, solid_thickness=0): 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)) plan = geompy.MakePlaneThreePnt(vref[0], vref[1], vref[-1], 10000) @@ -114,8 +111,7 @@ def pointsProjetes(study, vref, face): 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) ends = [vf[1], vf[6], vf[7], vf[3]] @@ -130,7 +126,7 @@ def arcsProjetes(study, vf, face): pass return lord -def build_shape(study, r1, r2, h1, h2, solid_thickness=0, progressBar=None ): +def build_shape(r1, r2, h1, h2, solid_thickness=0, progressBar=None ): """ Builds the final shape """ if progressBar is not None: @@ -143,7 +139,7 @@ def build_shape(study, r1, r2, h1, h2, solid_thickness=0, progressBar=None ): with_solid = True global geompy - geompy = geomBuilder.New(study) + geompy = geomBuilder.New(salome.myStudy) O = geompy.MakeVertex(0, 0, 0) OX = geompy.MakeVectorDXDYDZ(1, 0, 0) @@ -157,7 +153,7 @@ def build_shape(study, r1, r2, h1, h2, solid_thickness=0, progressBar=None ): 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) @@ -167,7 +163,7 @@ def build_shape(study, r1, r2, h1, h2, solid_thickness=0, progressBar=None ): # 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): @@ -246,7 +242,7 @@ def build_shape(study, r1, r2, h1, h2, solid_thickness=0, progressBar=None ): # --- Partie inférieure - v3, l3, arc3, part3 = demidisk(study, r1, a1, 180.0, solid_thickness) + v3, l3, arc3, part3 = demidisk(r1, a1, 180.0, solid_thickness) extru3 = geompy.MakePrismVecH(part3, OX, h1) # --- Symétrie @@ -264,11 +260,10 @@ def build_shape(study, r1, r2, h1, h2, solid_thickness=0, progressBar=None ): 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 """ - #geompy = geomBuilder.New(study) O = geompy.MakeVertex(0, 0, 0) OX = geompy.MakeVectorDXDYDZ(1, 0, 0) @@ -276,8 +271,8 @@ def jonction(study, r1, r2, h1, h2, a1): 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 @@ -299,13 +294,13 @@ def jonction(study, r1, r2, h1, h2, a1): # --- liste ordonnée des points projetés sur les deux sections - vord45 = pointsProjetes(study, v1, sect45) - vord90 = pointsProjetes(study, v2, sect90) + 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) + lord45 = arcsProjetes(vord45, sect45) + lord90 = arcsProjetes(vord90, sect90) # --- abaissement des quatre points centraux de la section du cylindre secondaire @@ -390,8 +385,7 @@ def jonction(study, r1, r2, h1, h2, a1): def test_t_shape_builder(): """For testing purpose""" salome.salome_init() - theStudy = salome.myStudy - geompy = geomBuilder.New(theStudy) + geompy = geomBuilder.New(salome.myStudy) 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.]: @@ -399,7 +393,7 @@ def test_t_shape_builder(): h1 = r1 * 2.0 h2 = h1 try: - res = build_shape(theStudy, r1, r2, h1, h2, thickness) + 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) diff --git a/src/Tools/t_shape/t_shape_dialog.py b/src/Tools/t_shape/t_shape_dialog.py index 1f458e194..34b081976 100644 --- a/src/Tools/t_shape/t_shape_dialog.py +++ b/src/Tools/t_shape/t_shape_dialog.py @@ -39,9 +39,6 @@ class TShapeDialog(Ui_Dialog,QWidget): self.dsb_smallRadius.setValue(40.0) self.dsb_bigHeight.setValue(80.0) self.dsb_smallHeight.setValue(80.0) - - def setContext(self, context): - self._activeStudy = context.study def accept(self): from salome.geom.t_shape import t_shape_progress @@ -50,10 +47,10 @@ class TShapeDialog(Ui_Dialog,QWidget): self.close() r1, r2, h1, h2, thickness = self.getData() #QMessageBox.about(None, "Building in progress", "building shape, please be patient") - #shape = t_shape_builder.build_shape(activeStudy, r1, r2, h1, h2, thickness) + #shape = t_shape_builder.build_shape(r1, r2, h1, h2, thickness) shapeBuilder = t_shape_progress.t_shape_progress() - shape = shapeBuilder.run(self._activeStudy, r1, r2, h1, h2, thickness) - entry = xalome.addToStudy(self._activeStudy, shape, "T_shape_fluid" ) + shape = shapeBuilder.run(r1, r2, h1, h2, thickness) + entry = xalome.addToStudy(shape, "T_shape_fluid" ) xalome.displayShape(entry) def getData(self): diff --git a/src/Tools/t_shape/t_shape_progress.py b/src/Tools/t_shape/t_shape_progress.py index da396900d..c843003ef 100644 --- a/src/Tools/t_shape/t_shape_progress.py +++ b/src/Tools/t_shape/t_shape_progress.py @@ -30,8 +30,8 @@ class t_shape_progress(QProgressDialog): QProgressDialog.__init__(self, "t_shape fluid build", "stop", 0, self._nmaxSteps, parent, Qt.Tool) self.show() - def run(self, activeStudy, r1, r2, h1, h2, thickness): - shape = t_shape_builder.build_shape(activeStudy, r1, r2, h1, h2, thickness, self) + def run(self, r1, r2, h1, h2, thickness): + shape = t_shape_builder.build_shape(r1, r2, h1, h2, thickness, self) self.setValue(self._nmaxSteps) return shape -- 2.39.2