X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchPlugin%2FSketchPlugin_Sketch.h;h=57dde7c5c8367abd5ab2bfc5c4863118b807287f;hb=15fc1914159f4671968f56eb32d878a022edcd8b;hp=d4117c093c8e03a853ab66833170f2d35d78fc5d;hpb=705438fb7ab16ba1608b6b1aeddd546d6311cb77;p=modules%2Fshaper.git diff --git a/src/SketchPlugin/SketchPlugin_Sketch.h b/src/SketchPlugin/SketchPlugin_Sketch.h index d4117c093..57dde7c5c 100644 --- a/src/SketchPlugin/SketchPlugin_Sketch.h +++ b/src/SketchPlugin/SketchPlugin_Sketch.h @@ -1,8 +1,22 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D --> - -// File: SketchPlugin_Sketch.h -// Created: 27 Mar 2014 -// Author: Mikhail PONIKAROV +// Copyright (C) 2014-2017 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 +34,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 @@ -61,6 +77,19 @@ class SketchPlugin_Sketch : public ModelAPI_CompositeFeature, public GeomAPI_ICu static const std::string MY_FEATURES_ID("Features"); return MY_FEATURES_ID; } + /// Sketch solver error + inline static const std::string& SOLVER_ERROR() + { + static const std::string MY_SOLVER_ERROR("SolverError"); + 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; + } /// Returns the kind of a feature SKETCHPLUGIN_EXPORT virtual const std::string& getKind() @@ -75,20 +104,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) - { - } - - /// Return the distance between the feature and the point - /// \param thePoint the point - virtual double distanceToPoint(const std::shared_ptr& thePoint) - { - return 0; - } - /// Converts a 2D sketch space point into point in 3D space /// \param theX an X coordinate /// \param theY an Y coordinate @@ -107,7 +122,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 @@ -170,9 +185,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); @@ -180,36 +192,43 @@ class SketchPlugin_Sketch : public ModelAPI_CompositeFeature, public GeomAPI_ICu virtual void removeFeature(std::shared_ptr theFeature); /// Returns the number of sub-elements - SKETCHPLUGIN_EXPORT virtual int numberOfSubs() const; + SKETCHPLUGIN_EXPORT virtual int numberOfSubs(bool forTree = false) const; /// Returns the sub-feature by zero-base index - SKETCHPLUGIN_EXPORT virtual std::shared_ptr - subFeature(const int theIndex) const; + SKETCHPLUGIN_EXPORT virtual std::shared_ptr + subFeature(const int theIndex, bool forTree = false); - /// Returns the sub-feature unique identifier in this composite feature by zero-base index + /// Returns the sub-feature unique identifier in this composite feature by index SKETCHPLUGIN_EXPORT virtual int subFeatureId(const int theIndex) const; /// 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); + + /// \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); - + /// 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 @@ -223,9 +242,9 @@ class SketchPlugin_Sketch : public ModelAPI_CompositeFeature, public GeomAPI_ICu // apply the color of the result to the presentation if (theDefaultPrs.get()) isCustomized = theDefaultPrs->customisePresentation(theResult, thePrs, theDefaultPrs); - // set the sketch presentation bold + // set the sketch presentation bold isCustomized = thePrs->setWidth(2) || isCustomized; - + return isCustomized; }