Changeset 11085 for trunk/FACT++/gui/FactGui.h

Timestamp:

06/20/11 22:43:08 (13 years ago)

Author:

tbretz

Message:

Some cleanup of DimData

File:

• trunk/FACT++/gui/FactGui.h (modified) (4 diffs)

trunk/FACT++/gui/FactGui.h

@@ -705 +705 @@
     struct DimData
     {
-        Time time;
-        int  qos;
-        string name;
-        string format;
-        vector<char> data;
-
-        DimInfo *info;  // this is ONLY for a fast check of the type of the DimData!!
+        const int          qos;
+        const string       name;
+        const string       format;
+        const vector<char> data;
+        const Time         time;
+
+        Time extract(DimInfo *inf) const
+        {
+            // Must be called in exactly this order!
+            const int tsec = inf->getTimestamp();
+            const int tms  = inf->getTimestampMillisecs();
+
+            return Time(tsec, tms*1000);
+        }
+
+//        DimInfo *info;  // this is ONLY for a fast check of the type of the DimData!!
 
         DimData(DimInfo *inf) :
@@ -718 +727 @@
             format(inf->getFormat()),
             data(inf->getString(), inf->getString()+inf->getSize()),
-            info(inf)
-        {
-            // Must be called in exactly this order!
-            const int tsec = inf->getTimestamp();
-            const int tms  = inf->getTimestampMillisecs();
-
-            time = Time(tsec, tms*1000);
+            time(extract(inf))/*,
+            info(inf)*/
+        {
         }
 
@@ -736 +741 @@
                 const T &ref(uint32_t offset=0) const { return *reinterpret_cast<const T*>(data.data()+offset); }
 
-        vector<char> vec(int b) const { return vector<char>(data.begin()+b, data.end()); }
-        string str(unsigned int b) const { return b>=data.size()?string():string(data.data()+b, data.size()-b); }
+//        vector<char> vec(int b) const { return vector<char>(data.begin()+b, data.end()); }
+//        string str(unsigned int b) const { return b>=data.size()?string():string(data.data()+b, data.size()-b); }
         const char *c_str() const { return (char*)data.data(); }
-
+/*
         vector<boost::any> any() const
         {
@@ -745 +750 @@
             conv.Print();
             return conv.GetAny(data.data(), data.size());
-        }
+        }*/
         size_t size() const { return data.size(); }
     };