X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesAPI%2FFeaturesAPI_ExtrusionBoolean.cpp;h=934a9ae02e0c35113e8d653070896dbb6fd9f227;hb=7c3fffdb58f97da7c236a71697f8d82e4230eeeb;hp=357421b6ee9bf181b292e4f9fb448e875efbd89c;hpb=f98f887290d4e2b4bd6618389911e82b6b9674f3;p=modules%2Fshaper.git diff --git a/src/FeaturesAPI/FeaturesAPI_ExtrusionBoolean.cpp b/src/FeaturesAPI/FeaturesAPI_ExtrusionBoolean.cpp index 357421b6e..934a9ae02 100644 --- a/src/FeaturesAPI/FeaturesAPI_ExtrusionBoolean.cpp +++ b/src/FeaturesAPI/FeaturesAPI_ExtrusionBoolean.cpp @@ -1,16 +1,32 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D --> - -// File: FeaturesAPI_ExtrusionBoolean.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_ExtrusionBoolean.h" #include +#include +#include #include //================================================================================================== -FeaturesAPI_ExtrusionBoolean::FeaturesAPI_ExtrusionBoolean(const std::shared_ptr& theFeature) +FeaturesAPI_ExtrusionBoolean::FeaturesAPI_ExtrusionBoolean( + const std::shared_ptr& theFeature) : ModelHighAPI_Interface(theFeature) { } @@ -20,12 +36,34 @@ FeaturesAPI_ExtrusionBoolean::~FeaturesAPI_ExtrusionBoolean() { } +//================================================================================================== +void FeaturesAPI_ExtrusionBoolean::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()); + + execIfBaseNotEmpty(); +} + //================================================================================================== void FeaturesAPI_ExtrusionBoolean::setBase(const std::list& theBaseObjects) { + mysketch->setValue(ObjectPtr()); + mybaseObjects->clear(); fillAttribute(theBaseObjects, mybaseObjects); - execute(); + execIfBaseNotEmpty(); } //================================================================================================== @@ -33,7 +71,7 @@ void FeaturesAPI_ExtrusionBoolean::setDirection(const ModelHighAPI_Selection& th { fillAttribute(theDirection, mydirection); - execute(); + execIfBaseNotEmpty(); } //================================================================================================== @@ -44,17 +82,13 @@ void FeaturesAPI_ExtrusionBoolean::setSizes(const ModelHighAPI_Double& theToSize fillAttribute(theToSize, mytoSize); fillAttribute(theFromSize, myfromSize); - execute(); + execIfBaseNotEmpty(); } //================================================================================================== void FeaturesAPI_ExtrusionBoolean::setSize(const ModelHighAPI_Double& theSize) { - fillAttribute(FeaturesPlugin_Extrusion::CREATION_METHOD_BY_SIZES(), mycreationMethod); - fillAttribute(theSize, mytoSize); - fillAttribute(ModelHighAPI_Double(), myfromSize); - - execute(); + setSizes(theSize, ModelHighAPI_Double()); } //================================================================================================== @@ -69,128 +103,186 @@ void FeaturesAPI_ExtrusionBoolean::setPlanesAndOffsets(const ModelHighAPI_Select fillAttribute(theFromObject, myfromObject); fillAttribute(theFromOffset, myfromOffset); - execute(); + execIfBaseNotEmpty(); } //================================================================================================== -void FeaturesAPI_ExtrusionBoolean::setBooleanObjects(const std::list& theBooleanObjects) +void FeaturesAPI_ExtrusionBoolean::setBooleanObjects( + const std::list& theBooleanObjects) { fillAttribute(theBooleanObjects, mybooleanObjects); - execute(); + execIfBaseNotEmpty(); +} + +//================================================================================================== +void FeaturesAPI_ExtrusionBoolean::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"; + if(aBase->getKind() == FeaturesPlugin_ExtrusionCut::ID()) { + theDumper << "Cut"; + } else if(aBase->getKind() == FeaturesPlugin_ExtrusionFuse::ID()) { + theDumper << "Fuse"; + } + theDumper << "(" << 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; + } + + AttributeSelectionListPtr anAttrBoolObjects = + aBase->selectionList(FeaturesPlugin_CompositeBoolean::OBJECTS_ID()); + theDumper << ", " << anAttrBoolObjects << ")" << std::endl; + + if(anAttrSketch->isInitialized()) { + theDumper << aBase << ".setNestedSketch(" << anAttrSketch << ")" << std::endl; + } } //================================================================================================== -FeaturesAPI_ExtrusionCut::FeaturesAPI_ExtrusionCut(const std::shared_ptr& theFeature) +void FeaturesAPI_ExtrusionBoolean::execIfBaseNotEmpty() +{ + if(mybaseObjects->size() > 0) { + execute(); + } +} + + +//================================================================================================== +FeaturesAPI_ExtrusionCut::FeaturesAPI_ExtrusionCut( + const std::shared_ptr& theFeature) : FeaturesAPI_ExtrusionBoolean(theFeature) { initialize(); } //================================================================================================== -FeaturesAPI_ExtrusionCut::FeaturesAPI_ExtrusionCut(const std::shared_ptr& theFeature, - const std::list& theBaseObjects, - const ModelHighAPI_Double& theSize, - const std::list& theBooleanObjects) +FeaturesAPI_ExtrusionCut::FeaturesAPI_ExtrusionCut( + const std::shared_ptr& theFeature, + const std::list& theBaseObjects, + const ModelHighAPI_Double& theSize, + const std::list& theBooleanObjects) : FeaturesAPI_ExtrusionBoolean(theFeature) { if(initialize()) { fillAttribute(theBaseObjects, mybaseObjects); - fillAttribute(theSize, mytoSize); - fillAttribute(ModelHighAPI_Double(), myfromSize); + setSize(theSize); setBooleanObjects(theBooleanObjects); } } //================================================================================================== -FeaturesAPI_ExtrusionCut::FeaturesAPI_ExtrusionCut(const std::shared_ptr& theFeature, - const std::list& theBaseObjects, - const ModelHighAPI_Selection& theDirection, - const ModelHighAPI_Double& theSize, - const std::list& theBooleanObjects) +FeaturesAPI_ExtrusionCut::FeaturesAPI_ExtrusionCut( + const std::shared_ptr& theFeature, + const std::list& theBaseObjects, + const ModelHighAPI_Selection& theDirection, + const ModelHighAPI_Double& theSize, + const std::list& theBooleanObjects) : FeaturesAPI_ExtrusionBoolean(theFeature) { if(initialize()) { fillAttribute(theBaseObjects, mybaseObjects); fillAttribute(theDirection, mydirection); - fillAttribute(theSize, mytoSize); - fillAttribute(ModelHighAPI_Double(), myfromSize); + setSize(theSize); setBooleanObjects(theBooleanObjects); } } //================================================================================================== -FeaturesAPI_ExtrusionCut::FeaturesAPI_ExtrusionCut(const std::shared_ptr& theFeature, - const std::list& theBaseObjects, - const ModelHighAPI_Double& theToSize, - const ModelHighAPI_Double& theFromSize, - const std::list& theBooleanObjects) +FeaturesAPI_ExtrusionCut::FeaturesAPI_ExtrusionCut( + const std::shared_ptr& theFeature, + const std::list& theBaseObjects, + const ModelHighAPI_Double& theToSize, + const ModelHighAPI_Double& theFromSize, + const std::list& theBooleanObjects) : FeaturesAPI_ExtrusionBoolean(theFeature) { if(initialize()) { fillAttribute(theBaseObjects, mybaseObjects); - fillAttribute(theToSize, mytoSize); - fillAttribute(theFromSize, myfromSize); + setSizes(theToSize, theFromSize); setBooleanObjects(theBooleanObjects); } } //================================================================================================== -FeaturesAPI_ExtrusionCut::FeaturesAPI_ExtrusionCut(const std::shared_ptr& theFeature, - const std::list& theBaseObjects, - const ModelHighAPI_Selection& theDirection, - const ModelHighAPI_Double& theToSize, - const ModelHighAPI_Double& theFromSize, - const std::list& theBooleanObjects) +FeaturesAPI_ExtrusionCut::FeaturesAPI_ExtrusionCut( + const std::shared_ptr& theFeature, + const std::list& theBaseObjects, + const ModelHighAPI_Selection& theDirection, + const ModelHighAPI_Double& theToSize, + const ModelHighAPI_Double& theFromSize, + const std::list& theBooleanObjects) : FeaturesAPI_ExtrusionBoolean(theFeature) { if(initialize()) { fillAttribute(theBaseObjects, mybaseObjects); fillAttribute(theDirection, mydirection); - fillAttribute(theToSize, mytoSize); - fillAttribute(theFromSize, myfromSize); + setSizes(theToSize, theFromSize); setBooleanObjects(theBooleanObjects); } } //================================================================================================== -FeaturesAPI_ExtrusionCut::FeaturesAPI_ExtrusionCut(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& theBooleanObjects) +FeaturesAPI_ExtrusionCut::FeaturesAPI_ExtrusionCut( + 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& theBooleanObjects) : FeaturesAPI_ExtrusionBoolean(theFeature) { if(initialize()) { fillAttribute(theBaseObjects, mybaseObjects); - fillAttribute(theToObject, mytoObject); - fillAttribute(theToOffset, mytoOffset); - fillAttribute(theFromObject, myfromObject); - fillAttribute(theFromOffset, myfromOffset); + setPlanesAndOffsets(theToObject, theToOffset, theFromObject, theFromOffset); setBooleanObjects(theBooleanObjects); } } //================================================================================================== -FeaturesAPI_ExtrusionCut::FeaturesAPI_ExtrusionCut(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& theBooleanObjects) +FeaturesAPI_ExtrusionCut::FeaturesAPI_ExtrusionCut( + 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& theBooleanObjects) : FeaturesAPI_ExtrusionBoolean(theFeature) { if(initialize()) { fillAttribute(theBaseObjects, mybaseObjects); fillAttribute(theDirection, mydirection); - fillAttribute(theToObject, mytoObject); - fillAttribute(theToOffset, mytoOffset); - fillAttribute(theFromObject, myfromObject); - fillAttribute(theFromOffset, myfromOffset); + setPlanesAndOffsets(theToObject, theToOffset, theFromObject, theFromOffset); setBooleanObjects(theBooleanObjects); } } @@ -201,8 +293,10 @@ ExtrusionCutPtr addExtrusionCut(const std::shared_ptr& thePar const ModelHighAPI_Double& theSize, const std::list& theBooleanObjects) { - std::shared_ptr aFeature = thePart->addFeature(FeaturesPlugin_ExtrusionCut::ID()); - return ExtrusionCutPtr(new FeaturesAPI_ExtrusionCut(aFeature, theBaseObjects, theSize, theBooleanObjects)); + std::shared_ptr aFeature = + thePart->addFeature(FeaturesPlugin_ExtrusionCut::ID()); + return ExtrusionCutPtr(new FeaturesAPI_ExtrusionCut(aFeature, theBaseObjects, + theSize, theBooleanObjects)); } //================================================================================================== @@ -212,8 +306,10 @@ ExtrusionCutPtr addExtrusionCut(const std::shared_ptr& thePar const ModelHighAPI_Double& theSize, const std::list& theBooleanObjects) { - std::shared_ptr aFeature = thePart->addFeature(FeaturesPlugin_ExtrusionCut::ID()); - return ExtrusionCutPtr(new FeaturesAPI_ExtrusionCut(aFeature, theBaseObjects, theDirection, theSize, theBooleanObjects)); + std::shared_ptr aFeature = + thePart->addFeature(FeaturesPlugin_ExtrusionCut::ID()); + return ExtrusionCutPtr(new FeaturesAPI_ExtrusionCut(aFeature, theBaseObjects, theDirection, + theSize, theBooleanObjects)); } //================================================================================================== @@ -223,8 +319,10 @@ ExtrusionCutPtr addExtrusionCut(const std::shared_ptr& thePar const ModelHighAPI_Double& theFromSize, const std::list& theBooleanObjects) { - std::shared_ptr aFeature = thePart->addFeature(FeaturesPlugin_ExtrusionCut::ID()); - return ExtrusionCutPtr(new FeaturesAPI_ExtrusionCut(aFeature, theBaseObjects, theToSize, theFromSize, theBooleanObjects)); + std::shared_ptr aFeature = + thePart->addFeature(FeaturesPlugin_ExtrusionCut::ID()); + return ExtrusionCutPtr(new FeaturesAPI_ExtrusionCut(aFeature, theBaseObjects, + theToSize, theFromSize, theBooleanObjects)); } //================================================================================================== @@ -235,7 +333,8 @@ ExtrusionCutPtr addExtrusionCut(const std::shared_ptr& thePar const ModelHighAPI_Double& theFromSize, const std::list& theBooleanObjects) { - std::shared_ptr aFeature = thePart->addFeature(FeaturesPlugin_ExtrusionCut::ID()); + std::shared_ptr aFeature = + thePart->addFeature(FeaturesPlugin_ExtrusionCut::ID()); return ExtrusionCutPtr(new FeaturesAPI_ExtrusionCut(aFeature, theBaseObjects, theDirection, @@ -253,7 +352,8 @@ ExtrusionCutPtr addExtrusionCut(const std::shared_ptr& thePar const ModelHighAPI_Double& theFromOffset, const std::list& theBooleanObjects) { - std::shared_ptr aFeature = thePart->addFeature(FeaturesPlugin_ExtrusionCut::ID()); + std::shared_ptr aFeature = + thePart->addFeature(FeaturesPlugin_ExtrusionCut::ID()); return ExtrusionCutPtr(new FeaturesAPI_ExtrusionCut(aFeature, theBaseObjects, theToObject, @@ -273,7 +373,8 @@ ExtrusionCutPtr addExtrusionCut(const std::shared_ptr& thePar const ModelHighAPI_Double& theFromOffset, const std::list& theBooleanObjects) { - std::shared_ptr aFeature = thePart->addFeature(FeaturesPlugin_ExtrusionCut::ID()); + std::shared_ptr aFeature = + thePart->addFeature(FeaturesPlugin_ExtrusionCut::ID()); return ExtrusionCutPtr(new FeaturesAPI_ExtrusionCut(aFeature, theBaseObjects, theDirection, @@ -286,116 +387,113 @@ ExtrusionCutPtr addExtrusionCut(const std::shared_ptr& thePar //================================================================================================== -FeaturesAPI_ExtrusionFuse::FeaturesAPI_ExtrusionFuse(const std::shared_ptr& theFeature) +FeaturesAPI_ExtrusionFuse::FeaturesAPI_ExtrusionFuse( + const std::shared_ptr& theFeature) : FeaturesAPI_ExtrusionBoolean(theFeature) { initialize(); } //================================================================================================== -FeaturesAPI_ExtrusionFuse::FeaturesAPI_ExtrusionFuse(const std::shared_ptr& theFeature, - const std::list& theBaseObjects, - const ModelHighAPI_Double& theSize, - const std::list& theBooleanObjects) +FeaturesAPI_ExtrusionFuse::FeaturesAPI_ExtrusionFuse( + const std::shared_ptr& theFeature, + const std::list& theBaseObjects, + const ModelHighAPI_Double& theSize, + const std::list& theBooleanObjects) : FeaturesAPI_ExtrusionBoolean(theFeature) { if(initialize()) { fillAttribute(theBaseObjects, mybaseObjects); - fillAttribute(theSize, mytoSize); - fillAttribute(ModelHighAPI_Double(), myfromSize); + setSize(theSize); setBooleanObjects(theBooleanObjects); } } //================================================================================================== -FeaturesAPI_ExtrusionFuse::FeaturesAPI_ExtrusionFuse(const std::shared_ptr& theFeature, - const std::list& theBaseObjects, - const ModelHighAPI_Selection& theDirection, - const ModelHighAPI_Double& theSize, - const std::list& theBooleanObjects) +FeaturesAPI_ExtrusionFuse::FeaturesAPI_ExtrusionFuse( + const std::shared_ptr& theFeature, + const std::list& theBaseObjects, + const ModelHighAPI_Selection& theDirection, + const ModelHighAPI_Double& theSize, + const std::list& theBooleanObjects) : FeaturesAPI_ExtrusionBoolean(theFeature) { if(initialize()) { fillAttribute(theBaseObjects, mybaseObjects); fillAttribute(theDirection, mydirection); - fillAttribute(theSize, mytoSize); - fillAttribute(ModelHighAPI_Double(), myfromSize); + setSize(theSize); setBooleanObjects(theBooleanObjects); } } //================================================================================================== -FeaturesAPI_ExtrusionFuse::FeaturesAPI_ExtrusionFuse(const std::shared_ptr& theFeature, - const std::list& theBaseObjects, - const ModelHighAPI_Double& theToSize, - const ModelHighAPI_Double& theFromSize, - const std::list& theBooleanObjects) +FeaturesAPI_ExtrusionFuse::FeaturesAPI_ExtrusionFuse( + const std::shared_ptr& theFeature, + const std::list& theBaseObjects, + const ModelHighAPI_Double& theToSize, + const ModelHighAPI_Double& theFromSize, + const std::list& theBooleanObjects) : FeaturesAPI_ExtrusionBoolean(theFeature) { if(initialize()) { fillAttribute(theBaseObjects, mybaseObjects); - fillAttribute(theToSize, mytoSize); - fillAttribute(theFromSize, myfromSize); + setSizes(theToSize, theFromSize); setBooleanObjects(theBooleanObjects); } } //================================================================================================== -FeaturesAPI_ExtrusionFuse::FeaturesAPI_ExtrusionFuse(const std::shared_ptr& theFeature, - const std::list& theBaseObjects, - const ModelHighAPI_Selection& theDirection, - const ModelHighAPI_Double& theToSize, - const ModelHighAPI_Double& theFromSize, - const std::list& theBooleanObjects) +FeaturesAPI_ExtrusionFuse::FeaturesAPI_ExtrusionFuse( + const std::shared_ptr& theFeature, + const std::list& theBaseObjects, + const ModelHighAPI_Selection& theDirection, + const ModelHighAPI_Double& theToSize, + const ModelHighAPI_Double& theFromSize, + const std::list& theBooleanObjects) : FeaturesAPI_ExtrusionBoolean(theFeature) { if(initialize()) { fillAttribute(theBaseObjects, mybaseObjects); fillAttribute(theDirection, mydirection); - fillAttribute(theToSize, mytoSize); - fillAttribute(theFromSize, myfromSize); + setSizes(theToSize, theFromSize); setBooleanObjects(theBooleanObjects); } } //================================================================================================== -FeaturesAPI_ExtrusionFuse::FeaturesAPI_ExtrusionFuse(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& theBooleanObjects) +FeaturesAPI_ExtrusionFuse::FeaturesAPI_ExtrusionFuse( + 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& theBooleanObjects) : FeaturesAPI_ExtrusionBoolean(theFeature) { if(initialize()) { fillAttribute(theBaseObjects, mybaseObjects); - fillAttribute(theToObject, mytoObject); - fillAttribute(theToOffset, mytoOffset); - fillAttribute(theFromObject, myfromObject); - fillAttribute(theFromOffset, myfromOffset); + setPlanesAndOffsets(theToObject, theToOffset, theFromObject, theFromOffset); setBooleanObjects(theBooleanObjects); } } //================================================================================================== -FeaturesAPI_ExtrusionFuse::FeaturesAPI_ExtrusionFuse(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& theBooleanObjects) +FeaturesAPI_ExtrusionFuse::FeaturesAPI_ExtrusionFuse( + 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& theBooleanObjects) : FeaturesAPI_ExtrusionBoolean(theFeature) { if(initialize()) { fillAttribute(theBaseObjects, mybaseObjects); fillAttribute(theDirection, mydirection); - fillAttribute(theToObject, mytoObject); - fillAttribute(theToOffset, mytoOffset); - fillAttribute(theFromObject, myfromObject); - fillAttribute(theFromOffset, myfromOffset); + setPlanesAndOffsets(theToObject, theToOffset, theFromObject, theFromOffset); setBooleanObjects(theBooleanObjects); } } @@ -406,8 +504,10 @@ ExtrusionFusePtr addExtrusionFuse(const std::shared_ptr& theP const ModelHighAPI_Double& theSize, const std::list& theBooleanObjects) { - std::shared_ptr aFeature = thePart->addFeature(FeaturesPlugin_ExtrusionFuse::ID()); - return ExtrusionFusePtr(new FeaturesAPI_ExtrusionFuse(aFeature, theBaseObjects, theSize, theBooleanObjects)); + std::shared_ptr aFeature = + thePart->addFeature(FeaturesPlugin_ExtrusionFuse::ID()); + return ExtrusionFusePtr(new FeaturesAPI_ExtrusionFuse(aFeature, theBaseObjects, + theSize, theBooleanObjects)); } //================================================================================================== @@ -417,8 +517,10 @@ ExtrusionFusePtr addExtrusionFuse(const std::shared_ptr& theP const ModelHighAPI_Double& theSize, const std::list& theBooleanObjects) { - std::shared_ptr aFeature = thePart->addFeature(FeaturesPlugin_ExtrusionFuse::ID()); - return ExtrusionFusePtr(new FeaturesAPI_ExtrusionFuse(aFeature, theBaseObjects, theDirection, theSize, theBooleanObjects)); + std::shared_ptr aFeature = + thePart->addFeature(FeaturesPlugin_ExtrusionFuse::ID()); + return ExtrusionFusePtr(new FeaturesAPI_ExtrusionFuse(aFeature, theBaseObjects, + theDirection, theSize, theBooleanObjects)); } //================================================================================================== @@ -428,8 +530,10 @@ ExtrusionFusePtr addExtrusionFuse(const std::shared_ptr& theP const ModelHighAPI_Double& theFromSize, const std::list& theBooleanObjects) { - std::shared_ptr aFeature = thePart->addFeature(FeaturesPlugin_ExtrusionFuse::ID()); - return ExtrusionFusePtr(new FeaturesAPI_ExtrusionFuse(aFeature, theBaseObjects, theToSize, theFromSize, theBooleanObjects)); + std::shared_ptr aFeature = + thePart->addFeature(FeaturesPlugin_ExtrusionFuse::ID()); + return ExtrusionFusePtr(new FeaturesAPI_ExtrusionFuse(aFeature, theBaseObjects, + theToSize, theFromSize, theBooleanObjects)); } //================================================================================================== @@ -440,7 +544,8 @@ ExtrusionFusePtr addExtrusionFuse(const std::shared_ptr& theP const ModelHighAPI_Double& theFromSize, const std::list& theBooleanObjects) { - std::shared_ptr aFeature = thePart->addFeature(FeaturesPlugin_ExtrusionFuse::ID()); + std::shared_ptr aFeature = + thePart->addFeature(FeaturesPlugin_ExtrusionFuse::ID()); return ExtrusionFusePtr(new FeaturesAPI_ExtrusionFuse(aFeature, theBaseObjects, theDirection, @@ -458,7 +563,8 @@ ExtrusionFusePtr addExtrusionFuse(const std::shared_ptr& theP const ModelHighAPI_Double& theFromOffset, const std::list& theBooleanObjects) { - std::shared_ptr aFeature = thePart->addFeature(FeaturesPlugin_ExtrusionFuse::ID()); + std::shared_ptr aFeature = + thePart->addFeature(FeaturesPlugin_ExtrusionFuse::ID()); return ExtrusionFusePtr(new FeaturesAPI_ExtrusionFuse(aFeature, theBaseObjects, theToObject, @@ -478,7 +584,8 @@ ExtrusionFusePtr addExtrusionFuse(const std::shared_ptr& theP const ModelHighAPI_Double& theFromOffset, const std::list& theBooleanObjects) { - std::shared_ptr aFeature = thePart->addFeature(FeaturesPlugin_ExtrusionFuse::ID()); + std::shared_ptr aFeature = + thePart->addFeature(FeaturesPlugin_ExtrusionFuse::ID()); return ExtrusionFusePtr(new FeaturesAPI_ExtrusionFuse(aFeature, theBaseObjects, theDirection,