X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FConstructionPlugin%2FConstructionPlugin_Point.cpp;h=08ff70a3a7a2ed8a7f5cdba439c975df2f0fe4ef;hb=f49e611d444c66d735a381bb9541717b4115b8b1;hp=22f91d732f9e2cb0d6677cb379eb1b3b8ef3c9d8;hpb=14b2f19dcba31d259343982c208daea43b407dc5;p=modules%2Fshaper.git diff --git a/src/ConstructionPlugin/ConstructionPlugin_Point.cpp b/src/ConstructionPlugin/ConstructionPlugin_Point.cpp index 22f91d732..08ff70a3a 100644 --- a/src/ConstructionPlugin/ConstructionPlugin_Point.cpp +++ b/src/ConstructionPlugin/ConstructionPlugin_Point.cpp @@ -1,8 +1,22 @@ -// 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" @@ -13,10 +27,12 @@ #include #include +#include #include #include #include +#include //================================================================================================== ConstructionPlugin_Point::ConstructionPlugin_Point() @@ -39,7 +55,7 @@ void ConstructionPlugin_Point::initAttributes() data()->addAttribute(CREATION_METHOD(), ModelAPI_AttributeString::typeId()); - data()->addAttribute(EDGE(), ModelAPI_AttributeSelection::typeId()); + /*data()->addAttribute(EDGE(), ModelAPI_AttributeSelection::typeId()); data()->addAttribute(DISTANCE_VALUE(), ModelAPI_AttributeDouble::typeId()); data()->addAttribute(DISTANCE_PERCENT(), ModelAPI_AttributeBoolean::typeId()); data()->addAttribute(REVERSE(), ModelAPI_AttributeBoolean::typeId()); @@ -49,6 +65,13 @@ void ConstructionPlugin_Point::initAttributes() 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()); } //================================================================================================== @@ -56,28 +79,50 @@ void ConstructionPlugin_Point::execute() { GeomShapePtr aShape; - std::string aCreationMethod = string(CREATION_METHOD())->value(); + // 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()) { + }/* 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 = createByIntersection(); + 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()) { - std::shared_ptr aConstr = document()->createConstruction(data()); - aConstr->setShape(aShape); - setResult(aConstr); + 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(aShape); + setResult(aConstr); } //================================================================================================== bool ConstructionPlugin_Point::customisePresentation(ResultPtr theResult, AISObjectPtr thePrs, - std::shared_ptr theDefaultPrs) + std::shared_ptr theDefaultPrs) { bool isCustomized = theDefaultPrs.get() != NULL && theDefaultPrs->customisePresentation(theResult, thePrs, theDefaultPrs); @@ -93,7 +138,7 @@ std::shared_ptr ConstructionPlugin_Point::createByXYZ() real(Z())->value()); } -//================================================================================================== +/*//================================================================================================== std::shared_ptr ConstructionPlugin_Point::createByDistanceOnEdge() { // Get edge. @@ -137,7 +182,7 @@ std::shared_ptr ConstructionPlugin_Point::createByProjection() } //================================================================================================== -std::shared_ptr ConstructionPlugin_Point::createByIntersection() +std::shared_ptr ConstructionPlugin_Point::createByLinesIntersection() { // Get first line. AttributeSelectionPtr aFirstLineSelection= selection(FIRST_LINE()); @@ -147,7 +192,7 @@ std::shared_ptr ConstructionPlugin_Point::createByIntersection() } std::shared_ptr aFirstEdge(new GeomAPI_Edge(aFirstLineShape)); - // Get first line. + // Get second line. AttributeSelectionPtr aSecondLineSelection= selection(SECOND_LINE()); GeomShapePtr aSecondLineShape = aSecondLineSelection->value(); if(!aSecondLineShape.get()) { @@ -157,3 +202,37 @@ std::shared_ptr ConstructionPlugin_Point::createByIntersection() 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()); +}