Issue #1834: Fix length of lines

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

diff --git a/src/SketchPlugin/SketchPlugin_ConstraintFillet.h b/src/SketchPlugin/SketchPlugin_ConstraintFillet.h
index 6a1dfa8f09f14b13914dc1d81c594f5eebaa8573..d965eaff5a3d7d8849ef30b51f9f6f95a8127b8f 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_ConstraintFillet.h
+++ b/src/SketchPlugin/SketchPlugin_ConstraintFillet.h
@@ -13,10 +13,12 @@
 
 /** \class SketchPlugin_ConstraintFillet
  *  \ingroup Plugins
- *  \brief Feature for creation of a new constraint filleting two objects which have coincident point
+ *  \brief Feature for creation of a new constraint filleting two objects which have 
+ *  coincident point
  *
  *  This constraint has three attributes:
- *  SketchPlugin_Constraint::ENTITY_A() and SketchPlugin_Constraint::ENTITY_B() for the filleting objects;
+ *  SketchPlugin_Constraint::ENTITY_A() and SketchPlugin_Constraint::ENTITY_B() 
+ *  for the filleting objects;
  *  SketchPlugin_Constraint::VALUE() contains radius of filleting circular arc
  *
  *  Also the constraint has attribute SketchPlugin_Constraint::ENTITY_C()
@@ -25,6 +27,14 @@
 class SketchPlugin_ConstraintFillet : public SketchPlugin_ConstraintBase
 {
  public:
+   /// \struct Struct to store base edges with states, result edges and constraints.
+   struct FilletFeatures {
+     /// list of objects the fillet is based and its states
+     std::list<std::pair<FeaturePtr, bool>> baseEdgesState; 
+     std::list<FeaturePtr> resultEdges; ///< list of result edges
+     std::list<FeaturePtr> resultConstraints; ///< list of constraints provided by the fillet
+   };
+
   /// Fillet constraint kind
   inline static const std::string& ID()
   {
@@ -58,23 +68,24 @@ class SketchPlugin_ConstraintFillet : public SketchPlugin_ConstraintBase
   /// \brief Use plugin manager for features creation
   SketchPlugin_ConstraintFillet();
 
-  /// \return base points list;
-  SKETCHPLUGIN_EXPORT const std::list<AttributePtr> basePoints() const {return myBasePoints;};
-
-  /// \return base edges list;
-  SKETCHPLUGIN_EXPORT const std::list<FeaturePtr> baseEdges() const {return myBaseEdges;};
+  /// \return map of base points and features;
+  SKETCHPLUGIN_EXPORT const std::map<AttributePtr, FilletFeatures> pointsFeaturesMap() const {
+    return myPointFeaturesMap;
+  };
 
-  /// \return result edges list;
-  SKETCHPLUGIN_EXPORT const std::list<FeaturePtr> resultEdges() const {return myResultEdges;};
+private:
+  /// \ Removes all produced features and restore base edges.
+  void clearResults();
 
 private:
-  std::list<AttributePtr> myBasePoints; ///< list of base points
-  std::list<FeaturePtr> myBaseEdges;      ///< list of objects the fillet is based
-  std::list<FeaturePtr> myResultEdges;      ///< list of result edges
-  std::list<FeaturePtr> myProducedFeatures; ///< list of constraints provided by the fillet
+  std::set<AttributePtr> myNewPoints; ///< set of new points
+
+  /// map of point and features for fillet
+  std::map<AttributePtr, FilletFeatures> myPointFeaturesMap; 
   bool myListOfPointsChangedInCode; ///< flag to track that list of points changed in code
   bool myRadiusChangedByUser; ///< flag to track that radius changed by user
   bool myRadiusChangedInCode; ///< flag to track that radius changed in code
+  bool myRadiusInitialized; /// < flag to track that radius initialized
 };
 
 #endif