X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=src%2FDeviceData.hh;h=2c1641087814119a44197f4b0ce0294968ffc903;hb=d01194ab9275bc97176071089edc2781bb4de51b;hp=eb64b0662fb2f15a0404acdb2c3c42c39944c7fc;hpb=56242039f27dc5d36117b8d513731c7a9009d4b1;p=lib1wire.git

diff --git a/src/DeviceData.hh b/src/DeviceData.hh
index eb64b06..2c16410 100644
--- 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);
 	};
 }