Changeset 11837 for trunk/FACT++/src/DimDescriptionService.h

Timestamp:

08/07/11 18:43:13 (13 years ago)

Author:

tbretz

Message:

Changed Dim services to ensure they send the time.

File:

• trunk/FACT++/src/DimDescriptionService.h (modified) (2 diffs)

trunk/FACT++/src/DimDescriptionService.h

@@ -2 +2 @@
 #define FACT_DimDescriptionService
 
+#include <array>
 #include <string>
 #include <vector>
 
+class Time;
 class DimService;
 
@@ -45 +47 @@
     }
 
-    template<class T>
-    void Update(const T &data)
+    void setData(const void *ptr, size_t sz)
     {
-        //cout << "Update: " << svc.getName() << " (" << sizeof(T) << ")" << endl;
-        setData(const_cast<T*>(&data), sizeof(T));
-        updateService();
+        DimService::setData(const_cast<void*>(ptr), sz);
     }
 
     template<typename T>
-    void Update(const std::vector<T> &data)
+    void setData(const std::vector<T> &data)
     {
-        //std::cout << "Update: " << getName() << " " << data.size() << " " << sizeof(T) << std::endl;
-        setData(const_cast<T*>(data.data()), data.size()*sizeof(T));
-        updateService();
+        setData(data.data(), data.size()*sizeof(T));
+    }
+
+    template<class T, size_t N>
+    void setData(const std::array<T, N> &data)
+    {
+        setData(data.data(), N*sizeof(T));
+    }
+
+    void setTime(const Time &t);
+    void setTime();
+
+    int Update();
+    int Update(const Time &t);
+    int Update(const std::string &data);
+    int Update(const char *data);
+
+    template<class T>
+    int Update(const T &data)
+    {
+        setData(&data, sizeof(T));
+        return Update();
+    }
+
+    template<typename T>
+    int Update(const std::vector<T> &data)
+    {
+        setData(data);
+        return Update();
+    }
+
+    template<class T, size_t N>
+    int Update(const std::array<T, N> &data)
+    {
+        setData(data);
+        return Update();
     }
 
     // FIXME: Implement callback with boost::function instead of Pointer to this
-
 };