Merge branch 'master' into cgt/devCEA

[modules/shaper.git] / src / SketchPlugin / SketchPlugin_Arc.h

diff --git a/src/SketchPlugin/SketchPlugin_Arc.h b/src/SketchPlugin/SketchPlugin_Arc.h
index 0464ebeadb30d60da9aa89f6937af6657f29508c..1a5a5fc5ec54bca456733d12d347c40660547f45 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_Arc.h
+++ b/src/SketchPlugin/SketchPlugin_Arc.h
@@ -21,7 +21,7 @@
  */
 class SketchPlugin_Arc : public SketchPlugin_SketchEntity, public GeomAPI_IPresentable
 {
-  /// to avoid cyclic dependencies in automatic updates: they mean that 
+  /// 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)
@@ -38,12 +38,48 @@ class SketchPlugin_Arc : public SketchPlugin_SketchEntity, public GeomAPI_IPrese
     return MY_SKETCH_ARC_ID;
   }
 
+  inline static const std::string& ARC_TYPE()
+  {
+    static const std::string TYPE("ArcType");
+    return TYPE;
+  }
+
+  inline static const std::string& ARC_TYPE_TANGENT()
+  {
+    static const std::string TYPE("Tangent");
+    return TYPE;
+  }
+
+  static const std::string& ARC_TYPE_CENTER_START_END()
+  {
+    static const std::string TYPE("CenterStartEnd");
+    return TYPE;
+  }
+  static const std::string& ARC_TYPE_THREE_POINTS()
+  {
+    static const std::string TYPE("ThreePoints");
+    return TYPE;
+  }
+
+  static const std::string& TANGENT_POINT_ID()
+  {
+    static const std::string TANGENT_PNT("ArcTangentPoint");
+    return TANGENT_PNT;
+  }
+
   /// 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;
   }
+
+  inline static const std::string& CENTER_REF_ID()
+  {
+    static const std::string MY_CENTER_REF_ID = "ArcCenterRef";
+    return MY_CENTER_REF_ID;
+  }
+
   /// Start 2D point of the arc
   inline static const std::string& START_ID()
   {
@@ -64,6 +100,27 @@ class SketchPlugin_Arc : public SketchPlugin_SketchEntity, public GeomAPI_IPrese
     return MY_INVERSED_ID;
   }
 
+  /// Passed point of the arc.
+  static const std::string& PASSED_POINT_ID()
+  {
+    static const std::string PASSED_PNT("ArcPassedPoint");
+    return PASSED_PNT;
+  }
+
+  /// Arc radius.
+  static const std::string& RADIUS_ID()
+  {
+    static const std::string RADIUS("ArcRadius");
+    return RADIUS;
+  }
+
+  /// Arc angle.
+  static const std::string& ANGLE_ID()
+  {
+    static const std::string ANGLE("ArcAngle");
+    return ANGLE;
+  }
+
   /// Returns the kind of a feature
   SKETCHPLUGIN_EXPORT virtual const std::string& getKind()
   {
@@ -77,9 +134,6 @@ class SketchPlugin_Arc : public SketchPlugin_SketchEntity, public GeomAPI_IPrese
   /// 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);
@@ -101,9 +155,17 @@ class SketchPlugin_Arc : public SketchPlugin_SketchEntity, public GeomAPI_IPrese
   /// 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();
+
+  /// Compose constraints to build tangency arc
+  void tangencyArcConstraints();
+
 };
 
 #endif