From: mpv <mikhail.ponikarov@opencascade.com>
Date: Fri, 4 Mar 2016 06:18:22 +0000 (+0300)
Subject: Revert "Full/single angle" commit because it makes a regression
X-Git-Tag: V_2.2.0~5
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=fa81e65e22a3bc4d287aeaea5af91c14e1cb2405;p=modules%2Fshaper.git

Revert "Full/single angle" commit because it makes a regression
---

diff --git a/src/SketchSolver/SketchSolver_ConstraintMultiRotation.cpp b/src/SketchSolver/SketchSolver_ConstraintMultiRotation.cpp
index bd53679d9..e2839f7b9 100644
--- a/src/SketchSolver/SketchSolver_ConstraintMultiRotation.cpp
+++ b/src/SketchSolver/SketchSolver_ConstraintMultiRotation.cpp
@@ -143,12 +143,8 @@ void SketchSolver_ConstraintMultiRotation::adjustConstraint()
   myCenterCoord[0] = aParams.front()->value();
   myCenterCoord[1] = aParams.back()->value();
 
-  double anAngleValue = myAngle;
-  if (myIsFullValue && myNumberOfCopies > 0)
-    anAngleValue /= myNumberOfCopies;
-
-  myRotationVal[0] = sin(anAngleValue * PI / 180.0);
-  myRotationVal[1] = cos(anAngleValue * PI / 180.0);
+  myRotationVal[0] = sin(myAngle * PI / 180.0);
+  myRotationVal[1] = cos(myAngle * PI / 180.0);
 
   SketchSolver_ConstraintMulti::adjustConstraint();
 }
diff --git a/src/SketchSolver/SketchSolver_ConstraintMultiTranslation.cpp b/src/SketchSolver/SketchSolver_ConstraintMultiTranslation.cpp
index 2bea9a217..dd740003a 100644
--- a/src/SketchSolver/SketchSolver_ConstraintMultiTranslation.cpp
+++ b/src/SketchSolver/SketchSolver_ConstraintMultiTranslation.cpp
@@ -148,15 +148,9 @@ void SketchSolver_ConstraintMultiTranslation::adjustConstraint()
   EntityWrapperPtr aEnd = myStorage->entity(
       myBaseConstraint->attribute(SketchPlugin_MultiTranslation::END_POINT_ID()));
   std::list<ParameterWrapperPtr> aEndParams = aEnd->parameters();
-
   myDelta[0] = aEndParams.front()->value() - aStartParams.front()->value();
   myDelta[1] = aEndParams.back()->value() - aStartParams.back()->value();
 
-  if (myIsFullValue && myNumberOfCopies > 0) {
-    myDelta[0] /= myNumberOfCopies;
-    myDelta[1] /= myNumberOfCopies;
-  }
-
   SketchSolver_ConstraintMulti::adjustConstraint();
 }