Shape plane filter should process shapes of objects selected in object browser.

[modules/shaper.git] / src / Events / Events_LongOp.cpp

diff --git a/src/Events/Events_LongOp.cpp b/src/Events/Events_LongOp.cpp
index 04fc6734e2d0e19df013377db89ee509ed4f87a4..35558de6a5b75deba4f6e81586905b23e9ccc0c0 100644 (file)
--- a/src/Events/Events_LongOp.cpp
+++ b/src/Events/Events_LongOp.cpp
@@ -1,3 +1,5 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 // File:        Events_LongOp.cpp
 // Created:     29 Jul 2014
 // Author:      Mikhail PONIKAROV
@@ -10,7 +12,7 @@
 std::map<void*, int> MY_SENDERS;
 
 Events_LongOp::Events_LongOp(void* theSender)
- : Events_Message(Events_LongOp::errorID(), theSender)
+    : Events_Message(Events_LongOp::eventID(), theSender)
 {
 }
 
@@ -18,7 +20,7 @@ Events_LongOp::~Events_LongOp()
 {
 }
 
-Events_ID Events_LongOp::errorID()
+Events_ID Events_LongOp::eventID()
 {
   Events_Loop* aLoop = Events_Loop::loop();
   return aLoop->eventByName("LongOperation");
@@ -26,25 +28,36 @@ Events_ID Events_LongOp::errorID()
 
 void Events_LongOp::start(void* theSender)
 {
-  if (MY_SENDERS.empty()) {
-    Events_LongOp anError(theSender);
-    Events_Loop::loop()->send(anError);
-  }
+  bool toSend = MY_SENDERS.empty();
   if (MY_SENDERS.find(theSender) == MY_SENDERS.end())
     MY_SENDERS[theSender] = 1;
-  else 
+  else
     MY_SENDERS[theSender]++;
+
+  if (toSend) {
+    std::shared_ptr<Events_Message> aNewOne = 
+      std::shared_ptr<Events_Message>(new Events_LongOp(theSender));
+    Events_Loop::loop()->send(aNewOne);
+  }
 }
 
 void Events_LongOp::end(void* theSender)
 {
   if (MY_SENDERS.find(theSender) != MY_SENDERS.end()) {
     int aCount = MY_SENDERS[theSender];
-    if (aCount <= 1) MY_SENDERS.erase(theSender);
-    else MY_SENDERS[theSender] = aCount - 1;
+    if (aCount <= 1)
+      MY_SENDERS.erase(theSender);
+    else
+      MY_SENDERS[theSender] = aCount - 1;
   }
   if (MY_SENDERS.empty()) {
-    Events_LongOp anError(theSender);
-    Events_Loop::loop()->send(anError);
+    std::shared_ptr<Events_Message> aNewOne = 
+      std::shared_ptr<Events_Message>(new Events_LongOp(theSender));
+    Events_Loop::loop()->send(aNewOne);
   }
 }
+
+bool Events_LongOp::isPerformed()
+{
+  return !MY_SENDERS.empty();
+}