Started adding support for caches when reading data. Cache files for

[lib1wire.git] / src / DeviceData.hh

diff --git a/src/DeviceData.hh b/src/DeviceData.hh
index eb64b0662fb2f15a0404acdb2c3c42c39944c7fc..2c1641087814119a44197f4b0ce0294968ffc903 100644 (file)
--- a/src/DeviceData.hh
+++ b/src/DeviceData.hh
@@ -23,15 +23,15 @@ namespace w1 {
                        DeviceData(std::string device_id);
                        virtual ~DeviceData();
                        plp::DataRange *get_data_range();
-                       plp::Data *get_daily_summary(plp::Date *date, int calc_type);
+                       plp::DataRange *get_daily_summary(plp::Date *date, EnumSummaryCalculationType calc_type);
                        /**
                         * Get summary data calculated from the daily data items that is meaning full.
                         * Depending from the device type, it may be daily mean value, daily delta, highest value, etc...
                         */
-                       plp::Data *get_daily_summary(plp::Date *date);
+                       plp::DataRange *get_daily_summary(plp::Date *date);
                        plp::DataRange *get_daily_summary(plp::Date *start_date, plp::Date *end_date);
-                       std::vector<plp::Data *> *get_hourly_summary(plp::Date *date, int calc_type);
-                       std::vector<plp::Data *> *get_hourly_summary(plp::Date *date);
+                       plp::DataRange *get_hourly_summary(plp::Date *date, EnumSummaryCalculationType calc_type);
+                       plp::DataRange *get_hourly_summary(plp::Date *date);
                        plp::DataRange *get_hourly_summary(plp::Date *start_date, plp::Date *end_date);
                        plp::DataRange *get_data(plp::Date *start_date, plp::Date *end_date);
                protected:
@@ -39,9 +39,12 @@ namespace w1 {
                        std::string                     device_dir;
                        std::string                     device_ch_dir;
                        w1::DeviceConfig                *device_config;
-                       enum_summary_calculation        summary_calc_type;
+                       EnumSummaryCalculationType      summary_calc_type;
                        plp::Data *find_oldest_data(std::vector<std::string> year_vector);
                        plp::Data *find_newest_data(std::vector<std::string> year_vector);
+                       plp::DataRange *get_summary(plp::Date *date_param,
+                                       EnumSummaryCalculationType calc_type_param,
+                                       EnumSummaryPeriod period_type_param);
        };
 }