Added support for cacheing monthly data.

[lib1wire.git] / src / Data.hh

diff --git a/src/Data.hh b/src/Data.hh
index 11c168d79440b8db859332a14cecb28753c8b647..07bea1aa4a5872fd4bfebe61741482b1911d7756 100644 (file)
--- a/src/Data.hh
+++ b/src/Data.hh
@@ -31,24 +31,29 @@ namespace plp {
                        static Data *parse_string(const std::string& data_str);
                        plp::Date get_date();
                        void set_date(plp::Date *date_param);
+                       int get_value_count();
+                       double get(int indx);
                        std::string get_unit();
                        std::valarray<double>   value_arr;
                private:
-                       plp::Date               date_time;
-                       std::string             unit;
+                       plp::Date       date_time;
+                       std::string     unit;
        };
 
        class DataRange {
                public:
+                       DataRange();
                        DataRange(Data *data);
+                       DataRange(DataRange *datarange);
                        DataRange(int item_count_per_value, std::string unit_param);
                        virtual ~DataRange();
-                       void add_data(Data *data);
-                       Data *get_data(int row_index);
-                       Data *get_first_data();
-                       Data *get_last_data();
-                       int get_data_row_count();
-                       int get_data_column_count();
+                       void add(Data *data);
+                       void add(DataRange *datarange);
+                       Data *get(int row_index);
+                       Data *get_first();
+                       Data *get_last();
+                       int get_count();
+                       int get_data_item_value_count();
                        std::string get_unit();
                        void printout();
                protected: