X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModelAPI%2FModelAPI_Feature.cpp;h=11431a82ca785772950256a647ceac9ec1193aee;hb=437ce7e2db9ab91af9c952596961941f54711d6e;hp=d9533e83e33d17c570bcc013ab65332f3be084dd;hpb=9db45503b9ec9a48ee30e9ea7ce14eb34c139d5e;p=modules%2Fshaper.git

diff --git a/src/ModelAPI/ModelAPI_Feature.cpp b/src/ModelAPI/ModelAPI_Feature.cpp
index d9533e83e..11431a82c 100644
--- a/src/ModelAPI/ModelAPI_Feature.cpp
+++ b/src/ModelAPI/ModelAPI_Feature.cpp
@@ -17,7 +17,7 @@ const std::list<std::shared_ptr<ModelAPI_Result> >& ModelAPI_Feature::results()
   return myResults;
 }
 
-std::shared_ptr<ModelAPI_Result> ModelAPI_Feature::firstResult()
+std::shared_ptr<ModelAPI_Result> ModelAPI_Feature::firstResult() const
 {
   return myResults.empty() ? std::shared_ptr<ModelAPI_Result>() : *(myResults.begin());
 }
@@ -29,22 +29,23 @@ std::shared_ptr<ModelAPI_Result> ModelAPI_Feature::lastResult()
 
 void ModelAPI_Feature::setResult(const std::shared_ptr<ModelAPI_Result>& theResult)
 {
-  if (firstResult() == theResult) {  // just updated
-    static Events_ID anEvent = Events_Loop::eventByName(EVENT_OBJECT_UPDATED);
-    ModelAPI_EventCreator::get()->sendUpdated(theResult, anEvent);
-    return;
-  }
-  // created
-  while (!myResults.empty()) {  // remove one by one with messages
-    std::shared_ptr<ModelAPI_Result> aRes = *(myResults.begin());
-    myResults.erase(myResults.begin());
-    ModelAPI_EventCreator::get()->sendDeleted(aRes->document(), aRes->groupName());
+  static Events_ID EVENT_UPD = Events_Loop::eventByName(EVENT_OBJECT_UPDATED);
+  static const ModelAPI_EventCreator* aECreator = ModelAPI_EventCreator::get();
+
+  if (firstResult() == theResult) {
+    // nothing to change
+  } else if (!myResults.empty()) {  // all except first become disabled
+    std::list<std::shared_ptr<ModelAPI_Result> >::iterator aResIter = myResults.begin();
+    *aResIter = theResult;
+    aECreator->sendUpdated(theResult, EVENT_UPD);
+    for(aResIter++; aResIter != myResults.end(); aResIter++) {
+      (*aResIter)->setDisabled((*aResIter), true);
+    }
+  } else {
+    myResults.push_back(theResult);
   }
-  myResults.push_back(theResult);
-  static Events_ID anEvent = Events_Loop::eventByName(EVENT_OBJECT_CREATED);
-  ModelAPI_EventCreator::get()->sendUpdated(theResult, anEvent);
-  // Create event for first Feature 
-  Events_Loop::loop()->flush(anEvent);
+  // in any case result becomes enabled
+  theResult->setDisabled(theResult, false);
 }
 
 void ModelAPI_Feature::setResult(const std::shared_ptr<ModelAPI_Result>& theResult,
@@ -56,80 +57,73 @@ void ModelAPI_Feature::setResult(const std::shared_ptr<ModelAPI_Result>& theResu
   }
   if (aResIter == myResults.end()) {  // append
     myResults.push_back(theResult);
-    static Events_ID anEvent = Events_Loop::eventByName(EVENT_OBJECT_CREATED);
-    ModelAPI_EventCreator::get()->sendUpdated(theResult, anEvent);
-    // Create event for first Feature, send it to make "created" earlier than "updated"
-    // VSV: Commenting out of this statement causes problems with circle operation for example
-    Events_Loop::loop()->flush(anEvent);
   } else {  // update
     *aResIter = theResult;
-    static Events_ID anEvent = Events_Loop::eventByName(EVENT_OBJECT_UPDATED);
-    ModelAPI_EventCreator::get()->sendUpdated(theResult, anEvent);
   }
+  theResult->setDisabled(theResult, false);
 }
 
 void ModelAPI_Feature::removeResult(const std::shared_ptr<ModelAPI_Result>& theResult)
+{
+  theResult->setDisabled(theResult, true);
+  // flush visualisation changes
+  static Events_Loop* aLoop = Events_Loop::loop();
+  static Events_ID aRedispEvent = aLoop->eventByName(EVENT_OBJECT_TO_REDISPLAY);
+  aLoop->flush(aRedispEvent);
+}
+
+void ModelAPI_Feature::eraseResultFromList(const std::shared_ptr<ModelAPI_Result>& theResult)
 {
   std::list<std::shared_ptr<ModelAPI_Result> >::iterator aResIter = myResults.begin();
   for(; aResIter != myResults.end(); aResIter++) {
     ResultPtr aRes = *aResIter;
     if (aRes == theResult) {
       std::string aGroup = aRes->groupName();
+      aRes->setDisabled(aRes, true); // for complex results to disable all subs
       aRes->data()->erase();
       myResults.erase(aResIter);
 
-      static Events_ID anEvent = Events_Loop::eventByName(EVENT_OBJECT_DELETED);
       static Events_Loop* aLoop = Events_Loop::loop();
       static Events_ID EVENT_DISP = aLoop->eventByName(EVENT_OBJECT_TO_REDISPLAY);
       static const ModelAPI_EventCreator* aECreator = ModelAPI_EventCreator::get();
-      ModelAPI_EventCreator::get()->sendDeleted(document(), aGroup);
+      aECreator->sendDeleted(document(), aGroup);
       aECreator->sendUpdated(aRes, EVENT_DISP);
       break;
     }
   }
 }
 
-void ModelAPI_Feature::removeResults(const int theSinceIndex)
+void ModelAPI_Feature::removeResults(const int theSinceIndex, const bool theFlush)
 {
-  if (theSinceIndex == 0) {
-    eraseResults();
-    return;
-  }
-
   std::list<std::shared_ptr<ModelAPI_Result> >::iterator aResIter = myResults.begin();
   for(int anIndex = 0; anIndex < theSinceIndex && aResIter != myResults.end(); anIndex++)
     aResIter++;
+
+  std::string aGroup;
   std::list<std::shared_ptr<ModelAPI_Result> >::iterator aNextIter = aResIter;
-  for(; aNextIter != myResults.end(); aNextIter++) {
-    static Events_ID anEvent = Events_Loop::eventByName(EVENT_OBJECT_DELETED);
+  while( aNextIter != myResults.end()) {
+    aGroup = (*aNextIter)->groupName();
+    // remove previously erased results: to enable later if needed only actual (of history change)
+    if (theSinceIndex == 0 && (*aNextIter)->isDisabled()) {
+      aNextIter = myResults.erase(aNextIter);
+    } else {
+      (*aNextIter)->setDisabled(*aNextIter, true); // just disable results
+      aNextIter++;
+    }
+  }
+  if (!aGroup.empty() && theFlush) {
+    // flush visualisation changes
     static Events_Loop* aLoop = Events_Loop::loop();
-    static Events_ID EVENT_DISP = aLoop->eventByName(EVENT_OBJECT_TO_REDISPLAY);
-    static const ModelAPI_EventCreator* aECreator = ModelAPI_EventCreator::get();
-    ModelAPI_EventCreator::get()->sendDeleted(document(), (*aNextIter)->groupName());
-    aECreator->sendUpdated(*aNextIter, EVENT_DISP);
+    static Events_ID aRedispEvent = aLoop->eventByName(EVENT_OBJECT_TO_REDISPLAY);
+    aLoop->flush(aRedispEvent);
+    static Events_ID aDelEvent = aLoop->eventByName(EVENT_OBJECT_DELETED);
+    aLoop->flush(aDelEvent);
   }
-  myResults.erase(aResIter, myResults.end());
 }
 
 void ModelAPI_Feature::eraseResults()
 {
-  if (!myResults.empty()) {
-    static Events_Loop* aLoop = Events_Loop::loop();
-    static Events_ID EVENT_DISP = aLoop->eventByName(EVENT_OBJECT_TO_REDISPLAY);
-    static const ModelAPI_EventCreator* aECreator = ModelAPI_EventCreator::get();
-
-    std::list<std::shared_ptr<ModelAPI_Result> >::iterator aResIter = myResults.begin();
-    for(; aResIter != myResults.end(); aResIter++) {
-      (*aResIter)->data()->erase();
-      ModelAPI_EventCreator::get()->sendDeleted(document(), (*aResIter)->groupName());
-      aECreator->sendUpdated(*aResIter, EVENT_DISP);
-    }
-    myResults.clear();
-    // flush it to avoid left presentations after input of invalid arguments (radius=0)
-    static Events_ID anEvent = Events_Loop::eventByName(EVENT_OBJECT_DELETED);
-    Events_Loop::loop()->flush(anEvent);
-    Events_Loop::loop()->flush(EVENT_DISP);
-  }
+  removeResults(0);
 }
 
 const std::string& ModelAPI_Feature::documentToAdd()
@@ -141,15 +135,20 @@ const std::string& ModelAPI_Feature::documentToAdd()
 
 void ModelAPI_Feature::erase()
 {
+  // if this is the current feature, make the upper feature as current before removing
+  if (document().get() && document()->currentFeature(false).get() == this) {
+    document()->setCurrentFeatureUp();
+  }
+
   static Events_Loop* aLoop = Events_Loop::loop();
   static Events_ID EVENT_DISP = aLoop->eventByName(EVENT_OBJECT_TO_REDISPLAY);
   static const ModelAPI_EventCreator* aECreator = ModelAPI_EventCreator::get();
 
   while (!myResults.empty()) {  // remove one by one with messages
     std::shared_ptr<ModelAPI_Result> aRes = *(myResults.begin());
-    myResults.erase(myResults.begin());
-    aECreator->sendDeleted(aRes->document(), aRes->groupName());
-    aECreator->sendUpdated(aRes, EVENT_DISP);
+    aRes->setDisabled(aRes, true); // to avoid activation of the Part result
+    if (!myResults.empty()) // disabling result may erase the list (on undo of Part, issue 665)
+      myResults.erase(myResults.begin());
   }
   ModelAPI_Object::erase();
 }
@@ -171,3 +170,36 @@ FeaturePtr ModelAPI_Feature::feature(ObjectPtr theObject)
   }
   return aFeature;
 }
+
+bool ModelAPI_Feature::isMacro() const
+{
+  return false;
+}
+
+bool ModelAPI_Feature::setDisabled(const bool theFlag)
+{
+  if (myIsDisabled != theFlag) {
+    myIsDisabled = theFlag;
+    if (myIsDisabled) {
+      removeResults(0, false); // flush will be in setCurrentFeature
+    } else {
+      // enable all disabled previously results
+      std::list<std::shared_ptr<ModelAPI_Result> >::iterator aResIter = myResults.begin();
+      for(; aResIter != myResults.end(); aResIter++) {
+        (*aResIter)->setDisabled(*aResIter, false);
+      }
+    }
+    return true;
+  }
+  return false;
+}
+
+bool ModelAPI_Feature::isDisabled() const
+{
+  return myIsDisabled;
+}
+
+bool ModelAPI_Feature::isPreviewNeeded() const
+{
+  return true;
+}