From: spo Date: Wed, 16 Dec 2015 08:29:52 +0000 (+0300) Subject: Spell-checking and space removing X-Git-Tag: V_2.1.0~162^2~13 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b2d6fba7e03f6741d3b1edab092b041648819ca5;p=modules%2Fshaper.git Spell-checking and space removing --- diff --git a/src/ModelAPI/CMakeLists.txt b/src/ModelAPI/CMakeLists.txt index 15686873f..24f960f0a 100644 --- a/src/ModelAPI/CMakeLists.txt +++ b/src/ModelAPI/CMakeLists.txt @@ -40,7 +40,7 @@ SET(PROJECT_HEADERS ModelAPI_Session.h ModelAPI_Tools.h ModelAPI_Validator.h - ModelAPI_Entity.h + ModelAPI_Entity.h ) SET(PROJECT_SOURCES @@ -107,7 +107,7 @@ SET(SWIG_SCRIPTS SET(SWIG_LINK_LIBRARIES ModelAPI - GeomAPI + GeomAPI ${PYTHON_LIBRARIES} ) diff --git a/src/PythonAPI/model/sketcher/line.py b/src/PythonAPI/model/sketcher/line.py index d7bb70f84..e4111e070 100644 --- a/src/PythonAPI/model/sketcher/line.py +++ b/src/PythonAPI/model/sketcher/line.py @@ -16,11 +16,11 @@ class Line(Interface): self._feature.data().attribute("EndPoint") ) - # If no arguments are given the attributes of the feature + # If no arguments are given the attributes of the feature # are'nt initialized if args is None: return - + # Set attribute values and execute if len(args) == 4: self.__createByCoordinates(*args) @@ -44,22 +44,22 @@ class Line(Interface): def __createByName(self, name): self._feature.data().selection("External").selectSubShape("EDGE", name) - + ####### # # Set methods # ####### - + def setStartPoint(self, x, y): """Set the start point of the line.""" self._start_point.setValue(x, y) - + def setEndPoint(self, x, y): """Set the end point of the line.""" self._end_point.setValue(x, y) - # TODO : methods below will be removed. + # TODO : methods below will be removed. # Kept until all tests have been updated def startPointData(self): return self._start_point diff --git a/src/PythonAPI/model/sketcher/sketch.py b/src/PythonAPI/model/sketcher/sketch.py index aac77596c..ae490a047 100644 --- a/src/PythonAPI/model/sketcher/sketch.py +++ b/src/PythonAPI/model/sketcher/sketch.py @@ -5,12 +5,12 @@ """Sketcher interface. This interface allows to add a sketch in a part or partset. -The created sketch object provides all the needed methods +The created sketch object provides all the needed methods for sketch modification and constraint edition. Example of code: -.. doctest:: +.. doctest:: >>> import model >>> model.begin() @@ -44,7 +44,7 @@ def addSketch(document, plane): Arguments: document(ModelAPI_Document): part or partset document plane(geom.Ax3): plane on wich the sketch is built - + Returns: Sketch: sketch object """ @@ -74,7 +74,7 @@ class Sketch(Interface): ) self._external = self._feature.data().selection("External") - # If no arguments are given the attributes of the feature + # If no arguments are given the attributes of the feature # are not Initialized if args is not None: plane = args[0] @@ -111,24 +111,24 @@ class Sketch(Interface): def addLine(self, *args): """Add a line to the sketch. - + .. function:: addLine(name) - Select an existing line. The line is added to the sketch with a rigid + Select an existing line. The line is added to the sketch with a rigid constraint (it cannot be modified by the sketch) - + Arguments: name(str): name of an existing line - + .. function:: addLine(start, end) Create a line by points - + Arguments: start(point): start point of the line end(point): end point of the line - + .. function:: addLine(start_x, start_y, end_x, end_y) Create a line by coordinates - + Arguments: start_x(double): start point x coordinate """ @@ -154,20 +154,20 @@ class Sketch(Interface): def addArc(self, *args): """Add an arc of circle to the sketch and return an arc object. - + Two different syntaxes are allowed: - + .. function:: addArc(center, start, end) - + Arguments: - center (point): center of the arc + center (point): center of the arc start (point): start point of the arc end (point): end point of the arc - + .. function:: addArc(center_x, center_y, start_x, start_y, end_x, end_y) - + Same as above but with coordinates - + Returns: Arc: arc object Raises: @@ -189,7 +189,7 @@ class Sketch(Interface): constraint to this Sketch.""" # assert(p1 and p2) NOTE : if an argument is missing python # will raise TypeError by itself. - # It seems better to check only that provided arguments are not + # It seems better to check only that provided arguments are not # None if p1 is None or p2 is None: raise TypeError("NoneType argument given") @@ -317,25 +317,25 @@ class Sketch(Interface): constraint.data().reflist("ConstraintEntityB").append(line_2) self.execute() return constraint - + def setRigid(self, object_): """Set a rigid constraint on a given object.""" constraint = self._feature.addFeature("SketchConstraintRigid") constraint.data().refattr("ConstraintEntityA").setObject(object_) self.execute() return constraint - + #------------------------------------------------------------- # # Transformation constraints # #------------------------------------------------------------- - + def addMirror(self, mirror_line, sketch_objects): """Add a mirror transformation of the given objects to the sketch. - + This transformation is a constraint. - + :return: interface to the constraint :rtype: Mirror object """ @@ -343,7 +343,7 @@ class Sketch(Interface): mirror_interface = Mirror(mirror_constraint, mirror_line, sketch_objects) self.execute() return mirror_interface - + #------------------------------------------------------------- #