[hamster-applet] bugs and cosmetic fixes
- From: Toms Baugis <tbaugis src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [hamster-applet] bugs and cosmetic fixes
- Date: Sun, 20 Dec 2009 18:12:16 +0000 (UTC)
commit 77a2171a78974fbb9ea01810e15b5306e4051455
Author: Toms Bauģis <toms baugis gmail com>
Date: Sun Dec 20 18:11:28 2009 +0000
bugs and cosmetic fixes
data/stats.ui | 19 +---
hamster/widgets/newtimeline.py | 303 ++++++++++++++++++++++------------------
2 files changed, 167 insertions(+), 155 deletions(-)
---
diff --git a/data/stats.ui b/data/stats.ui
index 80a0967..13b26c3 100644
--- a/data/stats.ui
+++ b/data/stats.ui
@@ -269,25 +269,10 @@
<property name="left_padding">12</property>
<property name="right_padding">12</property>
<child>
- <object class="GtkFrame" id="frame1">
+ <object class="GtkAlignment" id="by_day_box">
+ <property name="height_request">50</property>
<property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">in</property>
<child>
- <object class="GtkAlignment" id="alignment4">
- <property name="visible">True</property>
- <child>
- <object class="GtkAlignment" id="by_day_box">
- <property name="height_request">50</property>
- <property name="visible">True</property>
- <child>
- <placeholder/>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label_item">
<placeholder/>
</child>
</object>
diff --git a/hamster/widgets/newtimeline.py b/hamster/widgets/newtimeline.py
index ba3fdd1..ef7ad28 100644
--- a/hamster/widgets/newtimeline.py
+++ b/hamster/widgets/newtimeline.py
@@ -43,55 +43,175 @@ class NewTimeLine(graphics.Area):
def draw(self, facts, start_date, end_date):
- self.facts = facts
+ self.facts = facts
+
+ if start_date > end_date:
+ start_date, end_date = end_date, start_date
self.set_title(start_date, end_date) # we will forget about all our magic manipulations for the title
- # we will operate in minutes since and until the day start
- start_time = dt.datetime.combine(start_date, self.day_start.replace(minute=0))
- end_time = dt.datetime.combine(end_date, self.day_start.replace(minute=0)) + dt.timedelta(days = 1)
+ # for hourly representation we will operate in minutes since and until the day start
+ if end_date - start_date < dt.timedelta(days=2):
+ start_time = dt.datetime.combine(start_date, self.day_start.replace(minute=0))
+ end_time = dt.datetime.combine(end_date, self.day_start.replace(minute=0)) + dt.timedelta(days = 1)
- fact_start_time, fact_end_time = start_time, end_time
- if facts:
- fact_start_time = facts[0]["start_time"]
- fact_end_time = facts[-1]["start_time"] + facts[-1]["delta"]
+ fact_start_time, fact_end_time = start_time, end_time
+ if facts:
+ fact_start_time = facts[0]["start_time"]
+ fact_end_time = facts[-1]["start_time"] + facts[-1]["delta"]
+
+ self.start_time = min([start_time, fact_start_time])
+ self.end_time = max([end_time, fact_end_time])
- self.start_time = min([start_time, fact_start_time])
- self.end_time = max([end_time, fact_end_time])
+ else:
+ start_time = dt.datetime.combine(start_date, dt.time())
+ end_time = dt.datetime.combine(end_date, dt.time(23, 59))
+
+ fact_start_time, fact_end_time = start_time, end_time
+ if facts:
+ fact_start_time = dt.datetime.combine(facts[0]["date"], dt.time())
+ fact_end_time = dt.datetime.combine(facts[-1]["date"], dt.time())
+
+ self.start_time = min([start_time, fact_start_time])
+ self.end_time = max([end_time, fact_end_time])
- if self.start_time > self.end_time: # make sure end is after start
- self.start_time, self.end_time = self.end_time, self.start_time
days = (self.end_time - self.start_time).days
# determine fraction and do addittional start time move
- if days > 300:
+ if days > 180: # six month -> show per month
self.minor_tick = dt.timedelta(days = 30) #this is approximate and will be replaced by exact days in month
# make sure we start on first day of month
self.start_time = self.start_time - dt.timedelta(self.start_time.day - 1)
- elif days > 100:
+ elif days > 40: # bit more than month -> show per week
self.minor_tick = dt.timedelta(days = 7)
# make sure we start week on first day
#set to monday
self.start_time = self.start_time - dt.timedelta(self.start_time.weekday() + 1)
# look if we need to start on sunday or monday
self.start_time = self.start_time + dt.timedelta(stuff.locale_first_weekday())
-
- elif days > 2:
+ elif days > 2: # more than two days -> show per day
self.minor_tick = dt.timedelta(days = 1)
- else:
+ else: # show per hour
self.minor_tick = dt.timedelta(seconds = 60 * 60)
-
print self.start_time, self.end_time
+
self.count_hours()
+ self.redraw_canvas()
- self.redraw_canvas()
+ def on_expose(self):
+ self.context.set_line_width(1)
+
+ self.fill_area(0, 0, self.width, self.height, "#fafafa")
+ self.context.stroke()
+ self.rectangle(0, 0, self.width, self.height, "#666666")
+ self.context.stroke()
+
+ self.height = self.height - 1
+ graph_x = 2
+ graph_width = self.width - graph_x - 2
+
+ total_minutes = stuff.duration_minutes(self.end_time - self.start_time)
+ tick_minutes = stuff.duration_minutes(self.minor_tick)
+
+ bar_width = graph_width / (total_minutes / float(tick_minutes))
+
+ # the bars
+ x = graph_x
+ for current_time, total in self.tick_totals:
+ bar_size = round(self.height * total * 0.9)
+
+ self.fill_area(round(x) + 1, self.height - bar_size, round(bar_width) - 2, bar_size, "#eeeeee")
+ x += bar_width
+
+
+
+ # major ticks
+ if self.end_time - self.start_time < dt.timedelta(days=3): # about the same day
+ major_step = dt.timedelta(seconds = 60 * 60)
+ else:
+ major_step = dt.timedelta(days=1)
+
+ x = graph_x
+ major_tick_step = graph_width / (total_minutes / float(stuff.duration_minutes(major_step)))
+ current_time = self.start_time
+
+ def line(x, color):
+ self.context.move_to(round(x) + 0.5, 0)
+ self.set_color(color)
+ self.context.line_to(round(x) + 0.5, self.height)
+ self.context.stroke()
+
+ while current_time < self.end_time:
+ current_time += major_step
+ x += major_tick_step
+
+ if current_time >= self.end_time: # TODO - fix the loop so we don't have to break
+ break
+
+ if major_step < dt.timedelta(days=1): # about the same day
+ if current_time.time() == dt.time(0,0): # midnight
+ line(x, "#999999")
+ else:
+ if self.minor_tick == dt.timedelta(days=1): # week change
+ if current_time.weekday() == 0:
+ line(x, "#cccccc")
+
+ if self.minor_tick <= dt.timedelta(days=7): # month change
+ if current_time.day == 1:
+ line(x, "#333333")
+
+ # year change
+ if current_time.timetuple().tm_yday == 1: # year change
+ line(x, "#00ff00")
+
+
+ #minor ticks
+ if self.minor_tick >= dt.timedelta(days = 28): # month
+ step_format = "%b"
+
+ elif self.minor_tick == dt.timedelta(days = 7): # week
+ step_format = "%b %d"
+ elif self.minor_tick == dt.timedelta(days = 1): # day
+ step_format = "%a\n%d"
+ else:
+ step_format = "%H:%M"
+
+
+ x = graph_x
+ next_free = -1
+ current_time = self.start_time
+ for current_time, total in self.tick_totals:
+ self.set_color("#aaaaaa")
+ self.layout.set_text(current_time.strftime(step_format))
+ w, h = self.layout.get_pixel_size()
+
+
+ if x > next_free:
+ self.context.move_to(x + 2, self.height - h - 2)
+ self.context.show_layout(self.layout)
+ next_free = x + 2 + w
+
+ x += bar_width
+
+
+ self.set_color("#aaaaaa")
+ self.context.move_to(1, 1)
+ font = pango.FontDescription(gtk.Style().font_desc.to_string())
+ font.set_size(14 * pango.SCALE)
+ font.set_weight(pango.WEIGHT_BOLD)
+ self.layout.set_font_description(font)
+
+ self.layout.set_text(self.title)
+
+ self.context.show_layout(self.layout)
+
def count_hours(self):
#go through facts and make array of time used by our fraction
@@ -100,8 +220,7 @@ class NewTimeLine(graphics.Area):
current_time = self.start_time
minor_tick = self.minor_tick
- while current_time <= self.end_time:
-
+ while current_time < self.end_time:
# if minor tick is month, the starting date will have been
# already adjusted to the first
# now we have to make sure to move month by month
@@ -116,31 +235,34 @@ class NewTimeLine(graphics.Area):
tick_minutes = float(stuff.duration_minutes(self.minor_tick))
for fact in self.facts:
- end_time = fact["start_time"] + fact["delta"] # the thing about ongoing task - it has no end time
-
- # find in which fraction the fact starts and
- # add duration up to the border of tick to that fraction
- # then move cursor to the start of next fraction
- first_index = bisect_left(fractions, fact["start_time"]) - 1
- step_time = fractions[first_index]
- first_end = min(end_time, step_time + self.minor_tick)
- first_tick = stuff.duration_minutes(first_end - fact["start_time"]) / tick_minutes
-
- hours[first_index] += first_tick
- step_time = step_time + self.minor_tick
-
- # now go through ticks until we reach end of the time
- while step_time < end_time:
- index = bisect_left(fractions, step_time)
- interval = min([1, stuff.duration_minutes(end_time - step_time) / tick_minutes])
- hours[index] += interval
+ if self.minor_tick < dt.timedelta(1):
+ end_time = fact["start_time"] + fact["delta"] # the thing about ongoing task - it has no end time
- step_time += self.minor_tick
-
-
+ # find in which fraction the fact starts and
+ # add duration up to the border of tick to that fraction
+ # then move cursor to the start of next fraction
+ first_index = bisect_left(fractions, fact["start_time"]) - 1
+ step_time = fractions[first_index]
+ first_end = min(end_time, step_time + self.minor_tick)
+ first_tick = stuff.duration_minutes(first_end - fact["start_time"]) / tick_minutes
+
+ hours[first_index] += first_tick
+ step_time = step_time + self.minor_tick
+
+ # now go through ticks until we reach end of the time
+ while step_time < end_time:
+ index = bisect_left(fractions, step_time)
+ interval = min([1, stuff.duration_minutes(end_time - step_time) / tick_minutes])
+ hours[index] += interval
+
+ step_time += self.minor_tick
+ else:
+ hours[bisect_left(fractions, dt.datetime.combine(fact["date"], dt.time()))] += stuff.duration_minutes(fact["delta"])
+
+ print hours
# now normalize
max_hour = max(hours)
- hours = [hour / (max_hour or 1) for hour in hours]
+ hours = [hour / float(max_hour or 1) for hour in hours]
self.tick_totals = zip(fractions, hours)
@@ -176,99 +298,4 @@ class NewTimeLine(graphics.Area):
self.title = _(u"%(start_B)s %(start_d)s â?? %(end_d)s, %(end_Y)s") % dates_dict
- def on_expose(self):
- self.fill_area(0, 0, self.width, self.height, "#fafafa")
-
- total_minutes = stuff.duration_minutes(self.end_time - self.start_time)
- tick_minutes = stuff.duration_minutes(self.minor_tick)
-
- bar_width = self.width / (total_minutes / float(tick_minutes))
-
- self.context.translate(0.5, 0.5) #move half a pixel to get sharp lines (hypothetically)
-
- # the bars
- x = 1
- for current_time, total in self.tick_totals:
- bar_size = round(self.height * total * 0.9)
-
- self.fill_area(round(x), self.height - bar_size, round(bar_width * 0.9), bar_size, "#eeeeee")
- x += bar_width
-
-
-
- # major ticks
- if (self.end_time - self.start_time) < dt.timedelta(days=2): # about the same day
- major_step = dt.timedelta(seconds = 60 * 60)
- else:
- major_step = dt.timedelta(days=1)
-
- x = 1
- major_tick_step = self.width / (total_minutes / float(stuff.duration_minutes(major_step)))
- current_time = self.start_time
- while current_time <= self.end_time:
- if (self.end_time - self.start_time) < dt.timedelta(days=2): # about the same day
- if current_time.time() == dt.time(0,0):
- self.fill_area(round(x), 0, 1, self.height, "#666666")
-
- elif self.minor_tick == dt.timedelta(days=1): # when going day by day, tick on week, month and year change
- if current_time.weekday() == 0:
- self.fill_area(round(x), 0, 1, self.height, "#999999")
-
- elif current_time.day == 1:
- self.fill_area(round(x), 0, 1, self.height, "#666666")
-
- elif current_time.timetuple().tm_yday == 1:
- self.fill_area(round(x), 0, 1, self.height, "#00FF00")
-
- elif self.minor_tick == dt.timedelta(days=7): # when going week by week, tick on month and year change
- if current_time.day == 1:
- self.fill_area(round(x), 0, 1, self.height, "#666666")
-
- elif current_time.timetuple().tm_yday == 1:
- self.fill_area(round(x), 0, 1, self.height, "#00FF00")
-
- elif self.minor_tick >= dt.timedelta(days=28): # when going by month, tick on year change
- if current_time.timetuple().tm_yday == 1:
- self.fill_area(round(x), 0, 1, self.height, "#00FF00")
-
-
-
- current_time += major_step
- x += major_tick_step
-
-
-
- #minor ticks
- if self.minor_tick >= dt.timedelta(days = 28): # month
- step_format = "%b"
-
- elif self.minor_tick == dt.timedelta(days = 7): # week
- step_format = "%a\n%d"
- elif self.minor_tick == dt.timedelta(days = 1): # day
- step_format = "%a\n%d"
- else:
- step_format = "%H:%M"
-
-
- x = 1
- current_time = self.start_time
- for current_time, total in self.tick_totals:
- self.set_color("#aaaaaa")
- self.layout.set_text(current_time.strftime(step_format))
- self.context.move_to(x, self.height - self.layout.get_pixel_size()[1])
- self.context.show_layout(self.layout)
-
- x += bar_width
-
-
- self.set_color("#aaaaaa")
- self.context.move_to(1, 1)
- font = pango.FontDescription(gtk.Style().font_desc.to_string())
- font.set_size(14 * pango.SCALE)
- font.set_weight(pango.WEIGHT_BOLD)
- self.layout.set_font_description(font)
-
- self.layout.set_text(self.title)
-
- self.context.show_layout(self.layout)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
