Changeset 10422

Timestamp:

04/20/11 15:21:25 (14 years ago)

Author:

tbretz

Message:

Fixed the millisecond part of the time, the Time class expects microseconds; some changes to the order of the data members to ensure a proper destruction.

Location:

trunk/FACT++/src

Files:

• MessageDim.cc (modified) (2 diffs)
• MessageDim.h (modified) (2 diffs)

trunk/FACT++/src/MessageDim.cc

@@ -111 +111 @@
 //
 MessageDimRX::MessageDimRX(const std::string &name, MessageImp &imp)
-: fMsg(imp),
-fDimMessage(Form("%s/MESSAGE", name.c_str()).c_str(), const_cast<char*>(""), this),
-fConnected(false)
+: fMinLogLevel(0), fConnected(false), fMsg(imp),
+fDimMessage((name+"/MESSAGE").c_str(), const_cast<char*>(""), this)
 {
-    fMinLogLevel = 0;
 }
 
@@ -149 +147 @@
 
     // Write the received message to the output
-    fMsg.Write(Time(getInfo()->getTimestamp(), getInfo()->getTimestampMillisecs()),
+    fMsg.Write(Time(getInfo()->getTimestamp(), getInfo()->getTimestampMillisecs()*1000),
                msg.str().c_str(), getInfo()->getQuality());
 }

trunk/FACT++/src/MessageDim.h

@@ -28 +28 @@
 class MessageDimRX : public DimInfoHandler
 {
+private:
+    int  fMinLogLevel;
+    bool fConnected;
+
 protected:
     MessageImp &fMsg;
@@ -33 +37 @@
 private:
     DimStampedInfo fDimMessage;
-
-    int  fMinLogLevel;
-    bool fConnected;
 
 protected: