Fix for the issue #593: do not remove naming attribute, but use TNaming_Builder for...

[modules/shaper.git] / src / SketcherPrs / SketcherPrs_Mirror.cpp

diff --git a/src/SketcherPrs/SketcherPrs_Mirror.cpp b/src/SketcherPrs/SketcherPrs_Mirror.cpp
index 2c05d225f25b00bf593763291f38d9ab833a6f55..dca445bfdac2d94c64b359a0ee203cbef55dbf6b 100644 (file)
--- a/src/SketcherPrs/SketcherPrs_Mirror.cpp
+++ b/src/SketcherPrs/SketcherPrs_Mirror.cpp
@@ -10,8 +10,6 @@
 
 #include <SketchPlugin_Constraint.h>
 
-#include <ModelAPI_AttributeRefList.h>
-
 #include <Graphic3d_AspectLine3d.hxx>
 #include <Prs3d_Root.hxx>
 
@@ -54,11 +52,23 @@ bool SketcherPrs_Mirror::updatePoints(double theStep) const
   gp_Pnt aP1;
   for (i = 0; i < aNb; i++) {
     aObj = anAttrB->object(i);
+    if (!aObj.get()) // TODO:empty_result
+      // this check should be removed here after the result flush is corrected
+      // the problem is, that feature::execute() flushes redisplay by each result creation
+      // but it is possible(e.g. in the sketch circle, that there should be more than one result.
+      // Here, crash happens, because the second result is not created yet
+      continue;
     aP1 = aMgr->getPosition(aObj, this, theStep);
     myPntArray->SetVertice(i + 1, aP1);
   }  
   for (i = 0; i < aNb; i++) {
     aObj = anAttrC->object(i);
+    if (!aObj.get()) // TODO:empty_result
+      // this check should be removed here after the result flush is corrected
+      // the problem is, that feature::execute() flushes redisplay by each result creation
+      // but it is possible(e.g. in the sketch circle, that there should be more than one result.
+      // Here, crash happens, because the second result is not created yet
+      continue;
     aP1 = aMgr->getPosition(aObj, this, theStep);
     myPntArray->SetVertice(aNb + i + 1, aP1);
   }  
@@ -76,7 +86,6 @@ void SketcherPrs_Mirror::drawLines(const Handle(Prs3d_Presentation)& thePrs, Qua
   if (anAttrC.get() == NULL)
     return;
 
-  SketcherPrs_PositionMgr* aMgr = SketcherPrs_PositionMgr::get();
   int aNb = anAttrB->size();
   if (aNb != anAttrC->size())
     return;
@@ -90,20 +99,9 @@ void SketcherPrs_Mirror::drawLines(const Handle(Prs3d_Presentation)& thePrs, Qua
   addLine(aGroup, SketchPlugin_Constraint::ENTITY_A());
 
   // Draw source objects
-  int i;
-  ObjectPtr aObj;
-  for (i = 0; i < aNb; i++) {
-    aObj = anAttrB->object(i);
-    std::shared_ptr<GeomAPI_Shape> aShape = SketcherPrs_Tools::getShape(aObj);
-    if (aShape.get() != NULL)
-      drawShape(aShape, thePrs);
-  }
+  drawListOfShapes(anAttrB, thePrs);
+
   // draw mirrored objects
-  for (i = 0; i < aNb; i++) {
-    aObj = anAttrC->object(i);
-    std::shared_ptr<GeomAPI_Shape> aShape = SketcherPrs_Tools::getShape(aObj);
-    if (aShape.get() != NULL)
-      drawShape(aShape, thePrs);
-  }
+  drawListOfShapes(anAttrC, thePrs);
 }