Fix regression in TestConstraintConcidence.py

diff --git a/src/SketchPlugin/SketchPlugin_ConstraintCoincidence.cpp b/src/SketchPlugin/SketchPlugin_ConstraintCoincidence.cpp
index ed40959083e55defeb23a657f35f16622159f940..4b9a022bf223b7fd5077a414b5a68e5a8c355af0 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_ConstraintCoincidence.cpp
+++ b/src/SketchPlugin/SketchPlugin_ConstraintCoincidence.cpp
@@ -6,26 +6,8 @@
 
 #include "SketchPlugin_ConstraintCoincidence.h"
 
-#include <SketchPlugin_Arc.h>
-#include <SketchPlugin_Circle.h>
-#include <SketchPlugin_Line.h>
-#include <SketchPlugin_Point.h>
-
 #include <SketcherPrs_Factory.h>
 
-#include <ModelAPI_AttributeDouble.h>
-#include <ModelAPI_Data.h>
-#include <GeomDataAPI_Dir.h>
-#include <GeomDataAPI_Point.h>
-#include <GeomDataAPI_Point2D.h>
-
-#include <GeomAPI_Circ2d.h>
-#include <GeomAPI_Dir2d.h>
-#include <GeomAPI_Lin2d.h>
-
-/// \brief Update coordinates of the point to be correctly placed on the feature
-static void adjustPointOnEntity(std::shared_ptr<GeomDataAPI_Point2D> thePoint, FeaturePtr theFeature);
-
 SketchPlugin_ConstraintCoincidence::SketchPlugin_ConstraintCoincidence()
 {
 }
@@ -49,74 +31,3 @@ AISObjectPtr SketchPlugin_ConstraintCoincidence::getAISObject(AISObjectPtr thePr
                                                                  thePrevious);
   return anAIS;
 }
-
-void SketchPlugin_ConstraintCoincidence::attributeChanged(const std::string& theID)
-{
-  if (theID == ENTITY_A() || theID == ENTITY_B()) {
-    AttributeRefAttrPtr anAttrA = 
-        std::dynamic_pointer_cast<ModelAPI_AttributeRefAttr>(attribute(ENTITY_A()));
-    AttributeRefAttrPtr anAttrB = 
-        std::dynamic_pointer_cast<ModelAPI_AttributeRefAttr>(attribute(ENTITY_B()));
-
-    if (!anAttrA || !anAttrB || (!anAttrA->isObject() && !anAttrB->isObject()))
-      return;
-
-    if (anAttrA->isObject()) {
-      AttributeRefAttrPtr aTransient = anAttrA;
-      anAttrA = anAttrB;
-      anAttrB = aTransient;
-    }
-
-    std::shared_ptr<GeomDataAPI_Point2D> aPoint =
-        std::dynamic_pointer_cast<GeomDataAPI_Point2D>(anAttrA->attr());
-    FeaturePtr aFeature;
-    if (anAttrB->object())
-      aFeature = ModelAPI_Feature::feature(anAttrB->object());
-
-    // Adjust position of a point lying on a line or arc
-    if (aPoint && aFeature)
-      adjustPointOnEntity(aPoint, aFeature);
-  }
-}
-
-
-
-
-// =======   Auxiliary functions   ================================================
-void adjustPointOnEntity(std::shared_ptr<GeomDataAPI_Point2D> thePoint, FeaturePtr theFeature)
-{
-  if (theFeature->getKind() == SketchPlugin_Line::ID()) {
-    // project point on line
-    std::shared_ptr<GeomDataAPI_Point2D> aStart = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
-        theFeature->attribute(SketchPlugin_Line::START_ID()));
-    std::shared_ptr<GeomDataAPI_Point2D> aEnd = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
-        theFeature->attribute(SketchPlugin_Line::END_ID()));
-
-    std::shared_ptr<GeomAPI_Lin2d> aLine(new GeomAPI_Lin2d(aStart->pnt(), aEnd->pnt()));
-    std::shared_ptr<GeomAPI_Pnt2d> aProjected = aLine->project(thePoint->pnt());
-    thePoint->setValue(aProjected);
-  }
-  else if (theFeature->getKind() == SketchPlugin_Circle::ID()) {
-    // project point on circle
-    std::shared_ptr<GeomDataAPI_Point2D> aCenter = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
-        theFeature->attribute(SketchPlugin_Circle::CENTER_ID()));
-    double aRadius = theFeature->real(SketchPlugin_Circle::RADIUS_ID())->value();
-
-    std::shared_ptr<GeomAPI_Dir2d> aDir(new GeomAPI_Dir2d(1.0, 0.0));
-    std::shared_ptr<GeomAPI_Circ2d> aCircle(new GeomAPI_Circ2d(aCenter->pnt(), aDir, aRadius));
-
-    std::shared_ptr<GeomAPI_Pnt2d> aProjected = aCircle->project(thePoint->pnt());
-    thePoint->setValue(aProjected);
-  }
-  else if (theFeature->getKind() == SketchPlugin_Arc::ID()) {
-    // project point on arc
-    std::shared_ptr<GeomDataAPI_Point2D> aCenter = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
-        theFeature->attribute(SketchPlugin_Arc::CENTER_ID()));
-    std::shared_ptr<GeomDataAPI_Point2D> aStart = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
-        theFeature->attribute(SketchPlugin_Arc::START_ID()));
-
-    std::shared_ptr<GeomAPI_Circ2d> aCircle(new GeomAPI_Circ2d(aCenter->pnt(), aStart->pnt()));
-    std::shared_ptr<GeomAPI_Pnt2d> aProjected = aCircle->project(thePoint->pnt());
-    thePoint->setValue(aProjected);
-  }
-}

diff --git a/src/SketchPlugin/SketchPlugin_ConstraintCoincidence.h b/src/SketchPlugin/SketchPlugin_ConstraintCoincidence.h
index c9deb1e35a3a8441088e1f9d9cb1ae7009f653a1..ffc4ce1b9e1f0fb1ef8986ba91c0a38d453913fc 100644 (file)
--- a/src/SketchPlugin/SketchPlugin_ConstraintCoincidence.h
+++ b/src/SketchPlugin/SketchPlugin_ConstraintCoincidence.h
@@ -44,10 +44,6 @@ class SketchPlugin_ConstraintCoincidence : public SketchPlugin_ConstraintBase
   /// \brief Request for initialization of data model of the feature: adding all attributes
   SKETCHPLUGIN_EXPORT virtual void initAttributes();
 
-  /// Called on change of any argument-attribute of this object
-  /// \param theID identifier of changed attribute
-  SKETCHPLUGIN_EXPORT virtual void attributeChanged(const std::string& theID);
-
   /// \brief Use plugin manager for features creation
   SketchPlugin_ConstraintCoincidence();
 };

diff --git a/src/SketchPlugin/Test/TestConstraintConcidence.py b/src/SketchPlugin/Test/TestConstraintConcidence.py
index bf8a2b71d592723af75a079207ee72a39f8eec55..a0a7bc3ccf2d8c18be78188bafda28e0761a8c60 100644 (file)
--- a/src/SketchPlugin/Test/TestConstraintConcidence.py
+++ b/src/SketchPlugin/Test/TestConstraintConcidence.py
@@ -204,7 +204,7 @@ checkPointOnArc(aCircleCenter, aSketchArc)
 #=========================================================================
 # Check center of circle is still in origin
 #=========================================================================
-#assert (aCircleCenter.x() == 0. and aCircleCenter.y() == 0.)
+assert (aCircleCenter.x() == 0. and aCircleCenter.y() == 0.)
 #=========================================================================
 # End of test
 #=========================================================================