X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FConstructionPlugin%2FConstructionPlugin_Point.cpp;h=2081f4ed12a3ca764a9bb6f7f2b9f1c4dae33168;hb=dc26a49174c150bb0fbb63a44ce562c17288d3ff;hp=231e54fb2cddaa70bbcfbeb0b7d9f0adfe269791;hpb=0a76161addf39a6d03b90308eb99abc3a8d10e74;p=modules%2Fshaper.git diff --git a/src/ConstructionPlugin/ConstructionPlugin_Point.cpp b/src/ConstructionPlugin/ConstructionPlugin_Point.cpp index 231e54fb2..2081f4ed1 100644 --- a/src/ConstructionPlugin/ConstructionPlugin_Point.cpp +++ b/src/ConstructionPlugin/ConstructionPlugin_Point.cpp @@ -1,55 +1,248 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: ConstructionPlugin_Point.cxx -// Created: 27 Mar 2014 -// Author: Mikhail PONIKAROV +// 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 +// #include "ConstructionPlugin_Point.h" -#include "ModelAPI_Session.h" -#include "ModelAPI_Document.h" -#include "ModelAPI_Data.h" -#include "ModelAPI_AttributeDouble.h" + +#include +#include +#include +#include #include -#include -#include -#include +#include +#include -using namespace std; +#include +#include +#include +#include +//================================================================================================== ConstructionPlugin_Point::ConstructionPlugin_Point() { } +//================================================================================================== const std::string& ConstructionPlugin_Point::getKind() { static std::string MY_KIND = ConstructionPlugin_Point::ID(); return MY_KIND; } +//================================================================================================== void ConstructionPlugin_Point::initAttributes() { - data()->addAttribute(ConstructionPlugin_Point::X(), ModelAPI_AttributeDouble::type()); - data()->addAttribute(ConstructionPlugin_Point::Y(), ModelAPI_AttributeDouble::type()); - data()->addAttribute(ConstructionPlugin_Point::Z(), ModelAPI_AttributeDouble::type()); + data()->addAttribute(X(), ModelAPI_AttributeDouble::typeId()); + data()->addAttribute(Y(), ModelAPI_AttributeDouble::typeId()); + data()->addAttribute(Z(), ModelAPI_AttributeDouble::typeId()); + + data()->addAttribute(CREATION_METHOD(), ModelAPI_AttributeString::typeId()); + +/* + data()->addAttribute(POINT(), ModelAPI_AttributeSelection::typeId()); + data()->addAttribute(PLANE(), ModelAPI_AttributeSelection::typeId()); + + data()->addAttribute(FIRST_LINE(), ModelAPI_AttributeSelection::typeId()); + data()->addAttribute(SECOND_LINE(), ModelAPI_AttributeSelection::typeId()); +*/ + + data()->addAttribute(INTERSECTION_LINE(), ModelAPI_AttributeSelection::typeId()); + data()->addAttribute(INTERSECTION_PLANE(), ModelAPI_AttributeSelection::typeId()); + + data()->addAttribute(USE_OFFSET(), ModelAPI_AttributeString::typeId()); + data()->addAttribute(OFFSET(), ModelAPI_AttributeDouble::typeId()); + data()->addAttribute(REVERSE_OFFSET(), ModelAPI_AttributeBoolean::typeId()); + + data()->addAttribute(EDGE(), ModelAPI_AttributeSelection::typeId()); + data()->addAttribute(OFFSET_TYPE(), ModelAPI_AttributeString::typeId()); + data()->addAttribute(DISTANCE(), ModelAPI_AttributeDouble::typeId()); + data()->addAttribute(RATIO(), ModelAPI_AttributeDouble::typeId()); + data()->addAttribute(REVERSE(), ModelAPI_AttributeBoolean::typeId()); } +//================================================================================================== void ConstructionPlugin_Point::execute() { - std::shared_ptr aPnt( - new GeomAPI_Pnt(data()->real(ConstructionPlugin_Point::X())->value(), - data()->real(ConstructionPlugin_Point::Y())->value(), - data()->real(ConstructionPlugin_Point::Z())->value())); + GeomShapePtr aShape; + + // to support compatibility with old documents where aCreationMethod did not exist + std::string aCreationMethod = + string(CREATION_METHOD()).get() && !string(CREATION_METHOD())->value().empty() ? + string(CREATION_METHOD())->value() : CREATION_METHOD_BY_XYZ(); + if(aCreationMethod == CREATION_METHOD_BY_XYZ()) { + aShape = createByXYZ(); + } else if(aCreationMethod == CREATION_METHOD_BY_DISTANCE_ON_EDGE()) { + aShape = createByDistanceOnEdge(); + }/* else if(aCreationMethod == CREATION_METHOD_BY_PROJECTION()) { + aShape = createByProjection(); + } else if(aCreationMethod == CREATION_METHOD_BY_LINES_INTERSECTION()) { + aShape = createByLinesIntersection(); + }*/ else if(aCreationMethod == CREATION_METHOD_BY_LINE_AND_PLANE_INTERSECTION()) { + // this may produce several points + std::list > aPoints = createByLineAndPlaneIntersection(); + if (!aPoints.empty()) { // if no points found produce the standard error later + int anIndex = 0; + std::list >::iterator aPIter = aPoints.begin(); + for(; aPIter != aPoints.end(); aPIter++, anIndex++) { + std::shared_ptr aConstr = + document()->createConstruction(data(), anIndex); + aConstr->setShape(*aPIter); + setResult(aConstr, anIndex); + } + removeResults(anIndex); + return; + } + } + if(!aShape.get()) { + setError("Error: intersection not found."); + return; + } + + removeResults(1); // for case the point type was switched from multi-results type std::shared_ptr aConstr = document()->createConstruction(data()); - aConstr->setShape(GeomAlgoAPI_PointBuilder::point(aPnt)); + aConstr->setShape(aShape); setResult(aConstr); } -void ConstructionPlugin_Point::customisePresentation(AISObjectPtr thePrs) +//================================================================================================== +bool ConstructionPlugin_Point::customisePresentation(ResultPtr theResult, + AISObjectPtr thePrs, + std::shared_ptr theDefaultPrs) +{ + bool isCustomized = theDefaultPrs.get() != NULL && + theDefaultPrs->customisePresentation(theResult, thePrs, theDefaultPrs); + //thePrs->setPointMarker(1, 1.); // Set point as a '+' symbol + return true; +} + +//================================================================================================== +std::shared_ptr ConstructionPlugin_Point::createByXYZ() +{ + return GeomAlgoAPI_PointBuilder::vertex(real(X())->value(), + real(Y())->value(), + real(Z())->value()); +} + +//================================================================================================== +std::shared_ptr ConstructionPlugin_Point::createByDistanceOnEdge() +{ + // Get edge. + AttributeSelectionPtr anEdgeSelection = selection(EDGE()); + GeomShapePtr aShape = anEdgeSelection->value(); + if(!aShape.get()) { + aShape = anEdgeSelection->context()->shape(); + } + std::shared_ptr anEdge(new GeomAPI_Edge(aShape)); + + // Get distance value and percent flag. + double aValue; + bool anIsPercent = false; + if (string(OFFSET_TYPE())->value() == OFFSET_TYPE_BY_DISTANCE()) { + aValue = real(DISTANCE())->value(); + anIsPercent = false; + } else { + aValue = real(RATIO())->value() * 100.0; + anIsPercent = true; + } + + // Get reverse flag. + bool anIsReverse = boolean(REVERSE())->value(); + + return GeomAlgoAPI_PointBuilder::vertexOnEdge(anEdge, aValue, anIsPercent, anIsReverse); +} +/* +//================================================================================================== +std::shared_ptr ConstructionPlugin_Point::createByProjection() { - std::vector aRGB = Config_PropManager::color("Visualization", "construction_point_color", - ConstructionPlugin_Point::DEFAULT_COLOR()); - thePrs->setColor(aRGB[0], aRGB[1], aRGB[2]); - thePrs->redisplay(); + // Get point. + AttributeSelectionPtr aPointSelection = selection(POINT()); + GeomShapePtr aPointShape = aPointSelection->value(); + if(!aPointShape.get()) { + aPointShape = aPointSelection->context()->shape(); + } + std::shared_ptr aVertex(new GeomAPI_Vertex(aPointShape)); + + // Get plane. + AttributeSelectionPtr aPlaneSelection = selection(PLANE()); + GeomShapePtr aPlaneShape = aPlaneSelection->value(); + if(!aPlaneShape.get()) { + aPlaneShape = aPlaneSelection->context()->shape(); + } + std::shared_ptr aFace(new GeomAPI_Face(aPlaneShape)); + + return GeomAlgoAPI_PointBuilder::vertexByProjection(aVertex, aFace); +} + +//================================================================================================== +std::shared_ptr ConstructionPlugin_Point::createByLinesIntersection() +{ + // Get first line. + AttributeSelectionPtr aFirstLineSelection= selection(FIRST_LINE()); + GeomShapePtr aFirstLineShape = aFirstLineSelection->value(); + if(!aFirstLineShape.get()) { + aFirstLineShape = aFirstLineSelection->context()->shape(); + } + std::shared_ptr aFirstEdge(new GeomAPI_Edge(aFirstLineShape)); + + // Get second line. + AttributeSelectionPtr aSecondLineSelection= selection(SECOND_LINE()); + GeomShapePtr aSecondLineShape = aSecondLineSelection->value(); + if(!aSecondLineShape.get()) { + aSecondLineShape = aSecondLineSelection->context()->shape(); + } + std::shared_ptr aSecondEdge(new GeomAPI_Edge(aSecondLineShape)); + + return GeomAlgoAPI_PointBuilder::vertexByIntersection(aFirstEdge, aSecondEdge); +} +*/ + +//================================================================================================== +std::list > + ConstructionPlugin_Point::createByLineAndPlaneIntersection() +{ + // Get line. + AttributeSelectionPtr aLineSelection = selection(INTERSECTION_LINE()); + GeomShapePtr aLineShape = aLineSelection->value(); + if(!aLineShape.get()) { + aLineShape = aLineSelection->context()->shape(); + } + std::shared_ptr anEdge(new GeomAPI_Edge(aLineShape)); + + // Get plane. + AttributeSelectionPtr aPlaneSelection= selection(INTERSECTION_PLANE()); + GeomShapePtr aPlaneShape = aPlaneSelection->value(); + if(!aPlaneShape.get()) { + aPlaneShape = aPlaneSelection->context()->shape(); + } + std::shared_ptr aFace(new GeomAPI_Face(aPlaneShape)); + + if (!string(USE_OFFSET())->value().empty()) { + double anOffset = real(OFFSET())->value(); + if (boolean(REVERSE_OFFSET())->value()) + anOffset = -anOffset; + if (fabs(anOffset) > 1.e-9) { // move face + aFace->translate(aFace->getPlane()->direction(), anOffset); + } + } + + return GeomAlgoAPI_ShapeTools::intersect(anEdge, aFace, + aPlaneSelection->context()->groupName() == ModelAPI_ResultConstruction::group()); }