Dump with geometrical selection

[modules/shaper.git] / src / PythonAddons / macros / box / feature.py

diff --git a/src/PythonAddons/macros/box/feature.py b/src/PythonAddons/macros/box/feature.py
index 8c6687c77701b6efb0e2027bb41395cc4965b915..72fc83d530db9e88a17c9ff9f035fc6dd511fadf 100644 (file)
--- a/src/PythonAddons/macros/box/feature.py
+++ b/src/PythonAddons/macros/box/feature.py
@@ -1,14 +1,34 @@
+## Copyright (C) 2014-2017  CEA/DEN, 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<mailto:webmaster.salome@opencascade.com>
+##
+
 """Box macro-feature
 Authors: Renaud Nedelec - Daniel Brunier-Coulin
 Copyright (C) 2014-20xx CEA/DEN, EDF R&D
 """
 
-import model
-import geom
+from salome.shaper import model
+from salome.shaper import geom
 
 
 class BoxFeature(model.Feature):
-    """Box feature.
+    """An example of Box feature implementation.
 
     BoxFeature() -> Box
     """
@@ -21,22 +41,22 @@ class BoxFeature(model.Feature):
 
     @staticmethod
     def ID():
-        """String constant."""
-        return "Box"
+        """Return Id of the feature."""
+        return "Box_script"
 
     @staticmethod
     def WIDTH_ID():
-        """String constant."""
+        """Returns ID of Width parameter."""
         return "width"
 
     @staticmethod
     def LENGTH_ID():
-        """String constant."""
+        """Returns ID of Length parameter."""
         return "length"
 
     @staticmethod
     def HEIGHT_ID():
-        """String constant."""
+        """Returns ID of Height parameter."""
         return "height"
 
     def getKind(self):
@@ -57,6 +77,7 @@ class BoxFeature(model.Feature):
         mypart = model.activeDocument()
         xoy = model.defaultPlane("XOY")
 
+        # A base of the geometry
         self.base = model.addSketch(mypart, xoy)
 
         p1 = geom.Pnt2d(0, 0)
@@ -64,34 +85,54 @@ class BoxFeature(model.Feature):
         p3 = geom.Pnt2d(1, 1)
         p4 = geom.Pnt2d(1, 0)
 
-        line = self.base.addPolygon(p1, p2, p3, p4)
+        line = model.addPolygon(self.base, p1, p2, p3, p4)
 
-        self.base.setParallel(line[0].result(), line[2].result())
-        self.base.setParallel(line[1].result(), line[3].result())
-        self.base.setPerpendicular(line[0].result(), line[3].result())
+        self.base.setFixed(line[0].startPoint())
+        self.base.setVertical(line[0])
 
         # Setting the size of the base with default values
-        self.width = self.base.setLength(line[0].result(), 50)  # Keeps the constraint for edition
-        self.length = self.base.setLength(line[3].result(), 50)  # Keeps the constraint for edition
+        # 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)
 
-
 # Edition of the box at user size
 
     def execute(self):
         """F.execute() -- execute the feature"""
         # Retrieving the user inputs
-        width = self.getRealInput(self.WIDTH_ID())
-        length = self.getRealInpuut(self.WIDTH_ID())
-        length = self.getRealInt(self.LENGTH_ID())
-        height = self.getRealInput(self.HEIGHT_ID())
+        width = self.real(self.WIDTH_ID())
+        length = self.real(self.LENGTH_ID())
+        height = self.real(self.HEIGHT_ID())
 
         # Editing the box
-        self.base.setValue(self.width, width)
-        self.base.setValue(self.length, length)
-        self.box.setSize(height)
+        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() )