X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FConstructionAPI%2FConstructionAPI_Point.cpp;h=d4f073f1b2ceb5671d29e9c7f980bf963ec8a568;hb=5e2855aa69f9a63236c331efcb57ba433f92e901;hp=e5925482f7c5e32eb995969dab3dee13e608cb76;hpb=e9bc8b0ef4a083909ae41172e6ac891136051c91;p=modules%2Fshaper.git diff --git a/src/ConstructionAPI/ConstructionAPI_Point.cpp b/src/ConstructionAPI/ConstructionAPI_Point.cpp index e5925482f..d4f073f1b 100644 --- a/src/ConstructionAPI/ConstructionAPI_Point.cpp +++ b/src/ConstructionAPI/ConstructionAPI_Point.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2017 CEA/DEN, EDF R&D +// Copyright (C) 2014-2019 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 @@ -12,16 +12,18 @@ // // 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 +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ or -// email : webmaster.salome@opencascade.com +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include "ConstructionAPI_Point.h" +#include #include +#include +#include #include #include #include @@ -104,6 +106,55 @@ ConstructionAPI_Point::ConstructionAPI_Point(const std::shared_ptr& theFeature, + const ModelHighAPI_Selection& theObject, + const bool theIsCircularEdge, + const bool theIsXYZSelection) +: ModelHighAPI_Interface(theFeature) +{ + if (initialize()) + { + if (theIsCircularEdge) { + setByCenterOfCircle(theObject); + } else if (theObject.shapeType() == "VERTEX" && theIsXYZSelection) { + // This is tricky way to get vertex shape. + fillAttribute(theObject, mypointToProject); + GeomShapePtr aShape = mypointToProject->value(); + 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); + } + } +} + //================================================================================================== ConstructionAPI_Point::~ConstructionAPI_Point() { @@ -115,11 +166,8 @@ void ConstructionAPI_Point::setByXYZ(const ModelHighAPI_Double& theX, const ModelHighAPI_Double& theY, const ModelHighAPI_Double& theZ) { - //fillAttribute(ConstructionPlugin_Point::CREATION_METHOD_BY_XYZ(), mycreationMethod); - fillAttribute(theX, myx); - fillAttribute(theY, myy); - fillAttribute(theZ, myz); fillAttribute(ConstructionPlugin_Point::CREATION_METHOD_BY_XYZ(), mycreationMethod); + fillAttribute(theX, theY, theZ, mypoint); execute(false); } @@ -153,7 +201,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(); @@ -167,7 +215,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(); @@ -214,6 +262,30 @@ void ConstructionAPI_Point::setByPlanesIntersection(const ModelHighAPI_Selection execute(); } +//================================================================================================== +void ConstructionAPI_Point::setByCenterOfGravity(const ModelHighAPI_Selection& theObject) +{ + fillAttribute(ConstructionPlugin_Point::CREATION_METHOD_BY_GEOMETRICAL_PROPERTY(), + mycreationMethod); + fillAttribute(ConstructionPlugin_Point::GEOMETRICAL_PROPERTY_TYPE_BY_CENTER_OF_GRAVITY(), + mygeometricalPropertyType); + fillAttribute(theObject, myobjectForCenterOfGravity); + + execute(); +} + +//================================================================================================== +void ConstructionAPI_Point::setByCenterOfCircle(const ModelHighAPI_Selection& theObject) +{ + fillAttribute(ConstructionPlugin_Point::CREATION_METHOD_BY_GEOMETRICAL_PROPERTY(), + mycreationMethod); + fillAttribute(ConstructionPlugin_Point::GEOMETRICAL_PROPERTY_TYPE_BY_CENTER_OF_CIRCLE(), + mygeometricalPropertyType); + fillAttribute(theObject, myobjectForCenterOfCircle); + + execute(); +} + //================================================================================================== void ConstructionAPI_Point::dump(ModelHighAPI_Dumper& theDumper) const { @@ -226,7 +298,7 @@ void ConstructionAPI_Point::dump(ModelHighAPI_Dumper& theDumper) const if (aMeth == "" || // default is XYZ aMeth == ConstructionPlugin_Point::CREATION_METHOD_BY_XYZ()) { - theDumper << x() << ", " << y() << ", " << z(); + theDumper << point(); } else if (aMeth == ConstructionPlugin_Point::CREATION_METHOD_BY_INTERSECTION()) { const std::string anIntersectionType = intersectionType()->value(); if (anIntersectionType == ConstructionPlugin_Point::INTERSECTION_TYPE_BY_LINES()) @@ -256,11 +328,21 @@ void ConstructionAPI_Point::dump(ModelHighAPI_Dumper& theDumper) const } theDumper << ", " << reverse()->value(); } else if (aMeth == ConstructionPlugin_Point::CREATION_METHOD_BY_PROJECTION()) { - theDumper << mypoinToProject << ", "; + theDumper << pointToProject() << ", "; if (projectionType()->value() == ConstructionPlugin_Point::PROJECTION_TYPE_ON_EDGE()) { - theDumper << myedgeForPointProjection; + theDumper << edgeForPointProjection(); } else { - theDumper << myfaceForPointProjection; + theDumper << faceForPointProjection(); + } + } else if (aMeth == ConstructionPlugin_Point::CREATION_METHOD_BY_GEOMETRICAL_PROPERTY()) { + if (geometricalPropertyType()->value() == + ConstructionPlugin_Point::GEOMETRICAL_PROPERTY_TYPE_BY_CENTER_OF_GRAVITY()) + { + theDumper << objectForCenterOfGravity(); + } + else + { + theDumper << objectForCenterOfCircle() << ", " << true; } } @@ -323,3 +405,20 @@ PointPtr addPoint(const std::shared_ptr & thePart, std::shared_ptr aFeature = thePart->addFeature(ConstructionAPI_Point::ID()); return PointPtr(new ConstructionAPI_Point(aFeature, theObject1, theObject2, theObject3)); } + +//================================================================================================== +PointPtr addPoint(const std::shared_ptr & thePart, + const ModelHighAPI_Selection& theObject, + const bool theIsCircularEdge) +{ + std::shared_ptr aFeature = thePart->addFeature(ConstructionAPI_Point::ID()); + return PointPtr(new ConstructionAPI_Point(aFeature, theObject, theIsCircularEdge)); +} + +//================================================================================================== +PointPtr addPointXYZ(const std::shared_ptr & thePart, + const ModelHighAPI_Selection& theObject) +{ + std::shared_ptr aFeature = thePart->addFeature(ConstructionAPI_Point::ID()); + return PointPtr(new ConstructionAPI_Point(aFeature, theObject, false, true)); +}