Update SketchBuilder to work on faces with holes (issue #1320)

[modules/shaper.git] / src / ModelAPI / ModelAPI_Result.cpp

diff --git a/src/ModelAPI/ModelAPI_Result.cpp b/src/ModelAPI/ModelAPI_Result.cpp
index 25b97c3a92a98c778a660327c3099fac00e11e78..cefbd7af8310d7d2119ced6737c347304fc2e5e3 100644 (file)
--- a/src/ModelAPI/ModelAPI_Result.cpp
+++ b/src/ModelAPI/ModelAPI_Result.cpp
@@ -18,6 +18,7 @@ bool ModelAPI_Result::setDisabled(std::shared_ptr<ModelAPI_Result> theThis, cons
 {
   if (myIsDisabled != theFlag) {
     myIsDisabled = theFlag;
+    data()->setIsDeleted(theFlag); // store it in data model (t oget back on undo/redo, etc)
     // this must be before "updated" message send to have history updated for OB update
     document()->updateHistory(groupName()); // to update the history cash data in the document
     // generate related events
@@ -36,8 +37,11 @@ bool ModelAPI_Result::setDisabled(std::shared_ptr<ModelAPI_Result> theThis, cons
   return false;
 }
 
-bool ModelAPI_Result::isDisabled() const
+bool ModelAPI_Result::isDisabled()
 {
+  if (myIsDisabled != data()->isDeleted())
+    setDisabled(std::dynamic_pointer_cast<ModelAPI_Result>(
+      data()->owner()), data()->isDeleted()); // restore from the data model the correct value
   return myIsDisabled;
 }
 
@@ -50,8 +54,17 @@ void ModelAPI_Result::setIsConcealed(const bool theValue)
 {
   if (myIsConcealed != theValue) {
     myIsConcealed = theValue;
-    if (document().get()) // can be on creation of result
+    if (document().get()) { // can be on creation of result
       document()->updateHistory(groupName()); // to update the history cash data in the document
+      if (myIsConcealed) {
+        ModelAPI_EventCreator::get()->sendDeleted(document(), groupName());
+        static Events_ID kDispEvent = Events_Loop::loop()->eventByName(EVENT_OBJECT_TO_REDISPLAY);
+        ModelAPI_EventCreator::get()->sendUpdated(data()->owner(), kDispEvent);
+      } else {
+        static Events_ID kEventCreated = Events_Loop::eventByName(EVENT_OBJECT_CREATED);
+        ModelAPI_EventCreator::get()->sendUpdated(data()->owner(), kEventCreated);
+      }
+    }
   }
 }
 
@@ -68,3 +81,9 @@ void ModelAPI_Result::attributeChanged(const std::string& theID)
   static const ModelAPI_EventCreator* aECreator = ModelAPI_EventCreator::get();
   aECreator->sendUpdated(data()->attribute(theID)->owner(), EVENT_DISP);
 }
+
+void ModelAPI_Result::init()
+{
+  myIsDisabled = true; // by default it is not initialized and false to be after created
+  myIsConcealed = false;
+}