X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchPlugin%2FSketchPlugin_Sketch.h;h=2666bb80785685954ac21d29142f1de7197b51b8;hb=1c292b5bf95e18a6c8fbe407c532213e10c673c5;hp=a65fbb197acfc781006b9a927c2d1db539104c8f;hpb=f1cd93fd02a54259f72e3191d037323a496b2bef;p=modules%2Fshaper.git diff --git a/src/SketchPlugin/SketchPlugin_Sketch.h b/src/SketchPlugin/SketchPlugin_Sketch.h index a65fbb197..2666bb807 100644 --- a/src/SketchPlugin/SketchPlugin_Sketch.h +++ b/src/SketchPlugin/SketchPlugin_Sketch.h @@ -12,22 +12,23 @@ #include #include #include -#include - -/// the plane edge color -#define SKETCH_PLANE_COLOR "#700000" +#include -/// the plane edge width -#define SKETCH_WIDTH "4" +#include +#include +#include +#include +#include -/// face of the square-face displayed for selection of general plane -#define PLANE_SIZE "200" +#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 DataModel + * \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: /// Sketch feature kind @@ -48,12 +49,6 @@ class SketchPlugin_Sketch : public ModelAPI_CompositeFeature//, public GeomAPI_I static const std::string MY_DIRX_ID("DirX"); return MY_DIRX_ID; } - /// Vector Y inside of the sketch plane - inline static const std::string& DIRY_ID() - { - static const std::string MY_DIRY_ID("DirY"); - return MY_DIRY_ID; - } /// Vector Z, normal to the sketch plane inline static const std::string& NORM_ID() { @@ -66,6 +61,19 @@ 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; + } + + /// 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() @@ -86,18 +94,39 @@ class SketchPlugin_Sketch : public ModelAPI_CompositeFeature//, public GeomAPI_I 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) + /// 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)); } - ; - /// Converts a 2D sketch space point into point in 3D space - SKETCHPLUGIN_EXPORT std::shared_ptr to3D(const double theX, const double theY); + /// 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); + } /// Returns true if this feature must be displayed in the history (top level of Part tree) SKETCHPLUGIN_EXPORT virtual bool isInHistory() @@ -109,23 +138,58 @@ 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())); - //virtual AISObjectPtr getAISObject(AISObjectPtr thePrevious); + if (!anOrigin || !aNorm) + return std::shared_ptr(); - /// removes also all sub-sketch elements - SKETCHPLUGIN_EXPORT virtual void erase(); + 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); + } + + + /// appends a feature to the sketch sub-elements container SKETCHPLUGIN_EXPORT virtual std::shared_ptr addFeature(std::string theID); + /// Just to synchronise the container of sub-features + 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 @@ -134,22 +198,50 @@ 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: - /// Creates a plane and append it to the list - /// \param theX the X normal value - /// \param theY the Y normal value - /// \param theZ the Z normal value - /// \param theShapes the list of result shapes - //void addPlane(double theX, double theY, double theZ, - // std::list >& theShapes) const; - /// 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 + /// \param theIsCopy if true sets feature copy attribute to true. + /// \return a created feature + 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; + } + }; #endif