X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchPlugin%2FSketchPlugin_Sketch.h;h=6feda008dd89d3a607d48306566c0f362184592f;hb=dc6ab7150ec816d25d7be4959407b6622b019e88;hp=3246a2ad728721f27e3024645f43dc7ee9095cdd;hpb=5a3b32ce1c1c302bce9a4372cb6eee1965da3e09;p=modules%2Fshaper.git diff --git a/src/SketchPlugin/SketchPlugin_Sketch.h b/src/SketchPlugin/SketchPlugin_Sketch.h index 3246a2ad7..6feda008d 100644 --- a/src/SketchPlugin/SketchPlugin_Sketch.h +++ b/src/SketchPlugin/SketchPlugin_Sketch.h @@ -1,8 +1,21 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D --> - -// File: SketchPlugin_Sketch.h -// Created: 27 Mar 2014 -// Author: Mikhail PONIKAROV +// 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 +// #ifndef SketchPlugin_Sketch_H_ #define SketchPlugin_Sketch_H_ @@ -20,15 +33,17 @@ #include #include -#define YZ_PLANE_COLOR "225,0,0" -#define XZ_PLANE_COLOR "0,225,0" -#define XY_PLANE_COLOR "0,0,225" +#ifdef SET_PLANES_COLOR_IN_PREFERENCES + #define YZ_PLANE_COLOR "225,0,0" + #define XZ_PLANE_COLOR "0,225,0" + #define XY_PLANE_COLOR "0,0,225" +#endif /**\class SketchPlugin_Sketch * \ingroup Plugins * \brief Feature for creation of the new part in PartSet. */ -class SketchPlugin_Sketch : public ModelAPI_CompositeFeature, public GeomAPI_ICustomPrs//, public GeomAPI_IPresentable +class SketchPlugin_Sketch : public ModelAPI_CompositeFeature//, public GeomAPI_ICustomPrs { public: /// Sketch feature kind @@ -68,6 +83,20 @@ class SketchPlugin_Sketch : public ModelAPI_CompositeFeature, public GeomAPI_ICu return MY_SOLVER_ERROR; } + /// Sketch solver error + inline static const std::string& SOLVER_DOF() + { + static const std::string MY_SOLVER_DOF("SolverDOF"); + 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() { @@ -81,13 +110,6 @@ class SketchPlugin_Sketch : public ModelAPI_CompositeFeature, public GeomAPI_ICu /// Request for initialization of data model of the feature: adding all attributes SKETCHPLUGIN_EXPORT virtual void initAttributes(); - /// Moves the feature - /// \param theDeltaX the delta for X coordinate is moved - /// \param theDeltaY the delta for Y coordinate is moved - SKETCHPLUGIN_EXPORT virtual void move(const double theDeltaX, const double theDeltaY) - { - } - /// Converts a 2D sketch space point into point in 3D space /// \param theX an X coordinate /// \param theY an Y coordinate @@ -106,7 +128,7 @@ class SketchPlugin_Sketch : public ModelAPI_CompositeFeature, public GeomAPI_ICu return std::shared_ptr(new GeomAPI_Pnt(aSum)); } - + /// Returns the point projected into the sketch plane /// \param thePnt a source 3d point std::shared_ptr to2D(const std::shared_ptr& thePnt) const @@ -155,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())); } @@ -169,9 +195,6 @@ class SketchPlugin_Sketch : public ModelAPI_CompositeFeature, public GeomAPI_ICu } - /// removes also all sub-sketch elements - SKETCHPLUGIN_EXPORT virtual void erase(); - /// appends a feature to the sketch sub-elements container SKETCHPLUGIN_EXPORT virtual std::shared_ptr addFeature(std::string theID); @@ -182,7 +205,7 @@ class SketchPlugin_Sketch : public ModelAPI_CompositeFeature, public GeomAPI_ICu SKETCHPLUGIN_EXPORT virtual int numberOfSubs(bool forTree = false) const; /// Returns the sub-feature by zero-base index - SKETCHPLUGIN_EXPORT virtual std::shared_ptr + SKETCHPLUGIN_EXPORT virtual std::shared_ptr subFeature(const int theIndex, bool forTree = false); /// Returns the sub-feature unique identifier in this composite feature by index @@ -191,43 +214,72 @@ 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); + /// 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 + /// \param theSketch a sketch intance /// \param theAttributeID an attribute string /// \param theIndex an index of the result static void createPoint2DResult(ModelAPI_Feature* theFeature, 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 + /// \param theSketch a sketch intance + /// \param theIsCopy if true sets feature copy attribute to true. /// \return a created feature - static FeaturePtr addUniqueNamedCopiedFeature(FeaturePtr aFeature, - SketchPlugin_Sketch* theSketch); + static FeaturePtr addUniqueNamedCopiedFeature(FeaturePtr theFeature, + SketchPlugin_Sketch* theSketch, + const bool theIsCopy = false); /// Creates a plane of the sketch. /// \param theSketch a sketch intance 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