X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FSketchPlugin%2FSketchPlugin_Sketch.h;h=920ec399bb4e5a961c481511ef34fa540adafc07;hb=e2c1d6fb594fe1234fa7a0786801d8c1c92d7ac6;hp=51ac70496b266da567e9d7b086728f5ed0f03da7;hpb=72cb66f9c09b0f8fa224f6f8ab43548658015b49;p=modules%2Fshaper.git diff --git a/src/SketchPlugin/SketchPlugin_Sketch.h b/src/SketchPlugin/SketchPlugin_Sketch.h index 51ac70496..920ec399b 100644 --- a/src/SketchPlugin/SketchPlugin_Sketch.h +++ b/src/SketchPlugin/SketchPlugin_Sketch.h @@ -12,16 +12,15 @@ #include #include #include +#include +#include +#include +#include #include -/// the plane edge color -#define SKETCH_PLANE_COLOR "#700000" - -/// the plane edge width -#define SKETCH_WIDTH "4" - -/// face of the square-face displayed for selection of general plane -#define PLANE_SIZE "200" +#define YZ_PLANE_COLOR "#ff0000" +#define XZ_PLANE_COLOR "#00ff00" +#define XY_PLANE_COLOR "#0000ff" /**\class SketchPlugin_Sketch * \ingroup Plugins @@ -48,12 +47,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() { @@ -86,7 +79,6 @@ 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 @@ -94,10 +86,39 @@ class SketchPlugin_Sketch : public ModelAPI_CompositeFeature//, public GeomAPI_I { return 0; } - ; /// Converts a 2D sketch space point into point in 3D space - SKETCHPLUGIN_EXPORT std::shared_ptr to3D(const double theX, const double theY); + /// \param theX an X coordinate + /// \param theY an Y coordinate + std::shared_ptr to3D(const double theX, const double theY) 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()))); + + 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); + } /// Returns true if this feature must be displayed in the history (top level of Part tree) SKETCHPLUGIN_EXPORT virtual bool isInHistory() @@ -109,15 +130,53 @@ 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())); + + 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(); + /// 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; @@ -134,14 +193,14 @@ 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(); + + /// \brief Create a result for the point in the attribute if the attribute is initialized + /// \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); }; #endif