X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FSketchPlugin%2FSketchPlugin_Arc.h;h=7b2e294724e1371b16e8062078336886a4f95795;hb=dfaa54ec6f09d6849c3e767d2d43e1a00935075b;hp=efc90f529ca5ea7373e8d65e1dd1e345dab41ce1;hpb=1799ecc7033cf0c4716e9ac3f90d5a313962fa8f;p=modules%2Fshaper.git

diff --git a/src/SketchPlugin/SketchPlugin_Arc.h b/src/SketchPlugin/SketchPlugin_Arc.h
index efc90f529..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 <SketchPlugin_SketchEntity.h>
-#include <SketchPlugin_Sketch.h>
-#include <GeomAPI_IPresentable.h>
+
+#include "SketchPlugin_SketchEntity.h"
+
+
 
 /**\class SketchPlugin_Arc
  * \ingroup Plugins
@@ -19,42 +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;
   }
 
   /// 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;
+    static const std::string ID = "center_point";
+    return ID;
   }
+
   /// Start 2D point of the arc
   inline static const std::string& START_ID()
   {
-    static const std::string MY_START_ID = "ArcStartPoint";
-    return MY_START_ID;
+    static const std::string ID = "start_point";
+    return ID;
   }
+
   /// End 2D point of the arc
   inline static const std::string& END_ID()
   {
-    static const std::string MY_END_ID = "ArcEndPoint";
-    return MY_END_ID;
+    static const std::string ID = "end_point";
+    return ID;
+  }
+
+  /// Arc radius.
+  static const std::string& RADIUS_ID()
+  {
+    static const std::string ID("radius");
+    return ID;
+  }
+
+  /// Arc angle.
+  static const std::string& ANGLE_ID()
+  {
+    static const std::string ID("angle");
+    return ID;
+  }
+
+  /// Reversed flag
+  inline static const std::string& REVERSED_ID()
+  {
+    static const std::string ID("reversed");
+    return ID;
   }
 
   /// Returns the kind of a feature
@@ -67,30 +82,35 @@ 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();
-
-  /// Request for initialization of data model of the feature: adding all attributes
-  SKETCHPLUGIN_EXPORT virtual void initAttributes();
-
   /// 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
   /// \param theDeltaY the delta for Y coordinate is moved
   SKETCHPLUGIN_EXPORT virtual void move(const double theDeltaX, const double theDeltaY);
 
+  /// 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();
+
   /// Use plugin manager for features creation
   SketchPlugin_Arc();
 
+protected:
+  /// \brief Initializes attributes of derived class.
+  virtual void initDerivedClassAttributes();
+
 private:
-  /// Returns true if all obligatory attributes are initialized
-  bool isFeatureValid();
+  /// to define in which direction draw arc
+  double myParamBefore;
 };
 
 #endif