Do not fix copies in constraint Mirror to avoid problems with conflicting constraints...

diff --git a/src/SketchSolver/SketchSolver_ConstraintMirror.cpp b/src/SketchSolver/SketchSolver_ConstraintMirror.cpp
index 509404940e2f6942b78494e952784e9a028461a8..0bccf4f0495ae3547c4d0c4d7dac714ec3d7d940 100644 (file)
--- a/src/SketchSolver/SketchSolver_ConstraintMirror.cpp
+++ b/src/SketchSolver/SketchSolver_ConstraintMirror.cpp
@@ -106,6 +106,9 @@ void SketchSolver_ConstraintMirror::process()
   }
 
   myStorage->addConstraint(myBaseConstraint, aMirConstrList);
+  // update mirrored features to be in the current group
+  for (aMIt = aMirrorList.begin(); aMIt != aMirrorList.end(); ++aMIt)
+    myStorage->update((*aMIt)->baseFeature(), myGroupID);
 }
 
 

diff --git a/src/SketchSolver/SketchSolver_Storage.cpp b/src/SketchSolver/SketchSolver_Storage.cpp
index 587a3f31d03e92aefd2440f207ca30adb0081095..8ef9d9c0ed231236845be9a1f3991340e022fb08 100644 (file)
--- a/src/SketchSolver/SketchSolver_Storage.cpp
+++ b/src/SketchSolver/SketchSolver_Storage.cpp
@@ -15,6 +15,7 @@
 #include <SketchPlugin_Line.h>
 #include <SketchPlugin_Point.h>
 #include <SketchPlugin_IntersectionPoint.h>
+#include <SketchPlugin_ConstraintMirror.h>
 #include <SketchPlugin_ConstraintRigid.h>
 
 
@@ -144,6 +145,30 @@ void SketchSolver_Storage::addEntity(AttributePtr     theAttribute,
 }
 
 
+static bool isCopyInMulti(std::shared_ptr<SketchPlugin_Feature> theFeature,
+    const std::map<ConstraintPtr, std::list<ConstraintWrapperPtr> >& theConstraints)
+{
+  bool aResult = theFeature->isCopy();
+  if (aResult) {
+    std::map<ConstraintPtr, std::list<ConstraintWrapperPtr> >::const_iterator
+        anIt = theConstraints.begin();
+    for (; anIt != theConstraints.end() && aResult; ++anIt) {
+      if (anIt->first->getKind() != SketchPlugin_ConstraintMirror::ID())
+        continue;
+      AttributeRefListPtr aRefList = std::dynamic_pointer_cast<ModelAPI_AttributeRefList>(
+          anIt->first->attribute(SketchPlugin_Constraint::ENTITY_C()));
+      std::list<ObjectPtr> aMirroredList =  aRefList->list();
+      std::list<ObjectPtr>::const_iterator aMIt = aMirroredList.begin();
+      for (; aMIt != aMirroredList.end() && aResult; ++aMIt) {
+        FeaturePtr aFeat = ModelAPI_Feature::feature(*aMIt);
+        if (aFeat == theFeature)
+          aResult = false;
+      }
+    }
+  }
+  return aResult;
+}
+
 bool SketchSolver_Storage::update(FeaturePtr theFeature, const GroupID& theGroup)
 {
   bool isUpdated = false;
@@ -177,7 +202,7 @@ bool SketchSolver_Storage::update(FeaturePtr theFeature, const GroupID& theGroup
     // Check external feature
     std::shared_ptr<SketchPlugin_Feature> aSketchFeature = 
         std::dynamic_pointer_cast<SketchPlugin_Feature>(theFeature);
-    if (aSketchFeature && (aSketchFeature->isExternal() || aSketchFeature->isCopy()))
+    if (aSketchFeature && (aSketchFeature->isExternal() || isCopyInMulti(aSketchFeature, myConstraintMap)))
       aGroup = GID_OUTOFGROUP;
     aRelated = aBuilder->createFeature(theFeature, aSubs, aGroup);
     if (!aRelated)
@@ -223,7 +248,7 @@ bool SketchSolver_Storage::update(AttributePtr theAttribute, const GroupID& theG
     // Check attribute of external features
     std::shared_ptr<SketchPlugin_Feature> aSketchFeature = 
         std::dynamic_pointer_cast<SketchPlugin_Feature>(theAttribute->owner());
-    if (aSketchFeature && (aSketchFeature->isExternal() || aSketchFeature->isCopy()))
+    if (aSketchFeature && (aSketchFeature->isExternal() || isCopyInMulti(aSketchFeature, myConstraintMap)))
       aGroup = GID_OUTOFGROUP;
     aRelated = aBuilder->createAttribute(anAttribute, aGroup);
     if (!aRelated)