From: nds <nds@opencascade.com>
Date: Mon, 3 Apr 2017 06:11:27 +0000 (+0300)
Subject: Issues #2027, #2024, #2063, #2067: reentrant message to fill new operation by result... 
X-Git-Tag: V_2.7.0~102
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b200c0c98cb5b967a20ad42af6b7b8d807e6922e;p=modules%2Fshaper.git

Issues #2027, #2024, #2063, #2067: reentrant message to fill new operation by result of the previous one. Issue #2064(PartSet_OperationPrs)
---

diff --git a/src/SketchPlugin/SketchPlugin_ConstraintCoincidence.cpp b/src/SketchPlugin/SketchPlugin_ConstraintCoincidence.cpp
index 8d2ab687e..5fa7f0f07 100644
--- a/src/SketchPlugin/SketchPlugin_ConstraintCoincidence.cpp
+++ b/src/SketchPlugin/SketchPlugin_ConstraintCoincidence.cpp
@@ -11,11 +11,14 @@
 #include <SketchPlugin_Arc.h>
 #include <SketchPlugin_Circle.h>
 
+#include <ModelAPI_Events.h>
 #include <ModelGeomAlgo_Point2D.h>
 #include <GeomDataAPI_Point2D.h>
 
 #include <SketcherPrs_Factory.h>
 
+#include <Events_Loop.h>
+
 SketchPlugin_ConstraintCoincidence::SketchPlugin_ConstraintCoincidence()
 {
 }
@@ -96,3 +99,29 @@ AttributePoint2DPtr SketchPlugin_ConstraintCoincidence::getPoint(const FeaturePt
                                  SketchPlugin_Point::ID(), SketchPlugin_Point::COORD_ID());
   return aPoint;
 }
+
+void SketchPlugin_ConstraintCoincidence::createCoincidenceFeature(SketchPlugin_Sketch* theSketch,
+                                                  const std::shared_ptr<GeomDataAPI_Point2D>& thePoint1,
+                                                  const std::shared_ptr<GeomDataAPI_Point2D>& thePoint2)
+{
+  FeaturePtr aFeature;
+  if (theSketch) {
+    aFeature = theSketch->addFeature(SketchPlugin_ConstraintCoincidence::ID());
+  } else {
+    std::shared_ptr<ModelAPI_Document> aDoc = theSketch->document();
+    aFeature = aDoc->addFeature(SketchPlugin_ConstraintCoincidence::ID());
+  }
+
+  std::shared_ptr<ModelAPI_Data> aData = aFeature->data();
+
+  std::shared_ptr<ModelAPI_AttributeRefAttr> aRef1 = std::dynamic_pointer_cast<
+      ModelAPI_AttributeRefAttr>(aData->attribute(SketchPlugin_Constraint::ENTITY_A()));
+  aRef1->setAttr(thePoint1);
+
+  std::shared_ptr<ModelAPI_AttributeRefAttr> aRef2 = std::dynamic_pointer_cast<
+      ModelAPI_AttributeRefAttr>(aData->attribute(SketchPlugin_Constraint::ENTITY_B()));
+  aRef2->setAttr(thePoint2);
+
+  // we need to flush created signal in order to coincidence is processed by solver
+  Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_CREATED));
+}
diff --git a/src/SketchPlugin/SketchPlugin_ConstraintCoincidence.h b/src/SketchPlugin/SketchPlugin_ConstraintCoincidence.h
index 4990259e2..c41358c3c 100644
--- a/src/SketchPlugin/SketchPlugin_ConstraintCoincidence.h
+++ b/src/SketchPlugin/SketchPlugin_ConstraintCoincidence.h
@@ -52,6 +52,14 @@ class SketchPlugin_ConstraintCoincidence : public SketchPlugin_ConstraintBase
   static FeaturePtr findCoincidenceFeature(const FeaturePtr& theFeature1,
                                            const FeaturePtr& theFeature2);
 
+  /// Creates a constraint on two points
+  /// \param theSketch a sketch feature
+  /// \param thePoint1 the first point
+  /// \param thePoint2 the second point
+  static void createCoincidenceFeature(SketchPlugin_Sketch* theSketch,
+                                const std::shared_ptr<GeomDataAPI_Point2D>& thePoint1,
+                                const std::shared_ptr<GeomDataAPI_Point2D>& thePoint2);
+
   /// Returns point of coincidence feature
   /// \param theFeature a coincidence feature
   /// \return point 2d attribute. Coincidence always has at least one point 2d attribute