X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesAPI%2FFeaturesAPI_Extrusion.cpp;h=5e2975ac3bfe595874fe4fc8da741e161cc7012c;hb=db25cb9e9be0ce3e2332141f7f2f47f088956bea;hp=8bb243a0224572348d5be1ef9d2a2c08ff355516;hpb=6339093425f6055e2491220a54ae23936642768d;p=modules%2Fshaper.git diff --git a/src/FeaturesAPI/FeaturesAPI_Extrusion.cpp b/src/FeaturesAPI/FeaturesAPI_Extrusion.cpp index 8bb243a02..5e2975ac3 100644 --- a/src/FeaturesAPI/FeaturesAPI_Extrusion.cpp +++ b/src/FeaturesAPI/FeaturesAPI_Extrusion.cpp @@ -1,12 +1,28 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D --> - -// File: FeaturesAPI_Extrusion.cpp -// Created: 09 June 2016 -// Author: Dmitry Bobylev +// 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 "FeaturesAPI_Extrusion.h" #include +#include +#include #include //================================================================================================== @@ -18,8 +34,8 @@ FeaturesAPI_Extrusion::FeaturesAPI_Extrusion(const std::shared_ptr& theFeature, - const std::list& theBaseObjects, - const ModelHighAPI_Double& theSize) + const std::list& theBaseObjects, + const ModelHighAPI_Double& theSize) : ModelHighAPI_Interface(theFeature) { if(initialize()) { @@ -30,9 +46,9 @@ FeaturesAPI_Extrusion::FeaturesAPI_Extrusion(const std::shared_ptr& theFeature, - const std::list& theBaseObjects, - const ModelHighAPI_Selection& theDirection, - const ModelHighAPI_Double& theSize) + const std::list& theBaseObjects, + const ModelHighAPI_Selection& theDirection, + const ModelHighAPI_Double& theSize) : ModelHighAPI_Interface(theFeature) { if(initialize()) { @@ -44,9 +60,9 @@ FeaturesAPI_Extrusion::FeaturesAPI_Extrusion(const std::shared_ptr& theFeature, - const std::list& theBaseObjects, - const ModelHighAPI_Double& theToSize, - const ModelHighAPI_Double& theFromSize) + const std::list& theBaseObjects, + const ModelHighAPI_Double& theToSize, + const ModelHighAPI_Double& theFromSize) : ModelHighAPI_Interface(theFeature) { if(initialize()) { @@ -57,10 +73,10 @@ FeaturesAPI_Extrusion::FeaturesAPI_Extrusion(const std::shared_ptr& theFeature, - const std::list& theBaseObjects, - const ModelHighAPI_Selection& theDirection, - const ModelHighAPI_Double& theToSize, - const ModelHighAPI_Double& theFromSize) + const std::list& theBaseObjects, + const ModelHighAPI_Selection& theDirection, + const ModelHighAPI_Double& theToSize, + const ModelHighAPI_Double& theFromSize) : ModelHighAPI_Interface(theFeature) { if(initialize()) { @@ -72,11 +88,11 @@ FeaturesAPI_Extrusion::FeaturesAPI_Extrusion(const std::shared_ptr& theFeature, - const std::list& theBaseObjects, - const ModelHighAPI_Selection& theToObject, - const ModelHighAPI_Double& theToOffset, - const ModelHighAPI_Selection& theFromObject, - const ModelHighAPI_Double& theFromOffset) + const std::list& theBaseObjects, + const ModelHighAPI_Selection& theToObject, + const ModelHighAPI_Double& theToOffset, + const ModelHighAPI_Selection& theFromObject, + const ModelHighAPI_Double& theFromOffset) : ModelHighAPI_Interface(theFeature) { if(initialize()) { @@ -87,12 +103,12 @@ FeaturesAPI_Extrusion::FeaturesAPI_Extrusion(const std::shared_ptr& theFeature, - const std::list& theBaseObjects, - const ModelHighAPI_Selection& theDirection, - const ModelHighAPI_Selection& theToObject, - const ModelHighAPI_Double& theToOffset, - const ModelHighAPI_Selection& theFromObject, - const ModelHighAPI_Double& theFromOffset) + const std::list& theBaseObjects, + const ModelHighAPI_Selection& theDirection, + const ModelHighAPI_Selection& theToObject, + const ModelHighAPI_Double& theToOffset, + const ModelHighAPI_Selection& theFromObject, + const ModelHighAPI_Double& theFromOffset) : ModelHighAPI_Interface(theFeature) { if(initialize()) { @@ -105,15 +121,36 @@ FeaturesAPI_Extrusion::FeaturesAPI_Extrusion(const std::shared_ptrsetValue(theSketch.feature()); + + // To make Sketch feature execute and subfeatures execute. + feature()->document()->setCurrentFeature(feature(), false); + + // to inform that the history is updated due to the sketch moved under the composite feature + if (theSketch.feature().get()) { + theSketch.feature()->document()->updateHistory(ModelAPI_Feature::group()); + if (theSketch.feature()->firstResult().get()) + theSketch.feature()->firstResult()->setDisplayed(false); + } + mybaseObjects->clear(); + mybaseObjects->append(theSketch.feature()->firstResult(), GeomShapePtr()); + execIfBaseNotEmpty(); } //================================================================================================== void FeaturesAPI_Extrusion::setBase(const std::list& theBaseObjects) { + mysketch->setValue(ObjectPtr()); + mybaseObjects->clear(); fillAttribute(theBaseObjects, mybaseObjects); - execute(); + execIfBaseNotEmpty(); } //================================================================================================== @@ -121,28 +158,28 @@ void FeaturesAPI_Extrusion::setDirection(const ModelHighAPI_Selection& theDirect { fillAttribute(theDirection, mydirection); - execute(); + execIfBaseNotEmpty(); } //================================================================================================== void FeaturesAPI_Extrusion::setSizes(const ModelHighAPI_Double& theToSize, const ModelHighAPI_Double& theFromSize) { - fillAttribute("BySizes", mycreationMethod); + fillAttribute(FeaturesPlugin_Extrusion::CREATION_METHOD_BY_SIZES(), mycreationMethod); fillAttribute(theToSize, mytoSize); fillAttribute(theFromSize, myfromSize); - execute(); + execIfBaseNotEmpty(); } //================================================================================================== void FeaturesAPI_Extrusion::setSize(const ModelHighAPI_Double& theSize) { - fillAttribute("BySizes", mycreationMethod); + fillAttribute(FeaturesPlugin_Extrusion::CREATION_METHOD_BY_SIZES(), mycreationMethod); fillAttribute(theSize, mytoSize); fillAttribute(ModelHighAPI_Double(), myfromSize); - execute(); + execIfBaseNotEmpty(); } //================================================================================================== @@ -151,16 +188,66 @@ void FeaturesAPI_Extrusion::setPlanesAndOffsets(const ModelHighAPI_Selection& th const ModelHighAPI_Selection& theFromObject, const ModelHighAPI_Double& theFromOffset) { - fillAttribute("ByPlanesAndOffsets", mycreationMethod); + fillAttribute(FeaturesPlugin_Extrusion::CREATION_METHOD_BY_PLANES(), mycreationMethod); fillAttribute(theToObject, mytoObject); fillAttribute(theToOffset, mytoOffset); fillAttribute(theFromObject, myfromObject); fillAttribute(theFromOffset, myfromOffset); - execute(); + execIfBaseNotEmpty(); +} + +//================================================================================================== +void FeaturesAPI_Extrusion::dump(ModelHighAPI_Dumper& theDumper) const +{ + FeaturePtr aBase = feature(); + const std::string& aDocName = theDumper.name(aBase->document()); + + AttributeReferencePtr anAttrSketch = aBase->reference(FeaturesPlugin_Extrusion::SKETCH_ID()); + AttributeSelectionListPtr anAttrObjects = + aBase->selectionList(FeaturesPlugin_Extrusion::BASE_OBJECTS_ID()); + AttributeSelectionPtr anAttrDirection = + aBase->selection(FeaturesPlugin_Extrusion::DIRECTION_OBJECT_ID()); + + theDumper << aBase << " = model.addExtrusion(" << aDocName << ", "; + anAttrSketch->isInitialized() ? theDumper << "[]" : theDumper << anAttrObjects; + theDumper << ", " << anAttrDirection; + + std::string aCreationMethod = + aBase->string(FeaturesPlugin_Extrusion::CREATION_METHOD())->value(); + + if(aCreationMethod == FeaturesPlugin_Extrusion::CREATION_METHOD_BY_SIZES()) { + AttributeDoublePtr anAttrToSize = aBase->real(FeaturesPlugin_Extrusion::TO_SIZE_ID()); + AttributeDoublePtr anAttrFromSize = aBase->real(FeaturesPlugin_Extrusion::FROM_SIZE_ID()); + + theDumper << ", " << anAttrToSize << ", " << anAttrFromSize; + } else if(aCreationMethod == FeaturesPlugin_Extrusion::CREATION_METHOD_BY_PLANES()) { + AttributeSelectionPtr anAttrToObject = + aBase->selection(FeaturesPlugin_Extrusion::TO_OBJECT_ID()); + AttributeDoublePtr anAttrToOffset = aBase->real(FeaturesPlugin_Extrusion::TO_OFFSET_ID()); + AttributeSelectionPtr anAttrFromObject = + aBase->selection(FeaturesPlugin_Extrusion::FROM_OBJECT_ID()); + AttributeDoublePtr anAttrFromOffset = aBase->real(FeaturesPlugin_Extrusion::FROM_OFFSET_ID()); + + theDumper << ", " << anAttrToObject << ", " << anAttrToOffset << + ", " << anAttrFromObject << ", " << anAttrFromOffset; + } + + theDumper << ")" << std::endl; + + if(anAttrSketch->isInitialized()) { + theDumper << aBase << ".setNestedSketch(" << anAttrSketch << ")" << std::endl; + } +} + +//================================================================================================== +void FeaturesAPI_Extrusion::execIfBaseNotEmpty() +{ + if(mybaseObjects->size() > 0) { + execute(); + } } -// TODO(spo): make add* as static functions of the class //================================================================================================== ExtrusionPtr addExtrusion(const std::shared_ptr& thePart, const std::list& theBaseObjects,