python/bicycle-statistics
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: python:7d7ca2b48f26d34fb8491d229fe0bad1443fc40f
Branches Tags
python:master
..
compare: python:38a3454dbc8fde44c9cfa4f720ea65682961d3c5
Branches Tags
python:master

1 Commits
7d7ca2b48f ... 38a3454dbc

Author SHA1 Message Date
Thomas Klaehn
38a3454dbc bicycle-statistics: add accumulated distances view 2019-06-16 08:34:37 +02:00
2 changed files with 5 additions and 7 deletions
Show Stats Expand all files Collapse all files

4
bicycle_statistics/__main__.py
View File

@ -13,8 +13,8 @@ LOG_FORMAT = "%(asctime)s %(levelname)s %(message)s"
UPDATE_INTERVAL = 60 UPDATE_INTERVAL = 60
logging.basicConfig(format=LOG_FORMAT, level=log_level, filename=LOG_FILE) # logging.basicConfig(format=LOG_FORMAT, level=log_level, filename=LOG_FILE)
# logging.basicConfig(format=LOG_FORMAT, level=log_level) logging.basicConfig(format=LOG_FORMAT, level=log_level)
log = logging.getLogger('bicycle-statistics') log = logging.getLogger('bicycle-statistics')
def parse_args(): def parse_args():

8
gpx2html/__init__.py
View File

@ -107,10 +107,8 @@ class Gpx2Html(object):
self.logger.info("Begin update of png's/html...") self.logger.info("Begin update of png's/html...")
distances = list() distances = list()
avg_speeds = list() avg_speeds = list()
distances_dict = dict()
for year in self.tracks.years(): for year in self.tracks.years():
distances.append(self.tracks.distances(year)) distances.append(self.tracks.distances(year))
distances_dict[year] = self.tracks.distances(year)
avg_speeds.append(self.tracks.avg_speeds(year)) avg_speeds.append(self.tracks.avg_speeds(year))
self.logger.info("{}: {}".format(year, self.tracks.distances)) self.logger.info("{}: {}".format(year, self.tracks.distances))
@ -123,6 +121,7 @@ class Gpx2Html(object):
os.path.join(self.outfolder, 'avg_spd.png')) os.path.join(self.outfolder, 'avg_spd.png'))
# Accumulated distance: # Accumulated distance:
distances_dict = self.tracks.__distance
accumulated_distances = dict() accumulated_distances = dict()
for year in distances_dict.keys(): for year in distances_dict.keys():
accumulated_distance = list() accumulated_distance = list()
@ -138,9 +137,8 @@ class Gpx2Html(object):
current_year_distance.append(accumulated_distances[current_year][i]) current_year_distance.append(accumulated_distances[current_year][i])
accumulated_distances[current_year] = current_year_distance accumulated_distances[current_year] = current_year_distance
plot_line_chart(accumulated_distances, MONTH_LABELS, plot_line_chart(accumulated_distances, MONTH_LABELS, "accumulated distance", 'Month', 'km', 'acc_dist.png')
"accumulated distance", 'Month', 'km',
os.path.join(self.outfolder, 'acc_dist.png'))
end_date = datetime.datetime.today() end_date = datetime.datetime.today()
start_date = end_date - datetime.timedelta(days=14) start_date = end_date - datetime.timedelta(days=14)