From 8a6296ea1ac1d48153e6cfd552da90f42cdae302 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Renaud=20N=C3=A9d=C3=A9lec?= Date: Tue, 4 Nov 2014 16:56:54 +0100 Subject: [PATCH] some cleaning and update of the dialog box --- src/Tools/CMakeLists.txt | 29 +++++++ .../{salome_plugins.py => geom_plugins.py} | 4 +- src/Tools/{ => t_shape}/t_shape_builder.py | 71 ++++++---------- src/Tools/{ => t_shape}/t_shape_dialog.py | 3 +- src/Tools/{ => t_shape}/t_shape_dialog.ui | 82 +++++++++++++++---- src/Tools/{ => t_shape}/t_shape_dialog_ui.py | 31 +++++-- 6 files changed, 146 insertions(+), 74 deletions(-) create mode 100644 src/Tools/CMakeLists.txt rename src/Tools/{salome_plugins.py => geom_plugins.py} (94%) rename src/Tools/{ => t_shape}/t_shape_builder.py (90%) rename src/Tools/{ => t_shape}/t_shape_dialog.py (95%) rename src/Tools/{ => t_shape}/t_shape_dialog.ui (61%) rename src/Tools/{ => t_shape}/t_shape_dialog_ui.py (74%) diff --git a/src/Tools/CMakeLists.txt b/src/Tools/CMakeLists.txt new file mode 100644 index 000000000..435c5fdae --- /dev/null +++ b/src/Tools/CMakeLists.txt @@ -0,0 +1,29 @@ +# Copyright (C) 2012-2014 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 +# + +ADD_SUBDIRECTORY(t_shape) + +# scripts / static +SET(plugin_SCRIPTS + geom_plugins.py +) + +# --- rules --- + +SALOME_INSTALL_SCRIPTS("${plugin_SCRIPTS}" ${SALOME_GEOM_INSTALL_PLUGINS}) diff --git a/src/Tools/salome_plugins.py b/src/Tools/geom_plugins.py similarity index 94% rename from src/Tools/salome_plugins.py rename to src/Tools/geom_plugins.py index b55d4d7ee..00ad4f149 100644 --- a/src/Tools/salome_plugins.py +++ b/src/Tools/geom_plugins.py @@ -35,9 +35,9 @@ def t_shape_fluid(context): # gui and used to create the shape of the tube. dialog.exec_() if dialog.wasOk(): - r1, r2, h1, h2 = dialog.getData() + r1, r2, h1, h2, thickness = dialog.getData() #QMessageBox.about(None, "Building in progress", "building shape, please be patient") - shape = t_shape_builder.build_shape(activeStudy, r1, r2, h1, h2) + shape = t_shape_builder.build_shape(activeStudy, r1, r2, h1, h2, thickness) entry = xalome.addToStudy(activeStudy, shape, "T_shape_fluid" ) xalome.displayShape(entry) #if dialog.wasOk(): diff --git a/src/Tools/t_shape_builder.py b/src/Tools/t_shape/t_shape_builder.py similarity index 90% rename from src/Tools/t_shape_builder.py rename to src/Tools/t_shape/t_shape_builder.py index dfaa4a4d8..0321c3616 100644 --- a/src/Tools/t_shape_builder.py +++ b/src/Tools/t_shape/t_shape_builder.py @@ -7,6 +7,7 @@ import GEOM from salome.geom import geomBuilder import math import SALOMEDS +import time def demidisk(study, r1, a1, roty=0, solid_thickness=0): @@ -47,26 +48,31 @@ def demidisk(study, r1, a1, roty=0, solid_thickness=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) + if with_solid: - # Vertices + # Add some faces corresponding to the solid layer outside + # the fluid part + + # --- Vertices v0 = geompy.MakeVertex(0, r1 + solid_thickness, 0) v1 = geompy.MakeRotation(v0, OX, a1*math.pi/180.0) v2 = geompy.MakeRotation(v0, OX, math.pi - (a1*math.pi/180.0)) v3 = geompy.MakeRotation(v0, OX, math.pi) v.extend([v0,v1,v3,v2]) # The order is important for use in pointsProjetes + # --- Lines l0 = geompy.MakeLineTwoPnt(v[1], v0) l2 = geompy.MakeRotation(l0, OX, a1*math.pi/180.0) l3 = geompy.MakeRotation(l0, OX, math.pi - (a1*math.pi/180.0)) + # --- Faces face2 = geompy.MakeRevolution(l0, OX, a1*math.pi/180.0) face3 = geompy.MakeRevolution(l2, OX, math.pi - 2*a1*math.pi/180.0) face4 = geompy.MakeRevolution(l3, OX, a1*math.pi/180.0) - part0 = geompy.MakePartition([face1], [l[2], l[4], l[5], l[6], l[7]], [], [], geompy.ShapeType["FACE"], 0, [], 0, True) - compound1 = geompy.MakeCompound([part0, face2, face3, face4]) + # --- Compound of the "fluid part" of the divided disk and the additional faces + compound1 = geompy.MakeCompound([part1, face2, face3, face4]) + # --- Glue edges part1 = geompy.MakeGlueEdges(compound1,1e-7) - else: - part1 = geompy.MakePartition([face1], [l[2], l[4], l[5], l[6], l[7]], [], [], geompy.ShapeType["FACE"], 0, [], 0, True) - + if roty != 0: vrot = [ geompy.MakeRotation(vert, OY, roty*math.pi/180.0) for vert in v ] lrot = [ geompy.MakeRotation(lin, OY, roty*math.pi/180.0) for lin in l ] @@ -85,7 +91,6 @@ def pointsProjetes(study, vref, face): for i,v in enumerate(vproj): dist = [ (geompy.MinDistance(v, vr), j) for j,vr in enumerate(vref) ] dist.sort() - #print dist if dist[0][0] < 1.e-3: vord[dist[0][1]] = vface[i] return vord @@ -107,6 +112,8 @@ def arcsProjetes(study, vf, face): return lord def build_shape(study, r1, r2, h1, h2, solid_thickness=0): + """ Builds the final shape """ + if solid_thickness < 1e-7: with_solid = False else: @@ -124,16 +131,13 @@ def build_shape(study, r1, r2, h1, h2, solid_thickness=0): ratio = float(r2)/float(r1) if ratio > (1.0 -seuilmax): a1 = 45.0*(1.0 -ratio)/seuilmax - - """ - res = geompy.MakeCompound([demicyl1,demicyl2]) - return res - """ - # --- creation des faces de la jonction + # --- Creation of the jonction faces [faci, sect45, arc1, l1, lord90, lord45, edges, arcextru] = jonction(study, r1, r2,\ h1, h2, a1) 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,\ h1, h2, a1) @@ -149,17 +153,12 @@ def build_shape(study, r1, r2, h1, h2, solid_thickness=0): geompy.addToStudy(faces_jonction_ext[i], "faci_ext_%d"%i) # --- extrusion droite des faces de jonction, pour reconstituer les demi cylindres - # TODO : ajouter les faces nécessaires à sect45 dans le cas avec solide if with_solid: sect45 = geompy.MakeCompound([sect45]+faces_jonction_ext[-3:]) sect45 = geompy.MakeGlueEdges(sect45, 1e-7) - #return sect45, faces_jonction_ext[-3:] extru1 = geompy.MakePrismVecH(sect45, OX, h1+10) - #base2 = geompy.MakeCompound(faci[5:]) - #base2 = geompy.MakeGlueEdges(base2, 1e-7) - # RNC : perf faces_coupe = faci[5:] if with_solid: faces_coupe = faci[5:]+faces_jonction_ext[:3] @@ -177,22 +176,22 @@ def build_shape(study, r1, r2, h1, h2, solid_thickness=0): 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") 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) assemblage = geompy.MakeCompound([raccord, extru1, extru2]) assemblage = geompy.MakeGlueFaces(assemblage, 1e-7) - # RNC : perf - #assemblage = geompy.MakePartition([raccord, extru1, extru2], [], [], [], geompy.ShapeType["SOLID"], 0, [], 0, True) - #return extru2, garder, raccord - 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) # --- Partie inférieure @@ -212,6 +211,9 @@ def build_shape(study, r1, r2, h1, h2, solid_thickness=0): def jonction(study, r1, r2, h1, h2, a1): + """ Builds the jonction faces and + returns what is needed to build the whole pipe + """ O = geompy.MakeVertex(0, 0, 0) OX = geompy.MakeVectorDXDYDZ(1, 0, 0) @@ -221,9 +223,7 @@ def jonction(study, r1, r2, h1, h2, a1): # --- 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) - #elems_disk1 = [v1, l1, arc1, part1] - #elems_disk2 = [v2, l2, arc2, part2] - + # --- extrusion des sections --> demi cylindres de travail, pour en extraire les sections utilisées au niveau du Té # et enveloppe cylindrique du cylindre principal @@ -264,23 +264,11 @@ def jonction(study, r1, r2, h1, h2, a1): geompy.addToStudyInFather(sect90, l, 'l%d'%i) # --- abaissement des quatre points centraux de la section du cylindre secondaire - - #if with_solid: - #dz = -(r2 + solid_thickness)/2.0 - #else: - #dz = -r2/2.0 + 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) - #if with_solid: - #for i in (1, 3, 6, 7): - #vord90[i] = geompy.TranslateDXDYDZ(vord90[i], 0, 0, dz*solid_thickness/(r2+solid_thickness), True) - - """ - res=vord90 - return res - """ # --- création des deux arêtes curvilignes sur l'enveloppe cylindrique du cylindre principal, à la jonction @@ -301,9 +289,7 @@ def jonction(study, r1, r2, h1, h2, a1): secpart = geompy.MakePartition([section], [sect45, sect90], [], [], geompy.ShapeType["EDGE"], 0, [], 0, True) geompy.addToStudy(secpart, "secpart%d"%i) lsec = geompy.ExtractShapes(secpart, geompy.ShapeType["EDGE"], True) - #print "len(lsec)", len(lsec) - # TODO : revoir ça dans le cas avec solide for l in lsec: pts = geompy.ExtractShapes(l, geompy.ShapeType["VERTEX"], True) if (((geompy.MinDistance(pts[0], p0) < 0.001) and (geompy.MinDistance(pts[1], p1) < 0.001)) or @@ -311,9 +297,6 @@ def jonction(study, r1, r2, h1, h2, a1): curv[i+2] =l print "curv_%d OK"%i break - # RNC : commente temporairement - #for i,l in enumerate(curv): - # geompy.addToStudyInFather(arcextru, l, "curv%d"%i) # --- creation des arêtes droites manquantes, des faces et volumes pour les quatre volumes de la jonction diff --git a/src/Tools/t_shape_dialog.py b/src/Tools/t_shape/t_shape_dialog.py similarity index 95% rename from src/Tools/t_shape_dialog.py rename to src/Tools/t_shape/t_shape_dialog.py index 297be4b21..192684be0 100644 --- a/src/Tools/t_shape_dialog.py +++ b/src/Tools/t_shape/t_shape_dialog.py @@ -44,8 +44,9 @@ class TShapeDialog(QtGui.QDialog): r2 = self.ui.doubleSpinBox_2.value() h1 = self.ui.doubleSpinBox_3.value() h2 = self.ui.doubleSpinBox_4.value() + thickness = self.ui.doubleSpinBox_5.value() - return r1, r2, h1, h2 + return r1, r2, h1, h2, thickness def reject(self): self._wasOk = False diff --git a/src/Tools/t_shape_dialog.ui b/src/Tools/t_shape/t_shape_dialog.ui similarity index 61% rename from src/Tools/t_shape_dialog.ui rename to src/Tools/t_shape/t_shape_dialog.ui index 7a9a52471..8caa136b5 100644 --- a/src/Tools/t_shape_dialog.ui +++ b/src/Tools/t_shape/t_shape_dialog.ui @@ -6,15 +6,15 @@ 0 0 - 321 - 242 + 349 + 283 Dialog - - + + @@ -58,14 +58,28 @@ - - - - Build solid part - - + + + + + + Build solid part + + + + + + + Solid thickness + + + + + + + - + Qt::Horizontal @@ -86,12 +100,12 @@ accept() - 248 - 254 + 205 + 241 157 - 274 + 250 @@ -102,12 +116,44 @@ reject() - 316 - 260 + 205 + 241 + + + 214 + 250 + + + + + checkBox + clicked(bool) + label_5 + setEnabled(bool) + + + 89 + 184 + + + 107 + 205 + + + + + checkBox + clicked(bool) + doubleSpinBox_5 + setEnabled(bool) + + + 140 + 178 - 286 - 274 + 277 + 212 diff --git a/src/Tools/t_shape_dialog_ui.py b/src/Tools/t_shape/t_shape_dialog_ui.py similarity index 74% rename from src/Tools/t_shape_dialog_ui.py rename to src/Tools/t_shape/t_shape_dialog_ui.py index c4353e11f..b034e677a 100644 --- a/src/Tools/t_shape_dialog_ui.py +++ b/src/Tools/t_shape/t_shape_dialog_ui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 't_shape_dialog.ui' # -# Created: Thu Jun 19 11:13:43 2014 +# Created: Tue Nov 4 16:52:09 2014 # by: PyQt4 UI code generator 4.9.6 # # WARNING! All changes made in this file will be lost! @@ -26,9 +26,9 @@ except AttributeError: class Ui_Dialog(object): def setupUi(self, Dialog): Dialog.setObjectName(_fromUtf8("Dialog")) - Dialog.resize(331, 242) - self.verticalLayout = QtGui.QVBoxLayout(Dialog) - self.verticalLayout.setObjectName(_fromUtf8("verticalLayout")) + Dialog.resize(349, 283) + self.gridLayout_3 = QtGui.QGridLayout(Dialog) + self.gridLayout_3.setObjectName(_fromUtf8("gridLayout_3")) self.gridLayout = QtGui.QGridLayout() self.gridLayout.setObjectName(_fromUtf8("gridLayout")) self.doubleSpinBox_2 = QtGui.QDoubleSpinBox(Dialog) @@ -55,19 +55,30 @@ class Ui_Dialog(object): self.label_4 = QtGui.QLabel(Dialog) self.label_4.setObjectName(_fromUtf8("label_4")) self.gridLayout.addWidget(self.label_4, 4, 0, 1, 1) - self.verticalLayout.addLayout(self.gridLayout) + self.gridLayout_3.addLayout(self.gridLayout, 0, 0, 1, 1) + self.gridLayout_2 = QtGui.QGridLayout() + self.gridLayout_2.setObjectName(_fromUtf8("gridLayout_2")) self.checkBox = QtGui.QCheckBox(Dialog) self.checkBox.setObjectName(_fromUtf8("checkBox")) - self.verticalLayout.addWidget(self.checkBox) + self.gridLayout_2.addWidget(self.checkBox, 0, 0, 1, 1) + self.label_5 = QtGui.QLabel(Dialog) + self.label_5.setObjectName(_fromUtf8("label_5")) + self.gridLayout_2.addWidget(self.label_5, 1, 0, 1, 1) + self.doubleSpinBox_5 = QtGui.QDoubleSpinBox(Dialog) + self.doubleSpinBox_5.setObjectName(_fromUtf8("doubleSpinBox_5")) + self.gridLayout_2.addWidget(self.doubleSpinBox_5, 1, 1, 1, 1) + self.gridLayout_3.addLayout(self.gridLayout_2, 1, 0, 1, 1) self.buttonBox = QtGui.QDialogButtonBox(Dialog) self.buttonBox.setOrientation(QtCore.Qt.Horizontal) self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Ok) self.buttonBox.setObjectName(_fromUtf8("buttonBox")) - self.verticalLayout.addWidget(self.buttonBox) + self.gridLayout_3.addWidget(self.buttonBox, 2, 0, 1, 1) self.retranslateUi(Dialog) QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(_fromUtf8("accepted()")), Dialog.accept) QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(_fromUtf8("rejected()")), Dialog.reject) + QtCore.QObject.connect(self.checkBox, QtCore.SIGNAL(_fromUtf8("clicked(bool)")), self.label_5.setEnabled) + QtCore.QObject.connect(self.checkBox, QtCore.SIGNAL(_fromUtf8("clicked(bool)")), self.doubleSpinBox_5.setEnabled) QtCore.QMetaObject.connectSlotsByName(Dialog) def retranslateUi(self, Dialog): @@ -77,8 +88,8 @@ class Ui_Dialog(object): self.label_2.setText(_translate("Dialog", "Small pipe radius", None)) self.label_4.setText(_translate("Dialog", "Small pipe height", None)) self.checkBox.setText(_translate("Dialog", "Build solid part", None)) - - + self.label_5.setText(_translate("Dialog", "Solid thickness", None)) + if __name__ == "__main__": import sys app = QtGui.QApplication(sys.argv) @@ -88,3 +99,5 @@ if __name__ == "__main__": Dialog.show() sys.exit(app.exec_()) + + -- 2.39.2