Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hours sum and percentage of viewed time period in Totals view #348

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Hours sum and percentage of viewed time period in Totals view #348

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
342c71d
Hours sum and percentage of viewed time period in Totals view
HWiese1980 Aug 7, 2017
c5f5e66
FIX: strip() categories, activities and tags (remove leading/trailing…
HWiese1980 Aug 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 22 additions & 5 deletions src/hamster/overview.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ def __init__(self, **kwargs):
self.layout.set_markup("Hamster") # dummy
self.label_height = self.layout.get_pixel_size()[1]

self._total = dt.timedelta()
self._max = 0

def set_values(self, values):
Expand All @@ -210,23 +211,31 @@ def set_values(self, values):
self.height = len(self.values) * 14
self._max = max(rec[1] for rec in values) if values else 0

def set_total(self, total):
self._total = total

def _draw(self, context, opacity, matrix):
g = graphics.Graphics(context)
g.save_context()
g.translate(self.x, self.y)

hours = [(value.days * 24.0 + value.seconds / 3600.0 ) for _,value in self.values]
total = self._total.days * 24.0 + self._total.seconds / 3600.0

for i, (label, value) in enumerate(self.values):
percent = 100.0 * hours[i] / total
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No error checking if self._total is not set (i.e. zero); in that case there will be a division by zero error here!

label += " (%3.2fh; %3.1f%%)" % (hours[i], percent)
g.set_color("#333")
self.layout.set_markup(stuff.escape_pango(label))
label_w, label_h = self.layout.get_pixel_size()

y = int(i * label_h * 1.5)
g.move_to(100 - label_w, y)
g.move_to(180 - label_w, y)
pangocairo.show_layout(context, self.layout)

w = (self.alloc_w - 110) * value.total_seconds() / self._max.total_seconds()
w = (self.alloc_w - 200) * value.total_seconds() / self._max.total_seconds()
w = max(1, int(round(w)))
g.rectangle(110, y, int(w), int(label_h))
g.rectangle(190, y, int(w), int(label_h))
g.fill("#999")

g.restore_context()
Expand Down Expand Up @@ -287,21 +296,29 @@ def __init__(self):

def set_facts(self, facts):
totals = defaultdict(lambda: defaultdict(dt.timedelta))
total_sums = defaultdict(lambda: dt.timedelta())
for fact in facts:
for key in ('category', 'activity'):
totals[key][getattr(fact, key)] += fact.delta
totals[key][getattr(fact, key).strip()] += fact.delta
total_sums[key] += fact.delta

for tag in fact.tags:
totals["tag"][tag] += fact.delta
totals["tag"][tag.strip()] += fact.delta
total_sums["tag"] += fact.delta


for key, group in totals.iteritems():
totals[key] = sorted(group.iteritems(), key=lambda x: x[1], reverse=True)
self.totals = totals

self.activities_chart.set_values(totals['activity'])
self.activities_chart.set_total(total_sums['activity'])

self.categories_chart.set_values(totals['category'])
self.categories_chart.set_total(total_sums['category'])

self.tag_chart.set_values(totals['tag'])
self.tag_chart.set_total(total_sums['tag'])

self.stacked_bar.set_items([(cat, delta.total_seconds() / 60.0) for cat, delta in totals['category']])
self.category_totals.markup = ", ".join("<b>%s:</b> %s" % (stuff.escape_pango(cat), stuff.format_duration(hours)) for cat, hours in totals['category'])
Expand Down