-// Copyright (C) 2014-2017 CEA/DEN, EDF R&D
+// Copyright (C) 2014-2023 CEA, EDF
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
//
// 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
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// See http://www.salome-platform.org/ or
-// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#include "FeaturesAPI_Revolution.h"
const std::list<ModelHighAPI_Selection>& theBaseObjects,
const ModelHighAPI_Selection& theAxis,
const ModelHighAPI_Double& theToAngle,
- const ModelHighAPI_Double& theFromAngle)
+ const ModelHighAPI_Double& theFromAngle,
+ const std::string& theSelectionType)
: ModelHighAPI_Interface(theFeature)
{
if(initialize()) {
+ if (!theSelectionType.empty())
+ mybaseObjects->setSelectionType(theSelectionType);
fillAttribute(theBaseObjects, mybaseObjects);
fillAttribute(theAxis, myaxis);
setAngles(theToAngle, theFromAngle);
const ModelHighAPI_Selection& theToObject,
const ModelHighAPI_Double& theToOffset,
const ModelHighAPI_Selection& theFromObject,
- const ModelHighAPI_Double& theFromOffset)
+ const ModelHighAPI_Double& theFromOffset,
+ const std::string& theSelectionType)
: ModelHighAPI_Interface(theFeature)
{
if(initialize()) {
+ if (!theSelectionType.empty())
+ mybaseObjects->setSelectionType(theSelectionType);
fillAttribute(theBaseObjects, mybaseObjects);
fillAttribute(theAxis, myaxis);
setPlanesAndOffsets(theToObject, theToOffset, theFromObject, theFromOffset);
//==================================================================================================
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());
}
//==================================================================================================
", " << anAttrFromObject << ", " << anAttrFromOffset;
}
+ // write explicitly the type of selection if it does not correspond
+ // to the type of first selected shape
+ if (!anAttrSketch->isInitialized()) {
+ std::string aListSelType = anAttrObjects->selectionType();
+ AttributeSelectionPtr aFirstSelection = anAttrObjects->value(0);
+ GeomShapePtr aFirstShape = aFirstSelection->value();
+ if (!aFirstShape)
+ aFirstShape = aFirstSelection->context()->shape();
+ if (!aFirstShape || aFirstShape->shapeType() != GeomAPI_Shape::shapeTypeByStr(aListSelType))
+ theDumper << ", \"" << aListSelType << "\"";
+ }
+
theDumper << ")" << std::endl;
if(anAttrSketch->isInitialized()) {
const std::list<ModelHighAPI_Selection>& theBaseObjects,
const ModelHighAPI_Selection& theAxis,
const ModelHighAPI_Double& theToAngle,
- const ModelHighAPI_Double& theFromAngle)
+ const ModelHighAPI_Double& theFromAngle,
+ const std::string& theSelectionType)
{
std::shared_ptr<ModelAPI_Feature> aFeature = thePart->addFeature(FeaturesAPI_Revolution::ID());
return RevolutionPtr(new FeaturesAPI_Revolution(aFeature,
theBaseObjects,
theAxis,
theToAngle,
- theFromAngle));
+ theFromAngle,
+ theSelectionType));
}
//==================================================================================================
const ModelHighAPI_Selection& theToObject,
const ModelHighAPI_Double& theToOffset,
const ModelHighAPI_Selection& theFromObject,
- const ModelHighAPI_Double& theFromOffset)
+ const ModelHighAPI_Double& theFromOffset,
+ const std::string& theSelectionType)
{
std::shared_ptr<ModelAPI_Feature> aFeature = thePart->addFeature(FeaturesAPI_Revolution::ID());
return RevolutionPtr(new FeaturesAPI_Revolution(aFeature,
theToObject,
theToOffset,
theFromObject,
- theFromOffset));
+ theFromOffset,
+ theSelectionType));
}