X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchSolver%2FSketchSolver_ConstraintFixed.h;h=bb19cb84a9f5541ab5dae74973fb20cef833e44b;hb=ea593bc59e7e9461f6c4e2afd3f24d621edb1011;hp=13ec1d160c4d1dd5c1639c0a7b2ebede8f6e1c04;hpb=449bcc64cb436f1ccf664236f431600b30ce84b4;p=modules%2Fshaper.git

diff --git a/src/SketchSolver/SketchSolver_ConstraintFixed.h b/src/SketchSolver/SketchSolver_ConstraintFixed.h
index 13ec1d160..bb19cb84a 100644
--- a/src/SketchSolver/SketchSolver_ConstraintFixed.h
+++ b/src/SketchSolver/SketchSolver_ConstraintFixed.h
@@ -1,8 +1,21 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:    SketchSolver_ConstraintFixed.h
-// Created: 30 Mar 2015
-// Author:  Artem ZHIDKOV
+// 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
+//
 
 #ifndef SketchSolver_ConstraintFixed_H_
 #define SketchSolver_ConstraintFixed_H_
@@ -18,20 +31,10 @@ class SketchSolver_ConstraintFixed : public SketchSolver_Constraint
 public:
   /// Creates constraint to manage the given constraint from plugin
   SketchSolver_ConstraintFixed(ConstraintPtr theConstraint);
-#ifndef SUPPORT_NEW_MOVE
-  /// Creates temporary constraint based on feature (useful while the feature is being moved)
-  SketchSolver_ConstraintFixed(FeaturePtr theFeature);
-#endif
 
   /// \brief Block or unblock events from this constraint
   virtual void blockEvents(bool isBlocked);
 
-#ifndef SUPPORT_NEW_MOVE
-  /// \brief Set coordinates of fixed feature to the values where it has been dragged.
-  ///        Useful when the feature is being moved.
-  void moveFeature();
-#endif
-
 protected:
   /// \brief Converts SketchPlugin constraint to a list of SolveSpace constraints
   virtual void process();
@@ -42,37 +45,15 @@ protected:
   virtual void getAttributes(EntityWrapperPtr& , std::vector<EntityWrapperPtr>& )
   {}
 
-#ifdef SUPPORT_NEW_MOVE
   /// \brief Obtain entity to be fixed
-  virtual EntityWrapperPtr entityToFix();
-#else
-  /// \brief Generate list of attributes of constraint in order useful for constraints
-  /// \param[out] theBaseEntity  the entity which coordinates should be fixed
-  /// \param[out] theFixedEntity the entity containing fixed values
-  virtual void getAttributes(EntityWrapperPtr& theBaseEntity,
-                             EntityWrapperPtr& theFixedEntity);
-#endif
+  EntityWrapperPtr entityToFix();
 
   /// \brief Create Fixed constraint for the feature basing on its type
   /// \param theFeature [in]  feature, converted to solver specific format
   /// \return Fixed constraint
-  virtual ConstraintWrapperPtr fixFeature(EntityWrapperPtr theFeature);
+  ConstraintWrapperPtr fixFeature(EntityWrapperPtr theFeature);
 
-#ifndef SUPPORT_NEW_MOVE
-public:
-#endif
-  /// \brief Get list of parameters of current entity
-  static GCS::VEC_pD toParameters(const EntityWrapperPtr& theEntity);
-
-#ifdef SUPPORT_NEW_MOVE
 protected:
-#else
-private:
-  FeaturePtr myBaseFeature; ///< fixed feature (when it is set, myBaseConstraint should be NULL)
-
-  ConstraintWrapperPtr myConstraint;
-  EntityWrapperPtr    myFixedEntity;
-#endif
   std::vector<double> myFixedValues;
 };