X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FFeaturesAPI%2FFeaturesAPI_ExtrusionBoolean.h;h=6ca1abff478e81b7b293c5457f4264cc60737942;hb=a0fa395fd2a0ddb16cb9aed4dab180f2681b4447;hp=390a955cbf4ddc7859f53fca37b5152c9f909e26;hpb=f98f887290d4e2b4bd6618389911e82b6b9674f3;p=modules%2Fshaper.git diff --git a/src/FeaturesAPI/FeaturesAPI_ExtrusionBoolean.h b/src/FeaturesAPI/FeaturesAPI_ExtrusionBoolean.h index 390a955cb..6ca1abff4 100644 --- a/src/FeaturesAPI/FeaturesAPI_ExtrusionBoolean.h +++ b/src/FeaturesAPI/FeaturesAPI_ExtrusionBoolean.h @@ -1,15 +1,27 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D --> - -// File: FeaturesAPI_ExtrusionBoolean.h -// Created: 09 June 2016 -// Author: Dmitry Bobylev +// Copyright (C) 2014-2020 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 +// #ifndef FeaturesAPI_ExtrusionBoolean_H_ #define FeaturesAPI_ExtrusionBoolean_H_ #include "FeaturesAPI.h" -#include #include #include @@ -17,6 +29,7 @@ #include class ModelHighAPI_Double; +class ModelHighAPI_Reference; class ModelHighAPI_Selection; /// \class FeaturesAPI_ExtrusionBoolean @@ -30,17 +43,32 @@ public: virtual ~FeaturesAPI_ExtrusionBoolean(); INTERFACE_11("", - sketchLauncher, FeaturesPlugin_Extrusion::SKETCH_ID(), ModelAPI_AttributeReference, /** Sketch launcher */, - baseObjects, FeaturesPlugin_Extrusion::BASE_OBJECTS_ID(), ModelAPI_AttributeSelectionList, /** Base objects */, - direction, FeaturesPlugin_Extrusion::DIRECTION_OBJECT_ID(), ModelAPI_AttributeSelection, /** Direction */, - creationMethod, FeaturesPlugin_Extrusion::CREATION_METHOD(), ModelAPI_AttributeString, /** Creation method */, - toSize, FeaturesPlugin_Extrusion::TO_SIZE_ID(), ModelAPI_AttributeDouble, /** To size */, - fromSize, FeaturesPlugin_Extrusion::FROM_SIZE_ID(), ModelAPI_AttributeDouble, /** From size */, - toObject, FeaturesPlugin_Extrusion::TO_OBJECT_ID(), ModelAPI_AttributeSelection, /** To object */, - toOffset, FeaturesPlugin_Extrusion::TO_OFFSET_ID(), ModelAPI_AttributeDouble, /** To offset */, - fromObject, FeaturesPlugin_Extrusion::FROM_OBJECT_ID(), ModelAPI_AttributeSelection, /** From object */, - fromOffset, FeaturesPlugin_Extrusion::FROM_OFFSET_ID(), ModelAPI_AttributeDouble, /** From offset */, - booleanObjects, FeaturesPlugin_CompositeBoolean::OBJECTS_ID(), ModelAPI_AttributeSelectionList, /** Boolean objects */) + sketch, FeaturesPlugin_Extrusion::SKETCH_ID(), + ModelAPI_AttributeReference, /** Sketch launcher */, + baseObjects, FeaturesPlugin_Extrusion::BASE_OBJECTS_ID(), + ModelAPI_AttributeSelectionList, /** Base objects */, + direction, FeaturesPlugin_Extrusion::DIRECTION_OBJECT_ID(), + ModelAPI_AttributeSelection, /** Direction */, + creationMethod, FeaturesPlugin_Extrusion::CREATION_METHOD(), + ModelAPI_AttributeString, /** Creation method */, + toSize, FeaturesPlugin_Extrusion::TO_SIZE_ID(), + ModelAPI_AttributeDouble, /** To size */, + fromSize, FeaturesPlugin_Extrusion::FROM_SIZE_ID(), + ModelAPI_AttributeDouble, /** From size */, + toObject, FeaturesPlugin_Extrusion::TO_OBJECT_ID(), + ModelAPI_AttributeSelection, /** To object */, + toOffset, FeaturesPlugin_Extrusion::TO_OFFSET_ID(), + ModelAPI_AttributeDouble, /** To offset */, + fromObject, FeaturesPlugin_Extrusion::FROM_OBJECT_ID(), + ModelAPI_AttributeSelection, /** From object */, + fromOffset, FeaturesPlugin_Extrusion::FROM_OFFSET_ID(), + ModelAPI_AttributeDouble, /** From offset */, + booleanObjects, FeaturesPlugin_CompositeBoolean::OBJECTS_ID(), + ModelAPI_AttributeSelectionList, /** Boolean objects */) + + /// Modify base attribute of the feature. + FEATURESAPI_EXPORT + void setNestedSketch(const ModelHighAPI_Reference& theSketch); /// Modify base attribute of the feature. FEATURESAPI_EXPORT @@ -58,7 +86,8 @@ public: FEATURESAPI_EXPORT void setSize(const ModelHighAPI_Double& theSize); - /// Modify creation_method, to_object, to_offset, from_object, from_offset attributes of the feature. + /// Modify creation_method, to_object, to_offset, from_object, + /// from_offset attributes of the feature. FEATURESAPI_EXPORT void setPlanesAndOffsets(const ModelHighAPI_Selection& theToObject, const ModelHighAPI_Double& theToOffset, @@ -69,24 +98,44 @@ public: FEATURESAPI_EXPORT void setBooleanObjects(const std::list& theBooleanObjects); + /// Dump wrapped feature + FEATURESAPI_EXPORT + virtual void dump(ModelHighAPI_Dumper& theDumper) const; + protected: /// Constructor without values. FEATURESAPI_EXPORT explicit FeaturesAPI_ExtrusionBoolean(const std::shared_ptr& theFeature); + +private: + void execIfBaseNotEmpty(); }; +/// \class FeaturesAPI_ExtrusionCut +/// \ingroup CPPHighAPI +/// \brief Interface for ExtrusionCut feature. class FeaturesAPI_ExtrusionCut: public FeaturesAPI_ExtrusionBoolean { public: - FEATURESAPI_EXPORT - virtual std::string getID() { - return FeaturesPlugin_ExtrusionCut::ID(); - } + + static std::string ID() { return FeaturesPlugin_ExtrusionCut::ID(); } + virtual std::string getID() { return ID(); } + + //FEATURESAPI_EXPORT + //virtual std::string getID() { + // return FeaturesPlugin_ExtrusionCut::ID(); + //} /// Constructor without values. FEATURESAPI_EXPORT explicit FeaturesAPI_ExtrusionCut(const std::shared_ptr& theFeature); + /// Constructor with values. + FEATURESAPI_EXPORT + explicit FeaturesAPI_ExtrusionCut(const std::shared_ptr& theFeature, + const std::list& theBaseObjects, + const std::list& theBooleanObjects); + /// Constructor with values. FEATURESAPI_EXPORT explicit FeaturesAPI_ExtrusionCut(const std::shared_ptr& theFeature, @@ -94,6 +143,13 @@ public: const ModelHighAPI_Double& theSize, const std::list& theBooleanObjects); + /// Constructor with values. + FEATURESAPI_EXPORT + explicit FeaturesAPI_ExtrusionCut(const std::shared_ptr& theFeature, + const std::list& theBaseObjects, + const ModelHighAPI_Selection& theDirection, + const std::list& theBooleanObjects); + /// Constructor with values. FEATURESAPI_EXPORT explicit FeaturesAPI_ExtrusionCut(const std::shared_ptr& theFeature, @@ -144,6 +200,13 @@ public: /// Pointer on ExtrusionCut object. typedef std::shared_ptr ExtrusionCutPtr; +/// \ingroup CPPHighAPI +/// \brief Create ExtrusionCut feature. +FEATURESAPI_EXPORT +ExtrusionCutPtr addExtrusionCut(const std::shared_ptr& thePart, + const std::list& theBaseObjects, + const std::list& theBooleanObjects); + /// \ingroup CPPHighAPI /// \brief Create ExtrusionCut feature. FEATURESAPI_EXPORT @@ -152,6 +215,14 @@ ExtrusionCutPtr addExtrusionCut(const std::shared_ptr& thePar const ModelHighAPI_Double& theSize, const std::list& theBooleanObjects); +/// \ingroup CPPHighAPI +/// \brief Create ExtrusionCut feature. +FEATURESAPI_EXPORT +ExtrusionCutPtr addExtrusionCut(const std::shared_ptr& thePart, + const std::list& theBaseObjects, + const ModelHighAPI_Selection& theDirection, + const std::list& theBooleanObjects); + /// \ingroup CPPHighAPI /// \brief Create ExtrusionCut feature. FEATURESAPI_EXPORT @@ -203,18 +274,25 @@ ExtrusionCutPtr addExtrusionCut(const std::shared_ptr& thePar const ModelHighAPI_Double& theFromOffset, const std::list& theBooleanObjects); +/// \class FeaturesAPI_ExtrusionFuse +/// \ingroup CPPHighAPI +/// \brief Interface for ExtrusionFuse feature. class FeaturesAPI_ExtrusionFuse: public FeaturesAPI_ExtrusionBoolean { public: - FEATURESAPI_EXPORT - virtual std::string getID() { - return FeaturesPlugin_ExtrusionFuse::ID(); - } + static std::string ID() { return FeaturesPlugin_ExtrusionFuse::ID(); } + virtual std::string getID() { return ID(); } /// Constructor without values. FEATURESAPI_EXPORT explicit FeaturesAPI_ExtrusionFuse(const std::shared_ptr& theFeature); + /// Constructor with values. + FEATURESAPI_EXPORT + explicit FeaturesAPI_ExtrusionFuse(const std::shared_ptr& theFeature, + const std::list& theBaseObjects, + const std::list& theBooleanObjects); + /// Constructor with values. FEATURESAPI_EXPORT explicit FeaturesAPI_ExtrusionFuse(const std::shared_ptr& theFeature, @@ -222,6 +300,13 @@ public: const ModelHighAPI_Double& theSize, const std::list& theBooleanObjects); + /// Constructor with values. + FEATURESAPI_EXPORT + explicit FeaturesAPI_ExtrusionFuse(const std::shared_ptr& theFeature, + const std::list& theBaseObjects, + const ModelHighAPI_Selection& theDirection, + const std::list& theBooleanObjects); + /// Constructor with values. FEATURESAPI_EXPORT explicit FeaturesAPI_ExtrusionFuse(const std::shared_ptr& theFeature, @@ -272,6 +357,13 @@ public: /// Pointer on ExtrusionFuse object. typedef std::shared_ptr ExtrusionFusePtr; +/// \ingroup CPPHighAPI +/// \brief Create ExtrusionFuse feature. +FEATURESAPI_EXPORT +ExtrusionFusePtr addExtrusionFuse(const std::shared_ptr& thePart, + const std::list& theBaseObjects, + const std::list& theBooleanObjects); + /// \ingroup CPPHighAPI /// \brief Create ExtrusionFuse feature. FEATURESAPI_EXPORT @@ -280,6 +372,14 @@ ExtrusionFusePtr addExtrusionFuse(const std::shared_ptr& theP const ModelHighAPI_Double& theSize, const std::list& theBooleanObjects); +/// \ingroup CPPHighAPI +/// \brief Create ExtrusionFuse feature. +FEATURESAPI_EXPORT +ExtrusionFusePtr addExtrusionFuse(const std::shared_ptr& thePart, + const std::list& theBaseObjects, + const ModelHighAPI_Selection& theDirection, + const std::list& theBooleanObjects); + /// \ingroup CPPHighAPI /// \brief Create ExtrusionFuse feature. FEATURESAPI_EXPORT