X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2FFeaturesPlugin_Placement.cpp;h=ad4975878166096d757179600cf59e98928e6321;hb=e91e5875dfa825c2a382737b2fd2e7e4cb4e2acd;hp=d38f20c199adcb499e626d865ff4ea37647563d2;hpb=c11217430bc2c359938fa0a261d8fbc81b209f47;p=modules%2Fshaper.git diff --git a/src/FeaturesPlugin/FeaturesPlugin_Placement.cpp b/src/FeaturesPlugin/FeaturesPlugin_Placement.cpp index d38f20c19..ad4975878 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" @@ -17,13 +31,12 @@ #include #include #include +#include #include #include -#define _MODIFIEDF_TAG 1 -#define _MODIFIEDE_TAG 2 -#define _MODIFIEDV_TAG 3 -#define _FACE 4 +#include + FeaturesPlugin_Placement::FeaturesPlugin_Placement() { } @@ -31,11 +44,9 @@ 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_SHAPE_ID(), ModelAPI_AttributeSelection::typeId()); data()->addAttribute(END_SHAPE_ID(), ModelAPI_AttributeSelection::typeId()); @@ -53,7 +64,8 @@ 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()) { // may be for not-activated parts eraseResults(); @@ -70,7 +82,7 @@ void FeaturesPlugin_Placement::execute() } std::shared_ptr aStartShape = anObjRef->value(); if(!aStartShape) { - static const std::string aSelectionError = "The start shape selection is bad"; + static const std::string aSelectionError = "Error: The start shape selection is bad."; setError(aSelectionError); return; } @@ -82,7 +94,7 @@ void FeaturesPlugin_Placement::execute() aStartShapeContext = aContextRes->shape(); } if(!aStartShapeContext.get()) { - static const std::string aContextError = "The start shape selection context is bad"; + static const std::string aContextError = "Error: The start shape selection context is bad."; setError(aContextError); return; } @@ -91,7 +103,7 @@ void FeaturesPlugin_Placement::execute() anObjRef = selection(END_SHAPE_ID()); std::shared_ptr anEndShape = anObjRef->value(); if(!anEndShape) { - static const std::string aSelectionError = "The end shape selection is bad"; + static const std::string aSelectionError = "Error: The end shape selection is bad."; setError(aSelectionError); return; } @@ -102,7 +114,7 @@ void FeaturesPlugin_Placement::execute() anEndShapeContext = aContextRes->shape(); } if(!anEndShapeContext.get()) { - static const std::string aContextError = "The end shape selection context is bad"; + static const std::string aContextError = "Error: The end shape selection context is bad."; setError(aContextError); return; } @@ -110,21 +122,8 @@ void FeaturesPlugin_Placement::execute() // 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 = "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 = "One of selected endges is not linear"; - setError(aLinearityError); - return; - } + if (!isShapeValid(aShapes[i])) { + return; } } @@ -136,7 +135,7 @@ void FeaturesPlugin_Placement::execute() GeomAlgoAPI_Placement aPlacementAlgo( 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; } @@ -148,35 +147,38 @@ void FeaturesPlugin_Placement::execute() for(ListOfShape::iterator anObjectsIt = anObjects.begin(); anObjectsIt != anObjects.end(); anObjectsIt++, aContext++) { - if ((*aContext)->groupName() == ModelAPI_ResultPart::group()) { // for part results just set transformation + // 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, 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++; @@ -186,19 +188,44 @@ void FeaturesPlugin_Placement::execute() removeResults(aResultIndex); } -//============================================================================ -void FeaturesPlugin_Placement::LoadNamingDS(GeomAlgoAPI_Transform& theTransformAlgo, - std::shared_ptr theResultBody, - std::shared_ptr theSlaveObject) +//================================================================================================== +bool FeaturesPlugin_Placement::isShapeValid(GeomShapePtr theShape) { - //load result - theResultBody->storeModified(theSlaveObject, theTransformAlgo.shape()); // the initial Slave, the resulting Slave + if (theShape->isCompound()) { + GeomAPI_Shape::ShapeType aShapeType = GeomAPI_Shape::SHAPE; + for (GeomAPI_ShapeIterator anIt(theShape); anIt.more(); anIt.next()) { + GeomShapePtr aCurrentShape = anIt.current(); + if (aShapeType == GeomAPI_Shape::SHAPE) { + aShapeType = aCurrentShape->shapeType(); + } + else if (aShapeType != aCurrentShape->shapeType()) { + static const std::string aLinearityError = + "Error: Selected compound contains shapes with different types."; + setError(aLinearityError); + return false; + } - std::shared_ptr aSubShapes = theTransformAlgo.mapOfSubShapes(); + if (!isShapeValid(aCurrentShape)) { + return false; + } + } + } + else if (theShape->isFace()) { + std::shared_ptr aFace(new GeomAPI_Face(theShape)); + if (!aFace->isPlanar()) { + static const std::string aPlanarityError = "Error: One of selected faces is not planar."; + setError(aPlanarityError); + return false; + } + } + else if (theShape->isEdge()) { + std::shared_ptr anEdge(new GeomAPI_Edge(theShape)); + if (!anEdge->isLine()) { + static const std::string aLinearityError = "Error: One of selected edges is not linear."; + setError(aLinearityError); + return false; + } + } - // put modifed faces in DF - std::string aModName = "Modified"; - theResultBody->loadAndOrientModifiedShapes(&theTransformAlgo, - theSlaveObject, _FACE, - _MODIFIEDF_TAG, aModName, *aSubShapes.get()); + return true; }