X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchSolver%2FSketchSolver_ConstraintMultiRotation.h;h=f2c74237074c3b443b5291cd3186a1ca3dccb693;hb=d5b5ce2284869d8b97ce638502c58c810bbeb0c7;hp=6d241f92df261b2b2929157e667242f429b65ca6;hpb=050fbffc14076e3a220135330916a9d77d565631;p=modules%2Fshaper.git

diff --git a/src/SketchSolver/SketchSolver_ConstraintMultiRotation.h b/src/SketchSolver/SketchSolver_ConstraintMultiRotation.h
index 6d241f92d..f2c742370 100644
--- a/src/SketchSolver/SketchSolver_ConstraintMultiRotation.h
+++ b/src/SketchSolver/SketchSolver_ConstraintMultiRotation.h
@@ -1,13 +1,26 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:    SketchSolver_ConstraintMultiRotation.h
-// Created: 1 Apr 2015
-// Author:  Artem ZHIDKOV
+// Copyright (C) 2014-2017  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<mailto:webmaster.salome@opencascade.com>
+//
 
 #ifndef SketchSolver_ConstraintMultiRotation_H_
 #define SketchSolver_ConstraintMultiRotation_H_
 
-#include "SketchSolver.h"
 #include <SketchSolver_ConstraintMulti.h>
 
 #include "GeomDataAPI_Point2D.h"
@@ -29,12 +42,16 @@ protected:
   virtual void process();
 
   /// \brief Generate list of rotated entities
-  /// \param[out] theCenter   central point of rotation
-  /// \param[out] theAngle    rotation angle
-  /// \param[out] theFullValue  applying translation using the disstance as a full or single value
-  /// \param[out] theEntities list of entities and their rotated copies
-  void getAttributes(EntityWrapperPtr& theCenter, double& theAngle, bool& theFullValue,
-                     std::list< std::list<EntityWrapperPtr> >& theEntities);
+  /// \param[out] theCenter    central point of rotation
+  /// \param[out] theAngle     rotation angle
+  /// \param[out] theFullValue applying translation using the distance as a full or single value
+  /// \param[out] theReversed  rotation angle is negative
+  /// \param[out] theEntities  list of base entities
+  void getAttributes(EntityWrapperPtr&            theCenter,
+                     ScalarWrapperPtr&            theAngle,
+                     bool&                        theFullValue,
+                     bool&                        theReversed,
+                     std::list<EntityWrapperPtr>& theEntities);
 
   /// \brief This method is used in derived objects to check consistence of constraint.
   virtual void adjustConstraint();
@@ -43,12 +60,25 @@ protected:
   virtual void updateLocal();
 
 private:
+  /// \brief Convert absolute coordinates to relative coordinates
+  virtual void getRelative(double theAbsX, double theAbsY,
+                           double& theRelX, double& theRelY);
+  /// \brief Convert relative coordinates to absolute coordinates
+  virtual void getAbsolute(double theRelX, double theRelY,
+                           double& theAbsX, double& theAbsY);
+  /// \brief Apply transformation for relative coordinates
+  virtual void transformRelative(double& theX, double& theY);
+
   /// \brief Returns name of NUMBER_OF_COPIES parameter for corresponding feature
   virtual const std::string& nameNbObjects();
 
+private:
   AttributePoint2DPtr myCenterPointAttribute; ///< a center of rotation
-  double              myAngle;           ///< angle of rotation
-  bool                myIsFullValue;     ///< value whether the angle is a full or single for objects
+  ScalarWrapperPtr    myAngle;                ///< angle of rotation
+  bool myIsRevered; ///< angle of rotation is negative
+
+  double myCenterCoord[2]; ///< coordinates of rotation center
+  double myRotationVal[2]; ///< sinus and cosine of rotation angle
 };
 
 #endif