[pitivi] curve.py: shift curve upward
- From: Edward Hervey <edwardrv src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [pitivi] curve.py: shift curve upward
- Date: Mon, 8 Feb 2010 16:48:03 +0000 (UTC)
commit 6c090303c4c2c74b6874f8c66271d48ba8506f5f
Author: Brandon Lewis <brandon_lewis alum berkeley edu>
Date: Mon Jan 25 13:36:27 2010 -0800
curve.py: shift curve upward
pitivi/ui/curve.py | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/pitivi/ui/curve.py b/pitivi/ui/curve.py
index a20bf8b..8f41595 100644
--- a/pitivi/ui/curve.py
+++ b/pitivi/ui/curve.py
@@ -47,11 +47,11 @@ KW_MOUSE_WIDTH = KW_WIDTH2 + 1
KW_MOUSE_HEIGHT = KW_HEIGHT2 + 1
KW_LABEL_X_OFFSET = KW_WIDTH2 + 5
KW_LABEL_Y_OFFSET = -10
+KW_LABEL_OVERFLOW = 10
KW_LABEL_HPAD = 4
KW_LABEL_VPAD = 4
KW_LABEL_HPAD2 = KW_LABEL_VPAD / 2
KW_LABEL_VPAD2 = KW_LABEL_VPAD / 2
-
CURVE_STROKE_WIDTH = 2.0
HAND = gtk.gdk.Cursor(gtk.gdk.HAND2)
@@ -117,8 +117,9 @@ class Curve(goocanvas.ItemSimple, goocanvas.Item, View, Zoomable):
bounds = view.bounds
time = (Zoomable.pixelToNs(pos[0] - bounds.x1) +
view.element.in_point)
- value = ((1 - (pos[1] - bounds.y1 - view._min) / view._range) *
- interpolator.range) + interpolator.lower
+ value = ((1 - (pos[1] - KW_LABEL_OVERFLOW - bounds.y1 -
+ view._min) / view._range) *
+ interpolator.range) + interpolator.lower
return time, value
def enter(self, item ,target):
@@ -143,6 +144,7 @@ class Curve(goocanvas.ItemSimple, goocanvas.Item, View, Zoomable):
self.interpolator = interpolator
self._focused_kf = None
self.normal()
+ self.set_simple_transform(0, -KW_LABEL_OVERFLOW, 1.0, 0)
## properties
@@ -193,13 +195,14 @@ class Curve(goocanvas.ItemSimple, goocanvas.Item, View, Zoomable):
cr.identity_matrix()
if self.element.factory:
self.bounds = goocanvas.Bounds(0, 0,
- Zoomable.nsToPixel(self.element.duration), self.height)
+ Zoomable.nsToPixel(self.element.duration), self.height +
+ KW_LABEL_OVERFLOW)
def _getKeyframeXY(self, kf):
interp = self.interpolator
x = self.nsToPixel(kf.time - self.element.in_point)
- y = self._range - (((kf.value - interp.lower) / interp.range) *
- self._range)
+ y = KW_LABEL_OVERFLOW + self._range - (((kf.value -
+ interp.lower) / interp.range) * self._range)
return point.Point(x + self.bounds.x1, y + self.bounds.y1 + self._min)
def _controlPoint(self, cr, kf):
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]