Changeset 13831

Timestamp:

05/23/12 16:57:06 (13 years ago)

Author:

tbretz

Message:

Removed the target state; added fQoS; added time and QoS to copy constructor.

Location:

trunk/FACT++/src

Files:

• Event.cc (modified) (4 diffs)
• Event.h (modified) (2 diffs)

trunk/FACT++/src/Event.cc

@@ -17 +17 @@
 
 using namespace std;
-
-// --------------------------------------------------------------------------
-//
-//! Propagate the targetstate to the base class EventImp and store the
-//! name in fName and the format in fFormat. Initializes fTime to
-//! an invalid time.
-//!
-//! @param targetstate
-//!    Target state to be propagated to the base class constructor
-//!
-//! @param name
-//!    Name given to the event
-//!
-//! @param fmt
-//!    If the event has data attached (like arguments of commands)
-//!    the format can be given here. How the format string is defined
-//!    is defined within the dim libarary. It is used in console
-//!    and shell access to properly format the data sent with the event
-//!
-//! <B>From the dim manual:</B>
-//!    The format parameter specifies the contents of the structure in
-//!    the form T:N[;T:N]*[;T] where T is the item type: (I)nteger,
-//!    (C)haracter, (L)ong, (S)hort, (F)loat, (D)ouble, and N is the
-//!    number of such items. The type alone at the end means all
-//!    following items are of the same type. Example: "I:3;F:2;C" means
-//!    3 Integers, 2 Floats and Characters until the end. The format
-//!    parameter is used for communicating between different platforms.
-//!
-//
-Event::Event(int targetstate, const char *name, const char *fmt) : EventImp(targetstate),
-    fName(name), fFormat(fmt), fTime(Time::none)
-{
-}
 
 // --------------------------------------------------------------------------
@@ -76 +43 @@
 //
 Event::Event(const string &name, const char *fmt) :
-    fName(name), fFormat(fmt), fTime(Time::none)
+    fName(name), fFormat(fmt), fTime(Time::none), fQoS(0)
 {
 }
@@ -91 +58 @@
 Event::Event(const EventImp &evt) : EventImp(evt),
 fName(evt.GetName()), fFormat(evt.GetFormat()),
-fData(evt.GetText(), evt.GetText()+evt.GetSize()), fTime(evt.GetTime())
+fData(evt.GetText(), evt.GetText()+evt.GetSize()), fTime(evt.GetTime()),
+fQoS(evt.GetQoS())
 {
     const size_t pos = fName.find_first_of('/');
@@ -115 +83 @@
 Event::Event(const EventImp &evt, const char *ptr, size_t siz) : EventImp(evt),
 fName(evt.GetName()), fFormat(evt.GetFormat()),
-fData(ptr, ptr+siz)
+fData(ptr, ptr+siz), fTime(evt.GetTime()), fQoS(evt.GetQoS())
 {
     const size_t pos = fName.find_first_of('/');

trunk/FACT++/src/Event.h

@@ -14 +14 @@
 
     Time  fTime;              /// Time stamp
+    int   fQoS;               /// Quality of service
 
 public:
     /// Constructs an event as a combination of an EventImp and a DimCommand
-    Event(int targetstate, const char *name="", const char *fmt="");
     Event(const std::string &name, const char *fmt="");
     /// Copy constructor
@@ -34 +34 @@
     const void *GetData() const { return &*fData.begin(); }
     /// Return the size of the data
-    int         GetSize() const { return fData.size(); }
+    size_t      GetSize() const { return fData.size(); }
 
     /// Return reference to a time stamp
     Time GetTime() const { return fTime; }
+    int  GetQoS() const  { return fQoS; }