-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+// Copyright (C) 2014-2019 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
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
#include <SketchSolver_ConstraintCollinear.h>
#include <SketchSolver_Error.h>
#include <PlaneGCSSolver_ConstraintWrapper.h>
-#include <PlaneGCSSolver_EntityWrapper.h>
+#include <PlaneGCSSolver_EdgeWrapper.h>
#include <PlaneGCSSolver_PointWrapper.h>
#include <PlaneGCSSolver_UpdateCoincidence.h>
static ConstraintWrapperPtr createPointsOnLine(
std::shared_ptr<PlaneGCSSolver_PointWrapper> thePoint1,
std::shared_ptr<PlaneGCSSolver_PointWrapper> thePoint2,
- std::shared_ptr<PlaneGCSSolver_EntityWrapper> theLine)
+ std::shared_ptr<PlaneGCSSolver_EdgeWrapper> theLine)
{
std::shared_ptr<GCS::Line> aGCSLine = std::dynamic_pointer_cast<GCS::Line>(theLine->entity());
void SketchSolver_ConstraintCollinear::notify(const FeaturePtr& theFeature,
PlaneGCSSolver_Update* theUpdater)
{
+ if (theFeature == myBaseConstraint && myInSolver)
+ return; // the constraint is already being updated
+
PlaneGCSSolver_UpdateCoincidence* anUpdater =
static_cast<PlaneGCSSolver_UpdateCoincidence*>(theUpdater);
bool aConstraintToApply[4] = {false, false, false, false};
ConstraintWrapperPtr aNewConstraint;
std::shared_ptr<PlaneGCSSolver_PointWrapper> aPoints[2];
- std::shared_ptr<PlaneGCSSolver_EntityWrapper> aLine;
+ std::shared_ptr<PlaneGCSSolver_EdgeWrapper> aLine;
if (isPointOnOppositeLine[0] || isPointOnOppositeLine[1]) {
// one of points of first line is already on the second line,
aPoints[i] = std::dynamic_pointer_cast<PlaneGCSSolver_PointWrapper>(myPoints[i]);
aConstraintToApply[i] = true;
}
- aLine = std::dynamic_pointer_cast<PlaneGCSSolver_EntityWrapper>(myAttributes.back());
+ aLine = std::dynamic_pointer_cast<PlaneGCSSolver_EdgeWrapper>(myAttributes.back());
} else {
// verify second line and add necessary constraints
for (int i = 0; i < 2; ++i) {
aPoints[i] = std::dynamic_pointer_cast<PlaneGCSSolver_PointWrapper>(myPoints[i + 2]);
aConstraintToApply[i+2] = true;
}
- aLine = std::dynamic_pointer_cast<PlaneGCSSolver_EntityWrapper>(myAttributes.front());
+ aLine = std::dynamic_pointer_cast<PlaneGCSSolver_EdgeWrapper>(myAttributes.front());
}
bool isNew = false;
- for (int i = 0; i < 4 && !isNew; ++i)
+ for (int i = 0; i < 4; ++i) {
if (aConstraintToApply[i] != myIsConstraintApplied[i])
isNew = true;
+ myIsConstraintApplied[i] = aConstraintToApply[i];
+ }
+
if (isNew) {
mySolverConstraint = createPointsOnLine(aPoints[0], aPoints[1], aLine);
- myStorage->removeConstraint(myBaseConstraint);
- myStorage->addConstraint(myBaseConstraint, mySolverConstraint);
+ if (myInSolver) {
+ myStorage->removeConstraint(myBaseConstraint);
+ myInSolver = false;
+ }
+ if (mySolverConstraint) {
+ myStorage->addConstraint(myBaseConstraint, mySolverConstraint);
+ myInSolver = true;
+ }
}
}