From b41149d34b1f816e59328cea9cb5633424aff0e8 Mon Sep 17 00:00:00 2001 From: vsv Date: Tue, 15 Jul 2014 19:05:47 +0400 Subject: [PATCH] Adaptation to new model architecture --- src/Model/Model_Document.cpp | 1 + src/XGUI/XGUI_Workshop.cpp | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Model/Model_Document.cpp b/src/Model/Model_Document.cpp index 210195844..4c70838eb 100644 --- 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 a94804532..4671c0d50 100644 --- 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(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) -- 2.39.2