X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2FFeaturesPlugin_Placement.cpp;h=bd1e96efc6ad30c2baa8aef8f6e833c837e72419;hb=84ff9a5e90ebf75292b9ef97a05a4609e67c4022;hp=69d3cc4a7240f893056b7c79e940ab474f7b5945;hpb=b6be33d3af5a10e204e3bd69708d49b8b9f1a127;p=modules%2Fshaper.git diff --git a/src/FeaturesPlugin/FeaturesPlugin_Placement.cpp b/src/FeaturesPlugin/FeaturesPlugin_Placement.cpp index 69d3cc4a7..bd1e96efc 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_Placement.cpp +++ b/src/FeaturesPlugin/FeaturesPlugin_Placement.cpp @@ -1,8 +1,22 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D --> - -// File: FeaturesPlugin_Placement.cpp -// Created: 2 Dec 2014 -// Author: Artem ZHIDKOV +// 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 "FeaturesPlugin_Placement.h" @@ -20,10 +34,8 @@ #include #include -#define _MODIFIEDF_TAG 1 -#define _MODIFIEDE_TAG 2 -#define _MODIFIEDV_TAG 3 -#define _FACE 4 +#include + FeaturesPlugin_Placement::FeaturesPlugin_Placement() { } @@ -31,14 +43,12 @@ FeaturesPlugin_Placement::FeaturesPlugin_Placement() void FeaturesPlugin_Placement::initAttributes() { - AttributeSelectionListPtr aSelection = + AttributeSelectionListPtr aSelection = std::dynamic_pointer_cast(data()->addAttribute( OBJECTS_LIST_ID(), ModelAPI_AttributeSelectionList::typeId())); - // extrusion works with faces always - aSelection->setSelectionType("SOLID"); - data()->addAttribute(START_FACE_ID(), ModelAPI_AttributeSelection::typeId()); - data()->addAttribute(END_FACE_ID(), ModelAPI_AttributeSelection::typeId()); + data()->addAttribute(START_SHAPE_ID(), ModelAPI_AttributeSelection::typeId()); + data()->addAttribute(END_SHAPE_ID(), ModelAPI_AttributeSelection::typeId()); data()->addAttribute(REVERSE_ID(), ModelAPI_AttributeBoolean::typeId()); data()->addAttribute(CENTERING_ID(), ModelAPI_AttributeBoolean::typeId()); } @@ -53,70 +63,91 @@ void FeaturesPlugin_Placement::execute() return; } for(int anObjectsIndex = 0; anObjectsIndex < anObjectsSelList->size(); anObjectsIndex++) { - std::shared_ptr anObjectAttr = anObjectsSelList->value(anObjectsIndex); + std::shared_ptr anObjectAttr = + anObjectsSelList->value(anObjectsIndex); std::shared_ptr anObject = anObjectAttr->value(); - if(!anObject.get()) { + if(!anObject.get()) { // may be for not-activated parts + eraseResults(); return; } anObjects.push_back(anObject); aContextes.push_back(anObjectAttr->context()); } - // Verify the start face - AttributeSelectionPtr anObjRef = selection(START_FACE_ID()); + // Verify the start shape + AttributeSelectionPtr anObjRef = selection(START_SHAPE_ID()); if(!anObjRef) { return; } - std::shared_ptr aStartFace = anObjRef->value(); - if(!aStartFace || !GeomAPI_Face(aStartFace).isPlanar()) { - static const std::string aSelectionError = "The start face selection is bad"; + std::shared_ptr aStartShape = anObjRef->value(); + if(!aStartShape) { + static const std::string aSelectionError = "Error: The start shape selection is bad."; setError(aSelectionError); return; } - std::shared_ptr aStartShape; + std::shared_ptr aStartShapeContext; ResultPtr aContextRes = anObjRef->context(); if (aContextRes.get()) { - aStartShape = aContextRes->shape(); + aStartShapeContext = aContextRes->shape(); } - if(!aStartShape.get()) { - static const std::string aContextError = "The start face selection context is bad"; + if(!aStartShapeContext.get()) { + static const std::string aContextError = "Error: The start shape selection context is bad."; setError(aContextError); return; } - // Verify the end face - anObjRef = selection(END_FACE_ID()); - std::shared_ptr anEndFace = anObjRef->value(); - if(!anEndFace || !GeomAPI_Face(anEndFace).isPlanar()) { - static const std::string aSelectionError = "The end face selection is bad"; + // Verify the end shape + anObjRef = selection(END_SHAPE_ID()); + std::shared_ptr anEndShape = anObjRef->value(); + if(!anEndShape) { + static const std::string aSelectionError = "Error: The end shape selection is bad."; setError(aSelectionError); return; } - std::shared_ptr anEndShape; + std::shared_ptr anEndShapeContext; aContextRes = anObjRef->context(); if(aContextRes.get()) { - anEndShape = aContextRes->shape(); + anEndShapeContext = aContextRes->shape(); } - if(!anEndShape.get()) { - static const std::string aContextError = "The end face selection context is bad"; + if(!anEndShapeContext.get()) { + static const std::string aContextError = "Error: The end shape selection context is bad."; setError(aContextError); return; } + // Verify planarity of faces and linearity of edges + std::shared_ptr aShapes[2] = {aStartShape, anEndShape}; + for (int i = 0; i < 2; i++) { + if (aShapes[i]->isFace()) { + std::shared_ptr aFace(new GeomAPI_Face(aShapes[i])); + if (!aFace->isPlanar()) { + static const std::string aPlanarityError = "Error: One of selected faces is not planar."; + setError(aPlanarityError); + return; + } + } + else if (aShapes[i]->isEdge()) { + std::shared_ptr anEdge(new GeomAPI_Edge(aShapes[i])); + if (!anEdge->isLine()) { + static const std::string aLinearityError = "Error: One of selected endges is not linear."; + setError(aLinearityError); + return; + } + } + } + // Flags of the Placement bool isReverse = boolean(REVERSE_ID())->value(); bool isCentering = boolean(CENTERING_ID())->value(); - bool isPart = aContextRes->groupName() == ModelAPI_ResultPart::group(); - // Getting transformation. GeomAlgoAPI_Placement aPlacementAlgo( - aStartShape, anEndShape, aStartFace, anEndFace, isReverse, isCentering, true); + aStartShapeContext, anEndShapeContext, aStartShape, anEndShape, isReverse, isCentering, true); if(!aPlacementAlgo.isDone()) { - static const std::string aFeatureError = "Placement algorithm failed"; + static const std::string aFeatureError = "Error: Placement algorithm failed."; setError(aFeatureError); return; } @@ -128,35 +159,38 @@ void FeaturesPlugin_Placement::execute() for(ListOfShape::iterator anObjectsIt = anObjects.begin(); anObjectsIt != anObjects.end(); anObjectsIt++, aContext++) { - if (isPart) { // for part results just set transformation - ResultPartPtr anOrigin = std::dynamic_pointer_cast(aContextRes); - ResultPartPtr aResultPart = document()->copyPart(firstResult(), anOrigin); + // for part results just set transformation + if (aContext->get() && (*aContext)->groupName() == ModelAPI_ResultPart::group()) { + ResultPartPtr anOrigin = std::dynamic_pointer_cast(*aContext); + ResultPartPtr aResultPart = document()->copyPart(anOrigin, data(), aResultIndex); aResultPart->setTrsf(aContextRes, aTrsf); - setResult(aResultPart); + setResult(aResultPart, aResultIndex); } else { std::shared_ptr aBaseShape = *anObjectsIt; - GeomAlgoAPI_Transform aTransformAlgo(aBaseShape, aTrsf); + std::shared_ptr aTransformAlgo(new GeomAlgoAPI_Transform(aBaseShape, + aTrsf)); // Checking that the algorithm worked properly. - if(!aTransformAlgo.isDone()) { - static const std::string aFeatureError = "Transform algorithm failed"; + if(!aTransformAlgo->isDone()) { + static const std::string aFeatureError = "Error: Transform algorithm failed."; setError(aFeatureError); break; } - if(aTransformAlgo.shape()->isNull()) { - static const std::string aShapeError = "Resulting shape is Null"; + if(aTransformAlgo->shape()->isNull()) { + static const std::string aShapeError = "Error: Resulting shape is Null."; setError(aShapeError); break; } - if(!aTransformAlgo.isValid()) { - std::string aFeatureError = "Warning: resulting shape is not valid"; + if(!aTransformAlgo->isValid()) { + std::string aFeatureError = "Error: Resulting shape is not valid."; setError(aFeatureError); break; } //LoadNamingDS - std::shared_ptr aResultBody = document()->createBody(data(), aResultIndex); - LoadNamingDS(aTransformAlgo, aResultBody, aBaseShape); + ResultBodyPtr aResultBody = document()->createBody(data(), aResultIndex); + aResultBody->storeModified(aBaseShape, aTransformAlgo->shape()); + FeaturesPlugin_Tools::loadModifiedShapes(aResultBody, aBaseShape, aTransformAlgo, "Placed"); setResult(aResultBody, aResultIndex); } aResultIndex++; @@ -165,21 +199,3 @@ void FeaturesPlugin_Placement::execute() // Remove the rest results if there were produced in the previous pass. removeResults(aResultIndex); } - -//============================================================================ -void FeaturesPlugin_Placement::LoadNamingDS(GeomAlgoAPI_Transform& theTransformAlgo, - std::shared_ptr theResultBody, - std::shared_ptr theSlaveObject) -{ - ModelAPI_BodyBuilder* aResultBuilder = theResultBody->getBodyBuilder(); - //load result - aResultBuilder->storeModified(theSlaveObject, theTransformAlgo.shape()); // the initial Slave, the resulting Slave - - std::shared_ptr aSubShapes = theTransformAlgo.mapOfShapes(); - - // put modifed faces in DF - std::string aModName = "Modified"; - aResultBuilder->loadAndOrientModifiedShapes(theTransformAlgo.makeShape().get(), - theSlaveObject, _FACE, - _MODIFIEDF_TAG, aModName, *aSubShapes.get()); -}