Fix for the issue #1715

[modules/shaper.git] / src / Model / Model_ResultPart.cpp

diff --git a/src/Model/Model_ResultPart.cpp b/src/Model/Model_ResultPart.cpp
index a5d266d8165736f94bb7f7581fa4a9a7de4a1b85..a396e0dd07be17cb9f128fce3102b5e467fea324 100644 (file)
--- a/src/Model/Model_ResultPart.cpp
+++ b/src/Model/Model_ResultPart.cpp
@@ -14,6 +14,7 @@
 #include <ModelAPI_AttributeIntArray.h>
 #include <ModelAPI_AttributeSelectionList.h>
 #include <ModelAPI_AttributeReference.h>
+#include <ModelAPI_AttributeDouble.h>
 #include <Model_Document.h>
 #include <Model_Application.h>
 #include <Events_Loop.h>
@@ -36,6 +37,7 @@ void Model_ResultPart::initAttributes()
     data()->addAttribute(DOC_REF(), ModelAPI_AttributeDocRef::typeId()));
   data()->addAttribute(COLOR_ID(), ModelAPI_AttributeIntArray::typeId());
   data()->addAttribute(BASE_REF_ID(), ModelAPI_AttributeReference::typeId());
+  data()->addAttribute(DEFLECTION_ID(), ModelAPI_AttributeDouble::typeId());
 
   if (aDocRef->isInitialized() && // initialized immideately means already exist and will be loaded
       !Model_Application::getApplication()->hasDocument(aDocRef->docId()))
@@ -67,12 +69,12 @@ void Model_ResultPart::activate()
   // activation may cause changes in current features in document, so it must be in transaction
   bool isNewTransaction = false;
   SessionPtr aMgr = ModelAPI_Session::get();
+  if (!aMgr->isOperation()) { // open transaction even document is not created to set current docs in setActiveDocument
+    aMgr->startOperation("Activation");
+    isNewTransaction = true;
+  }
   if (!aDocRef->value().get()) {  // create (or open) a document if it is not yet created
     Handle(Model_Application) anApp = Model_Application::getApplication();
-    if (!aMgr->isOperation()) {
-      aMgr->startOperation("Activation");
-      isNewTransaction = true;
-    }
     if (anApp->isLoadByDemand(data()->name())) {
       anApp->loadDocument(data()->name(), aDocRef->docId()); // if it is just ne part, load may fail
     } else {
@@ -148,39 +150,41 @@ bool Model_ResultPart::setDisabled(std::shared_ptr<ModelAPI_Result> theThis,
 std::shared_ptr<GeomAPI_Shape> Model_ResultPart::shape()
 {
   std::shared_ptr<GeomAPI_Shape> aResult(new GeomAPI_Shape);
-  if (myTrsf.get()) { // get shape of the base result and apply the transformation
-    ResultPtr anOrigResult = baseRef();
-    std::shared_ptr<GeomAPI_Shape> anOrigShape = anOrigResult->shape();
-    if (anOrigShape.get()) {
-      TopoDS_Shape aShape = anOrigShape->impl<TopoDS_Shape>();
-      if (!aShape.IsNull()) {
-        aShape.Move(*(myTrsf.get()));
-        aResult->setImpl(new TopoDS_Shape(aShape));
-      }
-    }
-    return aResult;
-  }
   if (myShape.IsNull()) { // shape is not produced yet, create it
-    DocumentPtr aDoc = Model_ResultPart::partDoc();
-    if (aDoc.get() && aDoc->isOpened()) {
-      const std::string& aBodyGroup = ModelAPI_ResultBody::group();
-      TopoDS_Compound aResultComp;
-      BRep_Builder aBuilder;
-      aBuilder.MakeCompound(aResultComp);
-      int aNumSubs = 0;
-      for(int a = aDoc->size(aBodyGroup) - 1; a >= 0; a--) {
-        ResultPtr aBody = std::dynamic_pointer_cast<ModelAPI_Result>(aDoc->object(aBodyGroup, a));
-        // "object" method filters out disabled and concealed anyway, so don't check
-        if (aBody.get() && aBody->shape().get()) {
-          TopoDS_Shape aShape = *(aBody->shape()->implPtr<TopoDS_Shape>());
-          if (!aShape.IsNull()) {
-            aBuilder.Add(aResultComp, aShape);
-            aNumSubs++;
-          }
+    if (myTrsf.get()) { // get shape of the base result and apply the transformation
+      ResultPtr anOrigResult = baseRef();
+      std::shared_ptr<GeomAPI_Shape> anOrigShape = anOrigResult->shape();
+      if (anOrigShape.get()) {
+        TopoDS_Shape aShape = anOrigShape->impl<TopoDS_Shape>();
+        if (!aShape.IsNull()) {
+          aShape.Move(*(myTrsf.get()));
+          myShape = aShape;
+          aResult->setImpl(new TopoDS_Shape(aShape));
         }
       }
-      if (aNumSubs) {
-        myShape = aResultComp;
+      return aResult;
+    } else {
+      DocumentPtr aDoc = Model_ResultPart::partDoc();
+      if (aDoc.get() && aDoc->isOpened()) {
+        const std::string& aBodyGroup = ModelAPI_ResultBody::group();
+        TopoDS_Compound aResultComp;
+        BRep_Builder aBuilder;
+        aBuilder.MakeCompound(aResultComp);
+        int aNumSubs = 0;
+        for(int a = aDoc->size(aBodyGroup) - 1; a >= 0; a--) {
+          ResultPtr aBody = std::dynamic_pointer_cast<ModelAPI_Result>(aDoc->object(aBodyGroup, a));
+          // "object" method filters out disabled and concealed anyway, so don't check
+          if (aBody.get() && aBody->shape().get()) {
+            TopoDS_Shape aShape = *(aBody->shape()->implPtr<TopoDS_Shape>());
+            if (!aShape.IsNull()) {
+              aBuilder.Add(aResultComp, aShape);
+              aNumSubs++;
+            }
+          }
+        }
+        if (aNumSubs) {
+          myShape = aResultComp;
+        }
       }
     }
   }