X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FSketchPlugin%2FSketchPlugin_ConstraintPerpendicular.cpp;h=770eac2efe531b974aab0e1dacfa437141db53d1;hb=5be4a656f7f45e94dc40385cf164a88375e4403b;hp=d3128d64223d25b4762ba281e38a786cc51c156e;hpb=9ceeef869e0cdb799d19d4f2b447854c0ce9c280;p=modules%2Fshaper.git

diff --git a/src/SketchPlugin/SketchPlugin_ConstraintPerpendicular.cpp b/src/SketchPlugin/SketchPlugin_ConstraintPerpendicular.cpp
index d3128d642..770eac2ef 100644
--- a/src/SketchPlugin/SketchPlugin_ConstraintPerpendicular.cpp
+++ b/src/SketchPlugin/SketchPlugin_ConstraintPerpendicular.cpp
@@ -1,8 +1,11 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
+
 // File:    SketchPlugin_ConstraintPerpendicular.cpp
 // Created: 26 May 2014
 // Author:  Artem ZHIDKOV
 
 #include "SketchPlugin_ConstraintPerpendicular.h"
+#include "SketchPlugin_ConstraintParallel.h"
 
 #include <ModelAPI_AttributeDouble.h>
 #include <ModelAPI_Data.h>
@@ -36,10 +39,10 @@ AISObjectPtr SketchPlugin_ConstraintPerpendicular::getAISObject(AISObjectPtr the
   if (!sketch())
     return thePrevious;
 
-  boost::shared_ptr<ModelAPI_Data> aData = data();
-  boost::shared_ptr<ModelAPI_AttributeRefAttr> anAttr1 = boost::dynamic_pointer_cast<
+  std::shared_ptr<ModelAPI_Data> aData = data();
+  std::shared_ptr<ModelAPI_AttributeRefAttr> anAttr1 = std::dynamic_pointer_cast<
       ModelAPI_AttributeRefAttr>(aData->attribute(SketchPlugin_Constraint::ENTITY_A()));
-  boost::shared_ptr<ModelAPI_AttributeRefAttr> anAttr2 = boost::dynamic_pointer_cast<
+  std::shared_ptr<ModelAPI_AttributeRefAttr> anAttr2 = std::dynamic_pointer_cast<
       ModelAPI_AttributeRefAttr>(aData->attribute(SketchPlugin_Constraint::ENTITY_B()));
   if (!anAttr1 || !anAttr1->isObject() || !anAttr2 || !anAttr2->isObject())
     return thePrevious;
@@ -47,25 +50,25 @@ AISObjectPtr SketchPlugin_ConstraintPerpendicular::getAISObject(AISObjectPtr the
   FeaturePtr aFeature = ModelAPI_Feature::feature(anAttr1->object());
   if (!aFeature)
     return thePrevious;
-  boost::shared_ptr<SketchPlugin_Line> aLine1Feature =
-      boost::dynamic_pointer_cast<SketchPlugin_Line>(aFeature);
+  std::shared_ptr<SketchPlugin_Line> aLine1Feature =
+      std::dynamic_pointer_cast<SketchPlugin_Line>(aFeature);
 
   aFeature = ModelAPI_Feature::feature(anAttr2->object());
   if (!aFeature)
     return thePrevious;
-  boost::shared_ptr<SketchPlugin_Line> aLine2Feature =
-      boost::dynamic_pointer_cast<SketchPlugin_Line>(aFeature);
+  std::shared_ptr<SketchPlugin_Line> aLine2Feature =
+      std::dynamic_pointer_cast<SketchPlugin_Line>(aFeature);
 
   if (!aLine1Feature || !aLine2Feature)
     return thePrevious;
 
-  boost::shared_ptr<GeomAPI_Pln> aPlane = sketch()->plane();
-  boost::shared_ptr<GeomAPI_Shape> aLine1, aLine2;
-  boost::shared_ptr<ModelAPI_ResultConstruction> aConst1 = boost::dynamic_pointer_cast<
+  std::shared_ptr<GeomAPI_Pln> aPlane = sketch()->plane();
+  std::shared_ptr<GeomAPI_Shape> aLine1, aLine2;
+  std::shared_ptr<ModelAPI_ResultConstruction> aConst1 = std::dynamic_pointer_cast<
       ModelAPI_ResultConstruction>(anAttr1->object());
   if (aConst1)
     aLine1 = aConst1->shape();
-  boost::shared_ptr<ModelAPI_ResultConstruction> aConst2 = boost::dynamic_pointer_cast<
+  std::shared_ptr<ModelAPI_ResultConstruction> aConst2 = std::dynamic_pointer_cast<
       ModelAPI_ResultConstruction>(anAttr2->object());
   if (aConst2)
     aLine2 = aConst2->shape();
@@ -76,20 +79,15 @@ AISObjectPtr SketchPlugin_ConstraintPerpendicular::getAISObject(AISObjectPtr the
   anAIS->createPerpendicular(aLine1, aLine2, aPlane);
 
   // Set color from preferences
-  std::vector<int> aRGB = Config_PropManager::color("Visualization", "perpendicular_color",
-                                                    PERPENDICULAR_COLOR);
+  std::vector<int> aRGB = Config_PropManager::color("Visualization", "sketch_parallel_color",
+                                                    SKETCH_CONSTRAINT_COLOR);
   anAIS->setColor(aRGB[0], aRGB[1], aRGB[2]);
   return anAIS;
 }
 
 void SketchPlugin_ConstraintPerpendicular::move(double theDeltaX, double theDeltaY)
 {
-  boost::shared_ptr<ModelAPI_Data> aData = data();
-  if (!aData->isValid())
-    return;
-
-  boost::shared_ptr<GeomDataAPI_Point2D> aPoint = boost::dynamic_pointer_cast<GeomDataAPI_Point2D>(
-      aData->attribute(SketchPlugin_Constraint::FLYOUT_VALUE_PNT()));
-  aPoint->setValue(aPoint->x() + theDeltaX, aPoint->y() + theDeltaY);
+  //Flyout point of the constraint follows it's features
+  return;
 }