From a9947558ccbcf9568d766ab9baa9c422baffa57a Mon Sep 17 00:00:00 2001 From: NATHALIE GORE Date: Tue, 1 Oct 2019 15:24:48 +0200 Subject: [PATCH] Update for documentation and some fixes --- src/PythonAddons/doc/addons_Features.rst | 4 +- .../doc/compoundVerticesFeature.rst | 39 ++++++ src/PythonAddons/doc/images/compound.png | Bin 0 -> 213 bytes .../doc/images/compoundVertices.png | Bin 0 -> 1803 bytes .../doc/images/compoundVerticesPanel.png | Bin 0 -> 7855 bytes .../doc/images/importParameters.png | Bin 0 -> 191 bytes .../doc/images/importParametersPanel.png | Bin 0 -> 5577 bytes .../doc/importParametersFeature.rst | 27 ++++ src/PythonAddons/macros/box/__init__.py | 1 - src/PythonAddons/macros/box/feature.py | 128 ------------------ src/PythonAddons/macros/box/icons/box_ico.png | Bin 405 -> 0 bytes src/PythonAddons/macros/box/widget.xml | 22 --- .../macros/compoundVertices/feature.py | 4 + .../macros/compoundVertices/widget.xml | 9 +- .../macros/importParameters/widget.xml | 6 +- 15 files changed, 85 insertions(+), 155 deletions(-) create mode 100644 src/PythonAddons/doc/compoundVerticesFeature.rst create mode 100644 src/PythonAddons/doc/images/compound.png create mode 100644 src/PythonAddons/doc/images/compoundVertices.png create mode 100644 src/PythonAddons/doc/images/compoundVerticesPanel.png create mode 100644 src/PythonAddons/doc/images/importParameters.png create mode 100644 src/PythonAddons/doc/images/importParametersPanel.png create mode 100644 src/PythonAddons/doc/importParametersFeature.rst delete mode 100644 src/PythonAddons/macros/box/__init__.py delete mode 100644 src/PythonAddons/macros/box/feature.py delete mode 100644 src/PythonAddons/macros/box/icons/box_ico.png delete mode 100644 src/PythonAddons/macros/box/widget.xml diff --git a/src/PythonAddons/doc/addons_Features.rst b/src/PythonAddons/doc/addons_Features.rst index ddeac8f89..1db6329d6 100644 --- a/src/PythonAddons/doc/addons_Features.rst +++ b/src/PythonAddons/doc/addons_Features.rst @@ -13,10 +13,12 @@ A feature description includes 4 files: - feature.py with python commands, - icon.png with image of button in the toolbar (the file is located at sub-folder /icons). -Two examples of already created custom features are: +Some examples of already created custom features are: .. toctree:: :titlesonly: :maxdepth: 1 rectangleFeature.rst + compoundVerticesFeature.rst + importParametersFeature.rst diff --git a/src/PythonAddons/doc/compoundVerticesFeature.rst b/src/PythonAddons/doc/compoundVerticesFeature.rst new file mode 100644 index 000000000..00cc89a67 --- /dev/null +++ b/src/PythonAddons/doc/compoundVerticesFeature.rst @@ -0,0 +1,39 @@ +.. _create_compound_Vertices: +.. |compoundVertices.icon| image:: images/compound.png + +compound Vertices +================= + +Compound Vertices is a feature and can be edited after execution. +It allows creation of several points basing on XYZ coords file. + +.. warning:: + Please note that it is better to limit yourself to create a maximum of 100 points. + +These set of points will be grouped in a compound and can be used for others features. + +To add a new set of points: + +#. select in the Main Menu *Macros - > Points set* item or +#. click |compoundVertices.icon| **Points set** button in Macros toolbar: + +The following property panel appears: + +.. image:: images/compoundVerticesPanel.png + :align: center + +.. centered:: + set of Points + +Select your points file and define a separator if it's different that " " in your points file + +Result +"""""" + +A resulting compound will contain the points + +.. image:: images/compoundVertices.png + :align: center + +.. centered:: + Points diff --git a/src/PythonAddons/doc/images/compound.png b/src/PythonAddons/doc/images/compound.png new file mode 100644 index 0000000000000000000000000000000000000000..5e119b39a983359f202624c1e9c2a1878ca5df56 GIT binary patch literal 213 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=DinK$vl=HlH+5kiEpy*OmP-ha9hT(^NX`VSDXolC=I}d&xCk(m*RSQ?^`fj@(W2VVEPL#txr9hT29m{oxj=ja@ziiH|~WD35-jwbUU82Ny!D;#^CAd=d#Wzp$P!& C$VWZ^ literal 0 HcmV?d00001 diff --git a/src/PythonAddons/doc/images/compoundVertices.png b/src/PythonAddons/doc/images/compoundVertices.png new file mode 100644 index 0000000000000000000000000000000000000000..9f624f8d22962fa20206dae61a2834bbfb895100 GIT binary patch literal 1803 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 Ju2Qs({5LqKm%9J} literal 0 HcmV?d00001 diff --git a/src/PythonAddons/doc/images/importParameters.png b/src/PythonAddons/doc/images/importParameters.png new file mode 100644 index 0000000000000000000000000000000000000000..3b382b91c46c96f98cb71d0591892129fc2fb908 GIT binary patch literal 191 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9F5he4R}c>anMpdfpR zr>`sfV-8skW5Kxd!lgi=I8PVH5R21$CwX%*DDpTfSG>P4Io*uQ=*P-1ogD(nHAff@ zdM;+3G%MC*GYdndVwBJmXRp$U|8Jz~hf9R+$qkCnYq_oVN_YE7-lhn)>vf4PCMVCv js>qs8Oj+?P{~7Z`#@N~O{xCcT+Qi`L>gTe~DWM4fY|B0) literal 0 HcmV?d00001 diff --git a/src/PythonAddons/doc/images/importParametersPanel.png b/src/PythonAddons/doc/images/importParametersPanel.png new file mode 100644 index 0000000000000000000000000000000000000000..f395df54656a1cb9336227f41acd99c1a97d9c8f GIT binary patch literal 5577 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 yp|>y@HASFe^QJ3=1^Gce@4q import Parameters* item or +#. click |importParameters.icon| **import Parameters** button in Macros toolbar: + +The following property panel appears: + +.. image:: images/importParametersPanel.png + :align: center + +.. centered:: + Import Parameters + + +Result +"""""" + +Several parameters are automatically created. diff --git a/src/PythonAddons/macros/box/__init__.py b/src/PythonAddons/macros/box/__init__.py deleted file mode 100644 index 1b78cf4b8..000000000 --- a/src/PythonAddons/macros/box/__init__.py +++ /dev/null @@ -1 +0,0 @@ -## Copyright (C) 2014-20xx OPEN CASCADE diff --git a/src/PythonAddons/macros/box/feature.py b/src/PythonAddons/macros/box/feature.py deleted file mode 100644 index 5af78bdec..000000000 --- a/src/PythonAddons/macros/box/feature.py +++ /dev/null @@ -1,128 +0,0 @@ -## Copyright (C) 2014-20xx OPEN CASCADE - -""" -Box macro-feature -""" - -from salome.shaper import model -from salome.shaper import geom - - -class BoxFeature(model.Feature): - """An example of feature implementation. - """ - -# Initializations - - def __init__(self): - """x.__init__(...) initializes x; see x.__class__.__doc__ for signature""" - model.Feature.__init__(self) - - @staticmethod - def ID(): - """Return Id of the feature.""" - return "Box_script" - - @staticmethod - def WIDTH_ID(): - """Returns ID of Width parameter.""" - return "width" - - @staticmethod - def LENGTH_ID(): - """Returns ID of Length parameter.""" - return "length" - - @staticmethod - def HEIGHT_ID(): - """Returns ID of Height parameter.""" - return "height" - - def getKind(self): - """Override Feature.getKind()""" - return BoxFeature.ID() - - -# Creation of the box at default size - - def initAttributes(self): - """Override Feature.initAttributes()""" - # Creating the input arguments of the feature - self.addRealInput(self.WIDTH_ID()) - self.addRealInput(self.LENGTH_ID()) - self.addRealInput(self.HEIGHT_ID()) - - # Creating the base of the box with unit values - mypart = model.activeDocument() - xoy = model.defaultPlane("XOY") - - # A base of the geometry - self.base = model.addSketch(mypart, xoy) - - p1 = geom.Pnt2d(0, 0) - p2 = geom.Pnt2d(0, 1) - p3 = geom.Pnt2d(1, 1) - p4 = geom.Pnt2d(1, 0) - - line = model.addPolygon(self.base, p1, p2, p3, p4) - - self.base.setFixed(line[0].startPoint()) - self.base.setVertical(line[0]) - - # Setting the size of the base with default values - # Width - self.width = self.base.setLength(line[3], 50) # Keeps the constraint for edition - # Length - self.length = self.base.setLength(line[0], 50) # Keeps the constraint for edition - - # Keeping the rectangle - self.base.setParallel(line[0], line[2]) - self.base.setParallel(line[1], line[3]) - self.base.setPerpendicular(line[0], line[3]) - - # execute sketch - mypart.setCurrentFeature(self.base.feature(), False) - model.updateFeatures() - - # Creating the extrusion (the box) at default size - # A box result - self.box = model.addExtrusion(mypart, self.base.selectFace(), 50) - self.box.setNestedSketch(self.base) -# self.box.setName(self.name()) - -# Edition of the box at user size - - def execute(self): - """F.execute() -- execute the feature""" - # Retrieving the user inputs - width = self.real(self.WIDTH_ID()) - length = self.real(self.LENGTH_ID()) - height = self.real(self.HEIGHT_ID()) - - # Editing the box - if width.text() == "": - self.base.setValue(self.width, width.value()) - else: - self.base.setValue(self.width, width.text()) - - if length.text() == "": - self.base.setValue(self.length, length.value()) - else: - self.base.setValue(self.length, length.text()) - - if (height.text() == ""): - self.box.setSize(height.value()) - else: - self.box.setSize(height.text()) - - # Publishing the result: not needed for Macro feature - # self.addResult( self.box.result() ) - - def isMacro(self): - """Override Feature.initAttributes(). - F.isMacro() -> True - - Box feature is macro: removes itself on the creation transaction - finish. - """ - return True diff --git a/src/PythonAddons/macros/box/icons/box_ico.png b/src/PythonAddons/macros/box/icons/box_ico.png deleted file mode 100644 index 104a1edde755dae03a8348b40b4667b0e70d860c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 405 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf2?p zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4kh`q^SLUNVrt6;T)nD-m^ zgx#~wmA}0-iBrvlZ+0>_!?oD=JHuAKnG4I#Lt<9A;joy~jYU0bN z6tK-c@ZFsDSF^2|A~iUDR-b)#rsw*C-!oS`xcpLmA?AB6cgy!myT?zvXKqgTBR*rX zyD|sEYyHEW*LGBW5cXcVJf8cJ%CV<=*Z)53c%l1HF?YkqZ~?)XJ9l3lJpN&sc - - - - - - - - - - - - - - - - - - - diff --git a/src/PythonAddons/macros/compoundVertices/feature.py b/src/PythonAddons/macros/compoundVertices/feature.py index 9b33c7fb5..bf5ce564b 100644 --- a/src/PythonAddons/macros/compoundVertices/feature.py +++ b/src/PythonAddons/macros/compoundVertices/feature.py @@ -2,6 +2,7 @@ Author: Nathalie Gore """ +from qtsalome import QMessageBox from salome.shaper import model from salome.shaper import geom import ModelAPI @@ -77,6 +78,9 @@ class compoundVertices(model.Feature): with open(filepath) as file: for line in file: coord = line.split(self.separator) + if len(coord) != 3: + #QMessageBox.warning( self, 'Error!', '3D coords waited!' ) + return x = float(coord[0]); y = float(coord[1]); z = float(coord[2]); point = model.addPoint(part, x,y,z); point.execute(True); self.lfeatures.append(point) vertex = model.addVertex(part, [point.result()]); vertex.execute(True); self.lfeatures.append(vertex) diff --git a/src/PythonAddons/macros/compoundVertices/widget.xml b/src/PythonAddons/macros/compoundVertices/widget.xml index 738a90cbe..75e5a6c21 100644 --- a/src/PythonAddons/macros/compoundVertices/widget.xml +++ b/src/PythonAddons/macros/compoundVertices/widget.xml @@ -2,8 +2,13 @@ - - + + diff --git a/src/PythonAddons/macros/importParameters/widget.xml b/src/PythonAddons/macros/importParameters/widget.xml index caad1409a..086571993 100644 --- a/src/PythonAddons/macros/importParameters/widget.xml +++ b/src/PythonAddons/macros/importParameters/widget.xml @@ -2,7 +2,11 @@ - + -- 2.39.2