Adaptation to new model architecture

diff --git a/src/Model/Model_Document.cpp b/src/Model/Model_Document.cpp
index 210195844c039a2d894c5817cc4700bac4d14f5a..4c70838eb3b201d38c7ece084d59c7f75bf05bdd 100644 (file)
--- a/src/Model/Model_Document.cpp
+++ b/src/Model/Model_Document.cpp
@@ -222,6 +222,7 @@ void Model_Document::finishOperation()
   // just to be sure that everybody knows that changes were performed
   Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_CREATED));
   Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_UPDATED));
+  Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY));
   Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_DELETED));
 
   if (myNestedNum != -1) // this nested transaction is owervritten

diff --git a/src/XGUI/XGUI_Workshop.cpp b/src/XGUI/XGUI_Workshop.cpp
index a94804532d134af3ed4d9c6f55f618348a8c222f..4671c0d50fea90927f88fb4011e2f22d0e9cefa6 100644 (file)
--- a/src/XGUI/XGUI_Workshop.cpp
+++ b/src/XGUI/XGUI_Workshop.cpp
@@ -310,7 +310,12 @@ void XGUI_Workshop::onFeatureRedisplayMsg(const Model_ObjectUpdatedMessage* theM
     ObjectPtr aObj = (*aIt);
     ResultPtr aRes = boost::dynamic_pointer_cast<ModelAPI_Result>(aObj);
     if (aRes) {
-      isDisplayed = myDisplayer->redisplay(aRes, false);
+      if (aRes->data())
+        isDisplayed = myDisplayer->redisplay(aRes, false);
+      else {
+        myDisplayer->erase(aRes, false);
+        isDisplayed = true;
+      }
     }
   }
   if (isDisplayed)