Changeset 13948 for trunk/FACT++

Timestamp:

05/28/12 10:45:17 (13 years ago)

Author:

tbretz

Message:

Revised the order of callback etc.

File:

• trunk/FACT++/src/DimState.h (modified) (5 diffs)

trunk/FACT++/src/DimState.h

@@ -37 +37 @@
     }
 
-    virtual void Handler(const EventImp &evt)
+    void HandlerImp(const EventImp &evt)
     {
         const bool disconnected = evt.GetSize()==0;
@@ -44 +44 @@
 
         msg = disconnected ? "" : evt.GetString();
-
+    }
+
+    void Callback(const EventImp &evt)
+    {
         if (fCallback)
             fCallback(evt);
     }
+
+    virtual void Handler(const EventImp &evt)
+    {
+        HandlerImp(evt);
+        Callback(evt);
+    }
+
 
     const Time &time() const { return info.first; }
@@ -127 +137 @@
     void Handler(const EventImp &evt)
     {
-        DimState::Handler(evt);
+        HandlerImp(evt);
 
         info.second = evt.GetSize()==4 ? evt.GetInt() : -256;
         if (info.second==0)
             info.second=-256;
+
+        Callback(evt);
     }
 
@@ -168 +180 @@
     void Handler(const EventImp &evt)
     {
-        DimState::Handler(evt);
+        HandlerImp(evt);
 
         shortmsg    = msg;
@@ -197 +209 @@
         shortmsg.erase(p0, p3-p0);
 
+        Callback(evt);
+
         const auto func = fCallbacks.find(file);
         if (func==fCallbacks.end())