Changeset 13835

Timestamp:

05/23/12 17:03:03 (13 years ago)

Author:

tbretz

Message:

Removed targetstate stuff; derived from DimInfoHandler; added infoHandler which will post the received data as events to the event loop.

Location:

trunk/FACT++/src

Files:

• StateMachineDim.cc (modified) (3 diffs)
• StateMachineDim.h (modified) (2 diffs)

trunk/FACT++/src/StateMachineDim.cc

@@ -21 +21 @@
 
 #include "EventDim.h"
+#include "ServiceDim.h"
 
 using namespace std;
@@ -81 +82 @@
 //! For parameter description see StateMachineImp.
 //!
-EventImp *StateMachineDim::CreateEvent(int targetstate, const char *name, const char *fmt)
-{
-    return new EventDim(targetstate, GetName()+"/"+name, fmt, this);
+EventImp *StateMachineDim::CreateEvent(const char *name, const char *fmt)
+{
+    return new EventDim(GetName()+"/"+name, fmt, this);
+}
+
+EventImp *StateMachineDim::CreateService(const char *name)
+{
+    return new ServiceDim(name, this);
 }
 
@@ -150 +156 @@
 {
     dim_unlock();
+}
+
+void StateMachineDim::infoHandler()
+{
+    DimInfo *inf = getInfo();
+    if (!inf)
+        return;
+
+    const EventImp *evt = dynamic_cast<EventImp*>(inf);
+
+    if (HasEvent(evt))
+        PostEvent(*evt);
 }
 

trunk/FACT++/src/StateMachineDim.h

@@ -54 +54 @@
 #include "StateMachine.h"     // StateMachien
 
-class StateMachineDim : public DimCommandHandler, public DimLog, public DimStart, public StateMachineImp
+class StateMachineDim : public DimCommandHandler, public DimInfoHandler, public DimLog, public DimStart, public StateMachineImp
 {
 private:
@@ -66 +66 @@
     void exitHandler(int code);  /// Overwritten DimCommand::exitHandler.
     void commandHandler();       /// Overwritten DimCommand::commandHandler 
+    void infoHandler();          /// Overwritten DimInfo::infoHandler
 
-    EventImp *CreateEvent(int targetstate, const char *name, const char *fmt);
+    EventImp *CreateEvent(const char *name, const char *fmt);
+    EventImp *CreateService(const char *name);
 
 protected: