X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesAPI%2FFeaturesAPI_Revolution.cpp;h=a685523e0ed125f56a7424ed9f601dca55f46cf0;hb=cb0a7bdbea9f94ea30879522b230cbe773b60dc3;hp=6c09db9f22251506fb1162c51f481479d92639f1;hpb=5dc7890a0bf10ed40177900107ae4a1981da425d;p=modules%2Fshaper.git diff --git a/src/FeaturesAPI/FeaturesAPI_Revolution.cpp b/src/FeaturesAPI/FeaturesAPI_Revolution.cpp index 6c09db9f2..a685523e0 100644 --- a/src/FeaturesAPI/FeaturesAPI_Revolution.cpp +++ b/src/FeaturesAPI/FeaturesAPI_Revolution.cpp @@ -1,8 +1,21 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D --> - -// File: FeaturesAPI_Revolution.cpp -// Created: 09 June 2016 -// Author: Dmitry Bobylev +// Copyright (C) 2014-2019 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_Revolution.h" @@ -19,10 +32,11 @@ FeaturesAPI_Revolution::FeaturesAPI_Revolution(const std::shared_ptr& theFeature, - const std::list& theBaseObjects, - const ModelHighAPI_Selection& theAxis, - const ModelHighAPI_Double& theAngle) +FeaturesAPI_Revolution::FeaturesAPI_Revolution( + const std::shared_ptr& theFeature, + const std::list& theBaseObjects, + const ModelHighAPI_Selection& theAxis, + const ModelHighAPI_Double& theAngle) : ModelHighAPI_Interface(theFeature) { if(initialize()) { @@ -33,11 +47,12 @@ FeaturesAPI_Revolution::FeaturesAPI_Revolution(const std::shared_ptr& theFeature, - const std::list& theBaseObjects, - const ModelHighAPI_Selection& theAxis, - const ModelHighAPI_Double& theToAngle, - const ModelHighAPI_Double& theFromAngle) +FeaturesAPI_Revolution::FeaturesAPI_Revolution( + const std::shared_ptr& theFeature, + const std::list& theBaseObjects, + const ModelHighAPI_Selection& theAxis, + const ModelHighAPI_Double& theToAngle, + const ModelHighAPI_Double& theFromAngle) : ModelHighAPI_Interface(theFeature) { if(initialize()) { @@ -48,13 +63,14 @@ FeaturesAPI_Revolution::FeaturesAPI_Revolution(const std::shared_ptr& theFeature, - const std::list& theBaseObjects, - const ModelHighAPI_Selection& theAxis, - const ModelHighAPI_Selection& theToObject, - const ModelHighAPI_Double& theToOffset, - const ModelHighAPI_Selection& theFromObject, - const ModelHighAPI_Double& theFromOffset) +FeaturesAPI_Revolution::FeaturesAPI_Revolution( + const std::shared_ptr& theFeature, + const std::list& theBaseObjects, + const ModelHighAPI_Selection& theAxis, + const ModelHighAPI_Selection& theToObject, + const ModelHighAPI_Double& theToOffset, + const ModelHighAPI_Selection& theFromObject, + const ModelHighAPI_Double& theFromOffset) : ModelHighAPI_Interface(theFeature) { if(initialize()) { @@ -74,6 +90,16 @@ FeaturesAPI_Revolution::~FeaturesAPI_Revolution() void FeaturesAPI_Revolution::setNestedSketch(const ModelHighAPI_Reference& theSketch) { mysketch->setValue(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()); @@ -112,11 +138,7 @@ void FeaturesAPI_Revolution::setAngles(const ModelHighAPI_Double& theToAngle, //================================================================================================== void FeaturesAPI_Revolution::setAngle(const ModelHighAPI_Double& theAngle) { - fillAttribute(FeaturesPlugin_Revolution::CREATION_METHOD_BY_ANGLES(), mycreationMethod); - fillAttribute(theAngle, mytoAngle); - fillAttribute(ModelHighAPI_Double(), myfromAngle); - - execIfBaseNotEmpty(); + setAngles(theAngle, ModelHighAPI_Double()); } //================================================================================================== @@ -141,14 +163,16 @@ void FeaturesAPI_Revolution::dump(ModelHighAPI_Dumper& theDumper) const const std::string& aDocName = theDumper.name(aBase->document()); AttributeReferencePtr anAttrSketch = aBase->reference(FeaturesPlugin_Revolution::SKETCH_ID()); - AttributeSelectionListPtr anAttrObjects = aBase->selectionList(FeaturesPlugin_Revolution::BASE_OBJECTS_ID()); + AttributeSelectionListPtr anAttrObjects = + aBase->selectionList(FeaturesPlugin_Revolution::BASE_OBJECTS_ID()); AttributeSelectionPtr anAttrAxis = aBase->selection(FeaturesPlugin_Revolution::AXIS_OBJECT_ID()); theDumper << aBase << " = model.addRevolution(" << aDocName << ", "; anAttrSketch->isInitialized() ? theDumper << "[]" : theDumper << anAttrObjects; theDumper << ", " << anAttrAxis; - std::string aCreationMethod = aBase->string(FeaturesPlugin_Revolution::CREATION_METHOD())->value(); + std::string aCreationMethod = + aBase->string(FeaturesPlugin_Revolution::CREATION_METHOD())->value(); if(aCreationMethod == FeaturesPlugin_Revolution::CREATION_METHOD_BY_ANGLES()) { AttributeDoublePtr anAttrToAngle = aBase->real(FeaturesPlugin_Revolution::TO_ANGLE_ID()); @@ -156,12 +180,15 @@ void FeaturesAPI_Revolution::dump(ModelHighAPI_Dumper& theDumper) const theDumper << ", " << anAttrToAngle << ", " << anAttrFromAngle; } else if(aCreationMethod == FeaturesPlugin_Revolution::CREATION_METHOD_BY_PLANES()) { - AttributeSelectionPtr anAttrToObject = aBase->selection(FeaturesPlugin_Revolution::TO_OBJECT_ID()); + AttributeSelectionPtr anAttrToObject = + aBase->selection(FeaturesPlugin_Revolution::TO_OBJECT_ID()); AttributeDoublePtr anAttrToOffset = aBase->real(FeaturesPlugin_Revolution::TO_OFFSET_ID()); - AttributeSelectionPtr anAttrFromObject = aBase->selection(FeaturesPlugin_Revolution::FROM_OBJECT_ID()); + AttributeSelectionPtr anAttrFromObject = + aBase->selection(FeaturesPlugin_Revolution::FROM_OBJECT_ID()); AttributeDoublePtr anAttrFromOffset = aBase->real(FeaturesPlugin_Revolution::FROM_OFFSET_ID()); - theDumper << ", " << anAttrToObject << ", " << anAttrToOffset << ", " << anAttrFromObject << ", " << anAttrFromOffset; + theDumper << ", " << anAttrToObject << ", " << anAttrToOffset << + ", " << anAttrFromObject << ", " << anAttrFromOffset; } theDumper << ")" << std::endl;