X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchPlugin%2FSketchPlugin_Sketch.h;h=75a451ace5b5a79a16165354d1d1acbf61c2ac90;hb=ca4fd4963bc25eab9382b9c8b9f5494c1acc8dac;hp=3e7328e77cc15623cdfb930d5964e25228331bf6;hpb=893048d62e837075ea3253c89ce9ecdfbb7a0cf3;p=modules%2Fshaper.git diff --git a/src/SketchPlugin/SketchPlugin_Sketch.h b/src/SketchPlugin/SketchPlugin_Sketch.h index 3e7328e77..75a451ace 100644 --- a/src/SketchPlugin/SketchPlugin_Sketch.h +++ b/src/SketchPlugin/SketchPlugin_Sketch.h @@ -1,4 +1,4 @@ -// 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 @@ -12,10 +12,9 @@ // // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef SketchPlugin_Sketch_H_ @@ -44,7 +43,7 @@ * \ingroup Plugins * \brief Feature for creation of the new part in PartSet. */ -class SketchPlugin_Sketch : public ModelAPI_CompositeFeature, public GeomAPI_ICustomPrs +class SketchPlugin_Sketch : public ModelAPI_CompositeFeature//, public GeomAPI_ICustomPrs { public: /// Sketch feature kind @@ -91,6 +90,13 @@ class SketchPlugin_Sketch : public ModelAPI_CompositeFeature, public GeomAPI_ICu return MY_SOLVER_DOF; } + /// Action ID to remove links to external entities while changing the sketch plane. + inline static const std::string& ACTION_REMOVE_EXTERNAL() + { + static const std::string MY_ACTION_REMOVE_EXTERNAL("RemoveExternalLinks"); + return MY_ACTION_REMOVE_EXTERNAL; + } + /// Returns the kind of a feature SKETCHPLUGIN_EXPORT virtual const std::string& getKind() { @@ -154,10 +160,10 @@ class SketchPlugin_Sketch : public ModelAPI_CompositeFeature, public GeomAPI_ICu std::shared_ptr aNorm = std::dynamic_pointer_cast( data()->attribute(NORM_ID())); - if (!anOrigin || !aNorm) - return std::shared_ptr(); + if (anOrigin.get() && aNorm.get() && anOrigin->isInitialized() && aNorm->isInitialized()) + return std::shared_ptr(new GeomAPI_Pln(anOrigin->pnt(), aNorm->dir())); - return std::shared_ptr(new GeomAPI_Pln(anOrigin->pnt(), aNorm->dir())); + return std::shared_ptr(); } /// Returns currently defined plane as an object of Ax3 @@ -171,6 +177,10 @@ class SketchPlugin_Sketch : public ModelAPI_CompositeFeature, public GeomAPI_ICu std::shared_ptr aNorm = std::dynamic_pointer_cast( aData->attribute(NORM_ID())); + if (!aNorm->isInitialized() || !aX->isInitialized() || + aNorm->dir()->cross(aX->dir())->squareModulus() < 1.e-14) + return std::shared_ptr(); + return std::shared_ptr(new GeomAPI_Ax3(aC->pnt(), aX->dir(), aNorm->dir())); } @@ -204,15 +214,12 @@ class SketchPlugin_Sketch : public ModelAPI_CompositeFeature, public GeomAPI_ICu /// Returns true if feature or reuslt belong to this composite feature as subs SKETCHPLUGIN_EXPORT virtual bool isSub(ObjectPtr theObject) const; - /// Construction result is allways recomuted on the fly - SKETCHPLUGIN_EXPORT virtual bool isPersistentResult() {return false;} - SKETCHPLUGIN_EXPORT virtual void attributeChanged(const std::string& theID); - /// Exchanges IDs of two given features: needed for fillet feature better naming (issue 769) - SKETCHPLUGIN_EXPORT virtual void exchangeIDs(std::shared_ptr theFeature1, - std::shared_ptr theFeature2); - + /// Performs some custom feature specific functionality (normally called by some GUI button) + /// \param theActionId an action key + /// \return a boolean value about it is performed + SKETCHPLUGIN_EXPORT virtual bool customAction(const std::string& theActionId); /// \brief Create a result for the point in the attribute if the attribute is initialized /// \param theFeature a source feature @@ -223,6 +230,18 @@ class SketchPlugin_Sketch : public ModelAPI_CompositeFeature, public GeomAPI_ICu SketchPlugin_Sketch* theSketch, const std::string& theAttributeID, const int theIndex); + /// \brief Create a result for the segment given by a pair of attributes + /// \param theFeature a source feature + /// \param theSketch a sketch intance + /// \param theStartAttrID an attribute string + /// \param theEndAttrID an attribute string + /// \param theIndex an index of the result + static void createLine2DResult(ModelAPI_Feature* theFeature, + SketchPlugin_Sketch* theSketch, + const std::string& theStartAttrID, + const std::string& theEndAttrID, + const int theIndex = 0); + /// Add new feature and fill the data of the feature by the data of the parameter feature. /// The name of the created feature stays unique. /// \param theFeature a source feature @@ -238,19 +257,29 @@ class SketchPlugin_Sketch : public ModelAPI_CompositeFeature, public GeomAPI_ICu static std::shared_ptr plane(SketchPlugin_Sketch* theSketch); /// Customize presentation of the feature - virtual bool customisePresentation(ResultPtr theResult, AISObjectPtr thePrs, - std::shared_ptr theDefaultPrs) - { - bool isCustomized = false; - // apply the color of the result to the presentation - if (theDefaultPrs.get()) - isCustomized = theDefaultPrs->customisePresentation(theResult, thePrs, theDefaultPrs); - // set the sketch presentation bold - isCustomized = thePrs->setWidth(2) || isCustomized; - - return isCustomized; - } - + //virtual bool customisePresentation(ResultPtr theResult, AISObjectPtr thePrs, + // std::shared_ptr theDefaultPrs) + //{ + // bool isCustomized = false; + // // apply the color of the result to the presentation + // if (theDefaultPrs.get()) + // isCustomized = theDefaultPrs->customisePresentation(theResult, thePrs, theDefaultPrs); + // // set the sketch presentation bold + // isCustomized = thePrs->setWidth(2) || isCustomized; + + // return isCustomized; + //} + +private: + /// Substitute all links to external objects by newly created features. + /// \return \c true, if all links updated. + bool removeLinksToExternal(); + + /// Update projected coordinate axes + void updateCoordinateAxis(ObjectPtr theSub, std::shared_ptr thePlane); + +private: + std::shared_ptr myPlane; }; #endif