hamster-applet r831 - trunk/hamster
- From: tbaugis svn gnome org
- To: svn-commits-list gnome org
- Subject: hamster-applet r831 - trunk/hamster
- Date: Wed, 4 Mar 2009 01:53:11 +0000 (UTC)
Author: tbaugis
Date: Wed Mar 4 01:53:10 2009
New Revision: 831
URL: http://svn.gnome.org/viewvc/hamster-applet?rev=831&view=rev
Log:
experimental dragging around in the overview graph
Modified:
trunk/hamster/charting.py
trunk/hamster/stats.py
Modified: trunk/hamster/charting.py
==============================================================================
--- trunk/hamster/charting.py (original)
+++ trunk/hamster/charting.py Wed Mar 4 01:53:10 2009
@@ -22,6 +22,10 @@
horizontal bar charts. This library is not intended for scientific graphs.
More like some visual clues to the user.
+DISCLAIMER: It is a bit of a minefield because it has been created and tweaked
+around hamster, so if you decide to use this lib in your own project, please do
+not be afraid to file bugs against it in hamster, and i'll see what i can do!
+
For graph options see the Chart class and Chart.plot function
Author: toms baugis gmail com
@@ -165,13 +169,82 @@
self.labels_at_end = args.get("labels_at_end", False)
self.framerate = args.get("framerate", 60)
+ # more data from left side function
+ self.more_on_left = args.get("more_on_left", None)
+ self.less_on_left = args.get("less_on_left", None)
+ self.min_key_count = args.get("min_key_count", None)
+
+
+ if self.more_on_left:
+ self.drag_start, self.move_type = None, None
+ self.set_events(gtk.gdk.EXPOSURE_MASK
+ | gtk.gdk.LEAVE_NOTIFY_MASK
+ | gtk.gdk.BUTTON_PRESS_MASK
+ | gtk.gdk.BUTTON_RELEASE_MASK
+ | gtk.gdk.POINTER_MOTION_MASK
+ | gtk.gdk.POINTER_MOTION_HINT_MASK)
+ self.connect("button_release_event", self.on_mouse_release)
+ self.connect("motion_notify_event", self.on_mouse_move)
+
#and some defaults
self.current_max = None
self.integrators = []
self.moving = False
+ self.drag_x = 0
+ self.before_drag_animate = None
+
+
+
+ def on_mouse_release(self, area, event):
+ #TODO - when mouse is released, reset graph_x to the current bar
+ if not self.drag_start:
+ return
+ self.drag_x = 0
+ self.drag_start, self.move_type = None, None
+ self.animate = self.before_drag_animate
+ self.redraw_canvas()
+
+
+ def on_mouse_move(self, area, event):
+ if event.is_hint:
+ x, y, state = event.window.get_pointer()
+ else:
+ x = event.x
+ y = event.y
+ state = event.state
+
+ mouse_down = state & gtk.gdk.BUTTON1_MASK
+
+ if mouse_down and not self.drag_start:
+ self.before_drag_animate = self.animate
+ self.animate = False
+ self.drag_start = x
+ self.move_type = "left_side"
+
+ if self.move_type == "left_side":
+ #the "give me more" gesture on left side
+ self.drag_x = x - self.drag_start
+ if self.drag_x < 0 and len(self.keys) <= self.min_key_count:
+ self.drag_x = 0
+
+ #we are going for more, if we have dragged out previous one!
+ if self.graph_x >= self.legend_width:
+ self.drag_x = 0
+ self.drag_start = x
+ self.more_on_left()
+ return
+
+ if self.drag_x <= -self.legend_width and len(self.keys) > self.min_key_count:
+ self.drag_x = 0
+ self.drag_start = x
+ self.less_on_left()
+ return
+ self.redraw_canvas()
+
+
def draw_bar(self, x, y, w, h, color = None):
""" draws a simple bar"""
base_color = color or self.bar_base_color or (220, 220, 220)
@@ -221,6 +294,7 @@
integrators[i].finish()
finish_all(self.integrators)
+ self.current_max.finish()
self.redraw_canvas()
@@ -306,7 +380,7 @@
scale_labels = [self.value_format % i
for i in range(grid_stride, int(self.max_value), grid_stride)]
- legend_width = self.legend_width or self.longest_label(scale_labels)
+ self.legend_width = legend_width = self.legend_width or self.longest_label(scale_labels)
else:
legend_width = self.legend_width
@@ -326,19 +400,37 @@
self.chart_background)
+
+ if self.more_on_left:
+ #if there is more on left, clip the first one so we can preload it
+
+ bar_width = min(self.graph_width / float(len(self.keys) - 1),
+ self.max_bar_width)
+ gap = bar_width * 0.05
+
+ z = (1 - 1.0 / len(self.keys))
+ z = z * z
+
+ self.graph_x = legend_width - bar_width + self.drag_x
+ self.graph_width = self.width - self.graph_x - 10
+
+ self.context.stroke()
+
+ bar_width = min(self.graph_width / float(len(self.keys)),
+ self.max_bar_width)
+ gap = bar_width * 0.05
+
# flip hamster.graphics matrix so we don't think upside down
self.set_value_range(y_max = 0, y_min = self.graph_height)
# bars and keys
max_bar_size = self.graph_height
#make sure bars don't hit the ceiling
- if self.animate:
+ if self.animate or self.before_drag_animate:
max_bar_size = self.graph_height - 10
- bar_width = min(self.graph_width / float(len(self.keys)),
- self.max_bar_width)
- gap = bar_width * 0.05
+
prev_label_end = None
self.layout.set_width(-1)
@@ -354,7 +446,7 @@
self.move_to(intended_x, -4)
context.show_layout(self.layout)
- prev_label_end = intended_x + label_w + 10
+ prev_label_end = intended_x + label_w + 3
bar_start = 0
@@ -375,6 +467,12 @@
[col - (j * 22) for col in base_color])
+
+
+ #fill with white background (necessary for those dragging cases)
+ if self.background:
+ self.fill_area(0, 0, legend_width, self.height, self.background)
+
#white grid and scale values
self.layout.set_width(-1)
if self.grid_stride and self.max_value:
@@ -391,14 +489,14 @@
if self.show_scale:
self.layout.set_text(self.value_format % i)
label_w, label_h = self.layout.get_pixel_size()
- context.move_to(self.graph_x - label_w - 8,
+ context.move_to(legend_width - label_w - 8,
self.get_pixel(y_value=y) - label_h / 2)
set_color(context, medium[8])
context.show_layout(self.layout)
- set_color(context, (255,255,255))
- self.move_to(0, y)
- self.line_to(self.graph_width, y)
+ set_color(context, (255, 255, 255))
+ self.context.move_to(legend_width, self.get_pixel(y_value=y))
+ self.context.line_to(self.width, self.get_pixel(y_value=y))
#stack keys
Modified: trunk/hamster/stats.py
==============================================================================
--- trunk/hamster/stats.py (original)
+++ trunk/hamster/stats.py Wed Mar 4 01:53:10 2009
@@ -70,7 +70,10 @@
show_scale = True,
max_bar_width = 35,
grid_stride = 4,
- legend_width = 20)
+ legend_width = 20,
+ more_on_left = self.more_on_left,
+ less_on_left = self.less_on_left,
+ min_key_count = 8)
self.get_widget("totals_by_day").add(self.day_chart)
@@ -93,9 +96,9 @@
dt.timedelta(self.view_date.weekday() + 1)
# look if we need to start on sunday or monday
self.start_date = self.start_date + \
- dt.timedelta(self.locale_first_weekday())
+ dt.timedelta(self.locale_first_weekday() - 1)
- self.end_date = self.start_date + dt.timedelta(6)
+ self.end_date = self.start_date + dt.timedelta(7)
self.week_view = self.get_widget("week")
@@ -132,6 +135,16 @@
"""
self.do_graph()
+ def more_on_left(self):
+ z = min(round((self.end_date - self.start_date).days / 21.0)+1, 5)
+ self.start_date = self.start_date - dt.timedelta(days = z)
+ self.do_graph()
+
+ def less_on_left(self):
+ z = min(round((self.end_date - self.start_date).days / 21.0)+1, 5)
+ self.start_date = self.start_date + dt.timedelta(days=z)
+ self.do_graph()
+
def setup_tree(self):
def parent_painter(column, cell, model, iter):
cell_text = model.get_value(iter, 1)
@@ -444,8 +457,8 @@
self.view_date = dt.date.today()
if self.week_view.get_active():
self.start_date = self.view_date - dt.timedelta(self.view_date.weekday() + 1)
- self.start_date = self.start_date + dt.timedelta(self.locale_first_weekday())
- self.end_date = self.start_date + dt.timedelta(6)
+ self.start_date = self.start_date + dt.timedelta(self.locale_first_weekday() -1)
+ self.end_date = self.start_date + dt.timedelta(7)
elif self.month_view.get_active():
self.start_date = self.view_date - dt.timedelta(self.view_date.day - 1) #set to beginning of month
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
