X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FSketchPlugin%2FSketchPlugin_Sketch.h;h=8a1788c5c0a18d863f38dacfff28e08f482f86d2;hb=df51e63f5d87b0c8fa46f5cda0c7c92aad5da888;hp=0c88f0d8f097c59f2dff814f9344ac942f343de9;hpb=7b9e257dacdb4564754c3bcd0c35817e73a3989c;p=modules%2Fshaper.git diff --git a/src/SketchPlugin/SketchPlugin_Sketch.h b/src/SketchPlugin/SketchPlugin_Sketch.h index 0c88f0d8f..8a1788c5c 100644 --- a/src/SketchPlugin/SketchPlugin_Sketch.h +++ b/src/SketchPlugin/SketchPlugin_Sketch.h @@ -12,18 +12,23 @@ #include #include #include +#include + #include +#include +#include +#include #include -#define YZ_PLANE_COLOR "#ff0000" -#define XZ_PLANE_COLOR "#00ff00" -#define XY_PLANE_COLOR "#0000ff" +#define YZ_PLANE_COLOR "225,0,0" +#define XZ_PLANE_COLOR "0,225,0" +#define XY_PLANE_COLOR "0,0,225" /**\class SketchPlugin_Sketch * \ingroup Plugins * \brief Feature for creation of the new part in PartSet. */ -class SketchPlugin_Sketch : public ModelAPI_CompositeFeature//, public GeomAPI_IPresentable +class SketchPlugin_Sketch : public ModelAPI_CompositeFeature, public GeomAPI_ICustomPrs//, public GeomAPI_IPresentable { public: /// Sketch feature kind @@ -56,6 +61,12 @@ class SketchPlugin_Sketch : public ModelAPI_CompositeFeature//, public GeomAPI_I 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; + } /// Returns the kind of a feature SKETCHPLUGIN_EXPORT virtual const std::string& getKind() @@ -77,15 +88,38 @@ class SketchPlugin_Sketch : public ModelAPI_CompositeFeature//, public GeomAPI_I { } - /// Return the distance between the feature and the point - /// \param thePoint the point - virtual double distanceToPoint(const std::shared_ptr& thePoint) + /// Converts a 2D sketch space point into point in 3D space + /// \param theX an X coordinate + /// \param theY an Y coordinate + std::shared_ptr to3D(const double theX, const double theY) const { - return 0; + std::shared_ptr aC = std::dynamic_pointer_cast( + data()->attribute(ORIGIN_ID())); + std::shared_ptr aNorm = std::dynamic_pointer_cast( + data()->attribute(NORM_ID())); + std::shared_ptr aX = std::dynamic_pointer_cast( + data()->attribute(DIRX_ID())); + std::shared_ptr aY(new GeomAPI_Dir(aNorm->dir()->cross(aX->dir()))); + + std::shared_ptr aSum = aC->pnt()->xyz()->added(aX->dir()->xyz()->multiplied(theX)) + ->added(aY->xyz()->multiplied(theY)); + + 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 + { + std::shared_ptr aC = std::dynamic_pointer_cast( + data()->attribute(ORIGIN_ID())); + std::shared_ptr aNorm = std::dynamic_pointer_cast( + data()->attribute(NORM_ID())); + std::shared_ptr aX = std::dynamic_pointer_cast( + data()->attribute(DIRX_ID())); + std::shared_ptr aY(new GeomAPI_Dir(aNorm->dir()->cross(aX->dir()))); + return thePnt->to2D(aC->pnt(), aX->dir(), aY); } - - /// Converts a 2D sketch space point into point in 3D space - SKETCHPLUGIN_EXPORT std::shared_ptr to3D(const double theX, const double theY); /// Returns true if this feature must be displayed in the history (top level of Part tree) SKETCHPLUGIN_EXPORT virtual bool isInHistory() @@ -97,11 +131,43 @@ class SketchPlugin_Sketch : public ModelAPI_CompositeFeature//, public GeomAPI_I SketchPlugin_Sketch(); /// Returns the basis plane for the sketch - std::shared_ptr plane(); + std::shared_ptr plane() const + { + std::shared_ptr anOrigin = std::dynamic_pointer_cast( + data()->attribute(ORIGIN_ID())); + std::shared_ptr aNorm = std::dynamic_pointer_cast( + data()->attribute(NORM_ID())); - SKETCHPLUGIN_EXPORT std::shared_ptr coordinatePlane() const; + if (!anOrigin || !aNorm) + return std::shared_ptr(); + + return std::shared_ptr(new GeomAPI_Pln(anOrigin->pnt(), aNorm->dir())); + } + + /// Returns currently defined plane as an object of Ax3 + std::shared_ptr coordinatePlane() const + { + DataPtr aData = data(); + std::shared_ptr aC = std::dynamic_pointer_cast( + aData->attribute(ORIGIN_ID())); + std::shared_ptr aX = std::dynamic_pointer_cast( + aData->attribute(DIRX_ID())); + std::shared_ptr aNorm = std::dynamic_pointer_cast( + aData->attribute(NORM_ID())); + + return std::shared_ptr(new GeomAPI_Ax3(aC->pnt(), aX->dir(), aNorm->dir())); + } + + /// Checks whether the plane is set in the sketch. + /// \returns the boolean state + bool isPlaneSet() const + { + std::shared_ptr aNormal = std::dynamic_pointer_cast( + data()->attribute(NORM_ID())); + + return aNormal && !(aNormal->x() == 0 && aNormal->y() == 0 && aNormal->z() == 0); + } - //virtual AISObjectPtr getAISObject(AISObjectPtr thePrevious); /// removes also all sub-sketch elements SKETCHPLUGIN_EXPORT virtual void erase(); @@ -113,13 +179,13 @@ class SketchPlugin_Sketch : public ModelAPI_CompositeFeature//, public GeomAPI_I 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; + 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 @@ -128,14 +194,48 @@ class SketchPlugin_Sketch : public ModelAPI_CompositeFeature//, public GeomAPI_I /// Construction result is allways recomuted on the fly SKETCHPLUGIN_EXPORT virtual bool isPersistentResult() {return false;} - /// Returns the point projected into the sketch plane - std::shared_ptr to2D(const std::shared_ptr& thePnt); - SKETCHPLUGIN_EXPORT virtual void attributeChanged(const std::string& theID); -protected: - /// Checks whether the plane is set in the sketch. - /// \returns the boolean state - bool isPlaneSet(); + + /// 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 + /// \return a created feature + static FeaturePtr addUniqueNamedCopiedFeature(FeaturePtr theFeature, + SketchPlugin_Sketch* theSketch); + + /// 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; + } + }; #endif