X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchPlugin%2FSketchPlugin_Arc.h;h=7b2e294724e1371b16e8062078336886a4f95795;hb=b5893b0a30fac08134c24de4565cb513a43affa6;hp=0fd638d933bdf881fa5ac5ca9fd45c07802a070f;hpb=84b36b8deb02c2661b3d09299560266388329d01;p=modules%2Fshaper.git diff --git a/src/SketchPlugin/SketchPlugin_Arc.h b/src/SketchPlugin/SketchPlugin_Arc.h index 0fd638d93..7b2e29472 100644 --- a/src/SketchPlugin/SketchPlugin_Arc.h +++ b/src/SketchPlugin/SketchPlugin_Arc.h @@ -8,9 +8,10 @@ #define SketchPlugin_Arc_H_ #include "SketchPlugin.h" -#include -#include -#include + +#include "SketchPlugin_SketchEntity.h" + + /**\class SketchPlugin_Arc * \ingroup Plugins @@ -19,67 +20,56 @@ * calculated when there is non-initialized attributes of the arc. The second is a result and * it is calculated if all attributes are initialized. */ -class SketchPlugin_Arc : public SketchPlugin_SketchEntity, public GeomAPI_IPresentable +class SketchPlugin_Arc: public SketchPlugin_SketchEntity { - /// to avoid cyclic dependencies in automatic updates: they mean that - /// update is performed right now and automatic updates are not needed - bool myStartUpdate, myEndUpdate; - /// to avoid (if possible) additional modification of changed coordinate (issue #855) - double myXEndBefore, myYEndBefore; - - /// to define in which direction draw arc - double myParamBefore; - public: /// Arc feature kind inline static const std::string& ID() { - static const std::string MY_SKETCH_ARC_ID("SketchArc"); - return MY_SKETCH_ARC_ID; + static const std::string ID("SketchArc"); + return ID; } - inline static const std::string& ARC_TYPE() + /// Central 2D point of the circle which contains the arc + inline static const std::string& CENTER_ID() { - static const std::string TYPE("ArcType"); - return TYPE; + static const std::string ID = "center_point"; + return ID; } - inline static const std::string& ARC_TYPE_TANGENT() + /// Start 2D point of the arc + inline static const std::string& START_ID() { - static const std::string TYPE("Tangent"); - return TYPE; + static const std::string ID = "start_point"; + return ID; } - static const std::string& TANGENT_POINT_ID() + /// End 2D point of the arc + inline static const std::string& END_ID() { - static const std::string TANGENT_PNT("ArcTangentPoint"); - return TANGENT_PNT; + static const std::string ID = "end_point"; + return ID; } - /// Central 2D point of the circle which contains the arc - inline static const std::string& CENTER_ID() - { - static const std::string MY_CENTER_ID = "ArcCenter"; - return MY_CENTER_ID; - } - /// Start 2D point of the arc - inline static const std::string& START_ID() + /// Arc radius. + static const std::string& RADIUS_ID() { - static const std::string MY_START_ID = "ArcStartPoint"; - return MY_START_ID; + static const std::string ID("radius"); + return ID; } - /// End 2D point of the arc - inline static const std::string& END_ID() + + /// Arc angle. + static const std::string& ANGLE_ID() { - static const std::string MY_END_ID = "ArcEndPoint"; - return MY_END_ID; + static const std::string ID("angle"); + return ID; } - /// Inversed flag - inline static const std::string& INVERSED_ID() + /// Reversed flag + inline static const std::string& REVERSED_ID() { - static const std::string MY_INVERSED_ID("InversedArc"); - return MY_INVERSED_ID; + static const std::string ID("reversed"); + return ID; } /// Returns the kind of a feature @@ -92,15 +82,12 @@ class SketchPlugin_Arc : public SketchPlugin_SketchEntity, public GeomAPI_IPrese /// Returns true is sketch element is under the rigid constraint SKETCHPLUGIN_EXPORT virtual bool isFixed(); - /// Creates an arc-shape - SKETCHPLUGIN_EXPORT virtual void execute(); - /// Called on change of any argument-attribute of this object /// \param theID identifier of changed attribute SKETCHPLUGIN_EXPORT virtual void attributeChanged(const std::string& theID); - /// Returns the AIS preview - virtual AISObjectPtr getAISObject(AISObjectPtr thePrevious); + /// Creates an arc-shape + SKETCHPLUGIN_EXPORT virtual void execute(); /// Moves the feature /// \param theDeltaX the delta for X coordinate is moved @@ -110,6 +97,7 @@ class SketchPlugin_Arc : public SketchPlugin_SketchEntity, public GeomAPI_IPrese /// Updates the "reversed" flag /// \param isReversed whether the arc will be reversed void setReversed(bool isReversed); + /// Returns \c true is the arc is reversed bool isReversed(); @@ -121,12 +109,8 @@ protected: virtual void initDerivedClassAttributes(); private: - /// Returns true if all obligatory attributes are initialized - bool isFeatureValid(); - - /// Compose constraints to build tangency arc - void tangencyArcConstraints(); - + /// to define in which direction draw arc + double myParamBefore; }; #endif