Implementation of the issue #1307. Also make connected parameters from different...

[modules/shaper.git] / src / SketchSolver / SketchSolver_ConstraintEqual.cpp

diff --git a/src/SketchSolver/SketchSolver_ConstraintEqual.cpp b/src/SketchSolver/SketchSolver_ConstraintEqual.cpp
index 23ff40407f8018693623780cbd4f78210a48ef0c..a6120533ecb1a46f21b0a1673071e8aa8b3a4410 100644 (file)
--- a/src/SketchSolver/SketchSolver_ConstraintEqual.cpp
+++ b/src/SketchSolver/SketchSolver_ConstraintEqual.cpp
@@ -1,62 +1,54 @@
 #include <SketchSolver_ConstraintEqual.h>
-#include <SketchSolver_Group.h>
 #include <SketchSolver_Error.h>
 
-
-void SketchSolver_ConstraintEqual::process()
+void SketchSolver_ConstraintEqual::getAttributes(
+    double& theValue,
+    std::vector<EntityWrapperPtr>& theAttributes)
 {
-  cleanErrorMsg();
-  if (!myBaseConstraint || !myStorage || myGroup == 0) {
-    /// TODO: Put error message here
+  SketchSolver_Constraint::getAttributes(theValue, theAttributes);
+  if (!myErrorMsg.empty() || !theAttributes[2] || !theAttributes[3]) {
+    theAttributes.clear();
     return;
   }
-  if (!mySlvsConstraints.empty()) // some data is changed, update constraint
-    update(myBaseConstraint);
-
-  double aValue;
-  std::vector<Slvs_hEntity> anEntities;
-  getAttributes(aValue, anEntities);
-  if (!myErrorMsg.empty())
-    return;
 
   // Check the quantity of entities of each type
   int aNbLines = 0;
   int aNbArcs = 0;
   int aNbCircs = 0;
-  std::vector<Slvs_hEntity>::iterator anEntIter = anEntities.begin();
-  for (; anEntIter != anEntities.end(); anEntIter++) {
-    Slvs_Entity anEnt = myStorage->getEntity(*anEntIter);
-    if (anEnt.type == SLVS_E_LINE_SEGMENT)
-      aNbLines++;
-    else if (anEnt.type == SLVS_E_CIRCLE)
-      aNbCircs++;
-    else if (anEnt.type == SLVS_E_ARC_OF_CIRCLE)
-      aNbArcs++;
+  bool isArcFirst = false; // in line-arc equivalence, the line should be first
+  std::vector<EntityWrapperPtr>::iterator anAttrIt = theAttributes.begin() + 2;
+  for (; anAttrIt != theAttributes.end(); ++anAttrIt) {
+    SketchSolver_EntityType aType = (*anAttrIt)->type();
+    if (aType == ENTITY_LINE)
+      ++aNbLines;
+    else if (aType == ENTITY_CIRCLE)
+      ++aNbCircs;
+    else if (aType == ENTITY_ARC) {
+      ++aNbArcs;
+      isArcFirst = (aNbLines == 0);
+    }
   }
 
   if (aNbLines + aNbArcs + aNbCircs != 2 ||
-      (aNbLines == aNbCircs && aNbArcs == 0)) {
+     (aNbLines == aNbCircs && aNbArcs == 0)) {
     myErrorMsg = SketchSolver_Error::INCORRECT_ATTRIBUTE();
     return;
   }
 
   switch (aNbLines) {
   case 0:
-    myType = SLVS_C_EQUAL_RADIUS;
+    myType = CONSTRAINT_EQUAL_RADIUS;
     break;
   case 1:
-    myType = SLVS_C_EQUAL_LINE_ARC_LEN;
+    myType = CONSTRAINT_EQUAL_LINE_ARC;
+    if (isArcFirst) { // change the order of arc and line
+      EntityWrapperPtr aTmp = theAttributes[2];
+      theAttributes[2] = theAttributes[3];
+      theAttributes[3] = aTmp;
+    }
     break;
   default:
-    myType = SLVS_C_EQUAL_LENGTH_LINES;
+    myType = CONSTRAINT_EQUAL_LINES;
     break;
   }
-
-  Slvs_Constraint aConstraint = Slvs_MakeConstraint(SLVS_C_UNKNOWN, myGroup->getId(),
-      getType(), myGroup->getWorkplaneId(), aValue,
-      anEntities[0], anEntities[1], anEntities[2], anEntities[3]);
-  aConstraint.h = myStorage->addConstraint(aConstraint);
-  mySlvsConstraints.push_back(aConstraint.h);
-  adjustConstraint();
 }
-