From cc8e0e85a2fe53c53a87c24ef18cdf6265599785 Mon Sep 17 00:00:00 2001 From: dbv Date: Mon, 20 Aug 2018 17:47:44 +0300 Subject: [PATCH] Added to Python API creation of point by vertex selection. --- src/ConstructionAPI/ConstructionAPI_Point.cpp | 41 +++++++++++++++++-- src/ConstructionAPI/ConstructionAPI_Point.h | 2 +- src/ConstructionPlugin/CMakeLists.txt | 1 + .../Test/TestPoint_VertexSelection.py | 37 +++++++++++++++++ 4 files changed, 77 insertions(+), 4 deletions(-) create mode 100644 src/ConstructionPlugin/Test/TestPoint_VertexSelection.py diff --git a/src/ConstructionAPI/ConstructionAPI_Point.cpp b/src/ConstructionAPI/ConstructionAPI_Point.cpp index 7dcca33b6..f0a6ef008 100644 --- a/src/ConstructionAPI/ConstructionAPI_Point.cpp +++ b/src/ConstructionAPI/ConstructionAPI_Point.cpp @@ -20,8 +20,11 @@ #include "ConstructionAPI_Point.h" +#include #include +#include +#include #include #include #include @@ -114,6 +117,38 @@ ConstructionAPI_Point::ConstructionAPI_Point(const std::shared_ptrvalue(); + if (!aShape.get()) { + ResultPtr aContext = mypointToProject->context(); + if (!aContext.get()) { + fillAttribute(ModelHighAPI_Selection(), mypointToProject); + return; + } + aShape = aContext->shape(); + } + + if (!aShape.get()) { + fillAttribute(ModelHighAPI_Selection(), mypointToProject); + return; + } + + GeomVertexPtr aVertex = aShape->vertex(); + if (!aVertex.get()) { + fillAttribute(ModelHighAPI_Selection(), mypointToProject); + return; + } + + GeomPointPtr aPnt = aVertex->point(); + if (!aPnt.get()) { + fillAttribute(ModelHighAPI_Selection(), mypointToProject); + return; + } + + fillAttribute(ModelHighAPI_Selection(), mypointToProject); + setByXYZ(aPnt->x(), aPnt->y(), aPnt->z()); } else { setByCenterOfGravity(theObject); } @@ -173,7 +208,7 @@ void ConstructionAPI_Point::setByProjectionOnEdge(const ModelHighAPI_Selection& mycreationMethod); fillAttribute(ConstructionPlugin_Point::PROJECTION_TYPE_ON_EDGE(), myprojectionType); - fillAttribute(theVertex, mypoinToProject); + fillAttribute(theVertex, mypointToProject); fillAttribute(theEdge, myedgeForPointProjection); execute(); @@ -187,7 +222,7 @@ void ConstructionAPI_Point::setByProjectionOnFace(const ModelHighAPI_Selection& mycreationMethod); fillAttribute(ConstructionPlugin_Point::PROJECTION_TYPE_ON_FACE(), myprojectionType); - fillAttribute(theVertex, mypoinToProject); + fillAttribute(theVertex, mypointToProject); fillAttribute(theFace, myfaceForPointProjection); execute(); @@ -296,7 +331,7 @@ void ConstructionAPI_Point::dump(ModelHighAPI_Dumper& theDumper) const } theDumper << ", " << reverse()->value(); } else if (aMeth == ConstructionPlugin_Point::CREATION_METHOD_BY_PROJECTION()) { - theDumper << poinToProject() << ", "; + theDumper << pointToProject() << ", "; if (projectionType()->value() == ConstructionPlugin_Point::PROJECTION_TYPE_ON_EDGE()) { theDumper << edgeForPointProjection(); } else { diff --git a/src/ConstructionAPI/ConstructionAPI_Point.h b/src/ConstructionAPI/ConstructionAPI_Point.h index 32e2878d5..8e5911404 100644 --- a/src/ConstructionAPI/ConstructionAPI_Point.h +++ b/src/ConstructionAPI/ConstructionAPI_Point.h @@ -117,7 +117,7 @@ public: ModelAPI_AttributeDouble, /** Ratio */, reverse, ConstructionPlugin_Point::REVERSE(), ModelAPI_AttributeBoolean, /** Reverse */, - poinToProject, ConstructionPlugin_Point::POINT_TO_PROJECT(), + pointToProject, ConstructionPlugin_Point::POINT_TO_PROJECT(), ModelAPI_AttributeSelection, /** Point to project*/, projectionType, ConstructionPlugin_Point::PROJECTION_TYPE(), ModelAPI_AttributeString, /** Type of the point projection */, diff --git a/src/ConstructionPlugin/CMakeLists.txt b/src/ConstructionPlugin/CMakeLists.txt index a9705702f..442035abd 100644 --- a/src/ConstructionPlugin/CMakeLists.txt +++ b/src/ConstructionPlugin/CMakeLists.txt @@ -88,5 +88,6 @@ ADD_UNIT_TESTS(TestAxisCreation.py TestPoint_ProjectOnFace.py TestPoint_GeometricalPropertyCenterOfGravity.py TestPoint_GeometricalPropertyCenterOfCircle.py + TestPoint_VertexSelection.py TestPointName.py TestPlane.py) diff --git a/src/ConstructionPlugin/Test/TestPoint_VertexSelection.py b/src/ConstructionPlugin/Test/TestPoint_VertexSelection.py new file mode 100644 index 000000000..8180742aa --- /dev/null +++ b/src/ConstructionPlugin/Test/TestPoint_VertexSelection.py @@ -0,0 +1,37 @@ +## 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 +## + +from salome.shaper import model +from GeomAPI import * + +model.begin() +partSet = model.moduleDocument() +Part_1 = model.addPart(partSet) +Part_1_doc = Part_1.document() +Box_1 = model.addBox(Part_1_doc, 10, 10, 10) +Point_2 = model.addPoint(Part_1_doc, model.selection("VERTEX", "Box_1_1/Front&Box_1_1/Left&Box_1_1/Top")) +model.do() +model.end() + +assert (len(Point_2.results()) > 0) +rightPosition = GeomAPI_Vertex(10, 0, 10) +assert(rightPosition.isEqual(Point_2.results()[0].resultSubShapePair()[0].shape())) + +assert(model.checkPythonDump()) -- 2.39.2