Issue #2155 Trim removes multi-rotation constraint, undo leads to wrong DOF

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

diff --git a/src/Model/Model_ResultPart.cpp b/src/Model/Model_ResultPart.cpp
index 0a4422ad125769af3799c094179083b46d3bb313..2beb5f56213aa4cfca6d278abfa126cf349aa37c 100644 (file)
--- a/src/Model/Model_ResultPart.cpp
+++ b/src/Model/Model_ResultPart.cpp
@@ -20,6 +20,8 @@
 #include <Events_Loop.h>
 #include <ModelAPI_Events.h>
 
+#include <GeomAPI_Trsf.h>
+
 #include <TNaming_Tool.hxx>
 #include <TNaming_NamedShape.hxx>
 #include <TDataStd_Name.hxx>
@@ -41,12 +43,12 @@ void Model_ResultPart::initAttributes()
 
   if (aDocRef->isInitialized() && // initialized immideately means already exist and will be loaded
       !Model_Application::getApplication()->hasDocument(aDocRef->docId()))
-    Model_Application::getApplication()->setLoadByDemand(data()->name());
+    Model_Application::getApplication()->setLoadByDemand(data()->name(), aDocRef->docId());
 }
 
 std::shared_ptr<ModelAPI_Document> Model_ResultPart::partDoc()
 {
-  if (myTrsf.get()) {
+  if (myTrsf.get() && baseRef().get()) { // the second condition is to to #2035
     return baseRef()->partDoc();
   }
   DocumentPtr aRes = data()->document(DOC_REF())->value();
@@ -65,11 +67,11 @@ void Model_ResultPart::activate()
   }
 
   std::shared_ptr<ModelAPI_AttributeDocRef> aDocRef = data()->document(DOC_REF());
-  
+
   // 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()) { 
+  if (!aMgr->isOperation()) {
     // open transaction even document is not created to set current docs in setActiveDocument
     aMgr->startOperation("Activation");
     isNewTransaction = true;
@@ -97,13 +99,13 @@ void Model_ResultPart::activate()
 
 std::shared_ptr<ModelAPI_ResultPart> Model_ResultPart::original()
 {
-  if (myTrsf.get()) {
+  if (myTrsf.get() && baseRef().get()) {  // the second condition is to to #2035
     return baseRef()->original();
   }
   return std::dynamic_pointer_cast<ModelAPI_ResultPart>(data()->owner());
 }
 
-bool Model_ResultPart::isActivated() 
+bool Model_ResultPart::isActivated()
 {
   if (myTrsf.get()) {
     if (!baseRef().get()) // may be on close
@@ -175,7 +177,7 @@ std::shared_ptr<GeomAPI_Shape> Model_ResultPart::shape()
         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()) {
+          if (aBody.get() && aBody->data()->isValid() && aBody->shape().get()) {
             TopoDS_Shape aShape = *(aBody->shape()->implPtr<TopoDS_Shape>());
             if (!aShape.IsNull()) {
               aBuilder.Add(aResultComp, aShape);
@@ -244,7 +246,7 @@ std::string Model_ResultPart::nameInPart(const std::shared_ptr<GeomAPI_Shape>& t
   if (!aDoc.get()) // the part document is not presented for the moment
     return "";
   TDF_Label anAccessLabel = aDoc->generalLabel();
-  // make the selection attribute anyway: 
+  // make the selection attribute anyway:
   // otherwise just by name it is not stable to search the result
   std::string aName;
   // for this the context result is needed
@@ -356,7 +358,7 @@ void Model_ResultPart::updateShape()
   myTrsf.reset();
 }
 
-void Model_ResultPart::setTrsf(std::shared_ptr<ModelAPI_Result> theThis, 
+void Model_ResultPart::setTrsf(std::shared_ptr<ModelAPI_Result> theThis,
     const std::shared_ptr<GeomAPI_Trsf>& theTransformation)
 {
   updateShape();