started adding support for reading average and sum data...

[lib1wire.git] / src / W1DataList.hh

diff --git a/src/W1DataList.hh b/src/W1DataList.hh
index 7823876083ffc5915a0b14b32e39ac3ef97a40ec..dd2259a0a6f07faf36a436c13a2d164b5afd8768 100644 (file)
--- a/src/W1DataList.hh
+++ b/src/W1DataList.hh
@@ -10,21 +10,11 @@
 
 #include <string>
 #include <vector>
-#include <time.h>
 
-struct Data {
-       public:
-               virtual ~Data();
-               struct tm               *date_time;
-               std::vector<double>     data_list;
-};
+#include "Data.hh"
+#include "Date.hh"
 
-struct DataRange {
-       public:
-               virtual ~DataRange();
-               Data    *first_data;
-               Data    *last_data;
-};
+#include <time.h>
 
 namespace w1 {
        class W1DataList {
@@ -32,9 +22,14 @@ namespace w1 {
                        W1DataList(std::string device_id);
                        virtual ~W1DataList();
                        DataRange *get_data_range();
+                       Data *get_avg_day_data(plp::Date *date);
+                       DataRange *get_avg_day_data(plp::Date *start_date, plp::Date *end_date);
+                       DataRange *get_data(plp::Date *start_date, plp::Date *end_date);
                protected:
                        std::string     device_id;
                        std::string     device_dir;
+                       std::string     device_ch_dir;
+                       std::string get_day_data(plp::Date *date);
                        Data *find_first_data(std::vector<std::string> year_vector);
                        Data *find_last_data(std::vector<std::string> year_vector);