-// Copyright (C) 2014-2019 CEA/DEN, EDF R&D
+// Copyright (C) 2014-2022 CEA/DEN, EDF R&D
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
int aNbLines = 0;
int aNbArcs = 0;
int aNbCircs = 0;
+ int aNbEllipses = 0;
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) {
++aNbArcs;
isArcFirst = (aNbLines == 0);
}
+ else if (aType == ENTITY_ELLIPSE || aType == ENTITY_ELLIPTIC_ARC)
+ ++aNbEllipses;
}
- if (aNbLines + aNbArcs + aNbCircs != 2 ||
- (aNbLines == aNbCircs && aNbArcs == 0)) {
+ if (aNbLines + aNbArcs + aNbCircs + aNbEllipses != 2 ||
+ (aNbArcs == 1 && aNbEllipses != 0) || aNbEllipses == 1) {
myErrorMsg = SketchSolver_Error::INCORRECT_ATTRIBUTE();
return;
}
switch (aNbLines) {
case 0:
- myType = CONSTRAINT_EQUAL_RADIUS;
+ if (aNbEllipses == 2) {
+ myType = CONSTRAINT_EQUAL_ELLIPSES;
+ std::shared_ptr<PlaneGCSSolver_Storage> aStorage =
+ std::dynamic_pointer_cast<PlaneGCSSolver_Storage>(myStorage);
+ myAuxValue = ScalarWrapperPtr(new PlaneGCSSolver_ScalarWrapper(aStorage->createParameter()));
+ theValue = myAuxValue;
+ }
+ else
+ myType = CONSTRAINT_EQUAL_RADIUS;
break;
case 1:
myType = CONSTRAINT_EQUAL_LINE_ARC;
break;
}
}
+
+bool SketchSolver_ConstraintEqual::remove()
+{
+ if (myAuxValue) {
+ std::shared_ptr<PlaneGCSSolver_Storage> aStorage =
+ std::dynamic_pointer_cast<PlaneGCSSolver_Storage>(myStorage);
+ GCS::SET_pD aParams;
+ aParams.insert(myAuxValue->scalar());
+ aStorage->removeParameters(aParams);
+ }
+ return SketchSolver_Constraint::remove();
+}