light9 Changeset - e2dd0992a195

Changeset - e2dd0992a195

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Drew Perttula - 13 years ago 2012-06-13 05:35:04
drewp@bigasterisk.com

working on canvas focus
Ignore-this: 74ae0771fc58d43373c2bafa15539251

1 file changed with 59 insertions and 19 deletions:

light9/curvecalc/curveview.py

0 comments (0 inline, 0 general)

light9/curvecalc/curveview.py

➞

Show inline comments

@@ @@ -148,26 +148,61 @@ class Curveview(object): @@
         """
         if hasattr(self, 'widget'):
             self.widget.destroy()
             print "rebuilding canvas"
         self.timelineLine = self.curveGroup = None
         self.widget = goocanvas.Canvas()
         self.widget.set_property("background-color", "black")
         self.size = self.widget.get_allocation()
         self.root = self.widget.get_root_item()
         self.widget = gtk.EventBox()
         self.widget.set_can_focus(True)
         self.widget.add_events(gtk.gdk.KEY_PRESS_MASK |
                                gtk.gdk.FOCUS_CHANGE_MASK)
         self.onFocusOut()
         box = gtk.VBox()
         box.set_border_width(1)
         self.widget.add(box)
         box.show()
         self.canvas = goocanvas.Canvas()
         box.pack_start(self.canvas)
         self.canvas.show()
         self.canvas.set_property("background-color", "black")
         self.size = self.canvas.get_allocation()
         self.root = self.canvas.get_root_item()
         self.canvas.connect("size-allocate", self.update_curve)
         self.canvas.connect("expose-event", self.onExpose)
         self.widget.connect("size-allocate", self.update_curve)
         self.widget.connect("expose-event", self.onExpose)
         self.canvas.connect("leave-notify-event", self.onLeave)
         self.canvas.connect("enter-notify-event", self.onEnter)
         self.canvas.connect("motion-notify-event", self.onMotion)
         self.canvas.connect("scroll-event", self.onScroll)
         self.canvas.connect("button-release-event", self.onRelease)
         self.root.connect("button-press-event", self.onCanvasPress)
         self.widget.connect("key-press-event", self.onKeyPress)
         self.widget.connect("focus-in-event", self.onFocusIn)
         self.widget.connect("focus-out-event", self.onFocusOut)
         self.widget.connect("event", self.onAny)
         self.widget.connect("leave-notify-event", self.onLeave)
         self.widget.connect("enter-notify-event", self.onEnter)
         self.widget.connect("motion-notify-event", self.onMotion)
         self.widget.connect("scroll-event", self.onScroll)
         self.widget.connect("button-release-event", self.onRelease)
         self.root.connect("button-press-event", self.onCanvasPress)
     def onAny(self, w, event):
         print "   %s on %s" % (event, w)
     def onFocusIn(self, *args):
         print "focusin", args
         self.widget.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse("red"))
     def onFocusOut(self, widget=None, event=None):
         #if event:
         #    import pdb;pdb.set_trace()
         print "focusout now", event.get_state() if event else 0
     def onKeyPress(self, *args):
         print "canvas key", args
     def onExpose(self, *args):
         if self.culled:
             self.update_curve()
     def onDelete(self):
@@ @@ -178,12 +213,17 @@ class Curveview(object): @@
     def onCanvasPress(self, item, target_item, event):
         # when we support multiple curves per canvas, this should find
         # the close one and add a point to that. Binding to the line
         # itself is probably too hard to hit. Maybe a background-color
         # really thick line would be a nice way to allow a sloppier
         # click
         print "focus on", self.widget
         self.widget.grab_focus()
         print "done grab"
         if event.get_state() & gtk.gdk.CONTROL_MASK:
             self.new_point_at_mouse(event)
         elif event.get_state() & gtk.gdk.SHIFT_MASK:
             self.sketch_press(event)
         else:
             self.select_press(event)
@@ @@ -196,13 +236,13 @@ class Curveview(object): @@
         todo: there should be a faint timecursor line under the mouse
         so it's more obvious that we use that time for some
         events. Rt-click should include Ctrl+P as 'play/pause from
         here'
         """
-        # maybe self.widget.get_pointer would be ok for this? i didn't try it
+        # maybe self.canvas.get_pointer would be ok for this? i didn't try it
         if self.entered:
             t = self.world_from_screen(self.lastMouseX, 0)[0]
             return t
         return None
     def goLive(self):
@@ @@ -349,38 +389,38 @@ class Curveview(object): @@
                                  outline='#800000',
                                  tags=('knob',))
                 dispatcher.send("knob out", value=prevKey[1], curve=self.curve)
     def canvasIsVisible(self):
         if not hasattr(self, "scrollWin"):
-            self.scrollWin = self.widget
+            self.scrollWin = self.canvas
             while not isinstance(self.scrollWin, gtk.ScrolledWindow):
                 self.scrollWin = self.scrollWin.get_parent()
         sw = self.scrollWin
         top = sw.get_toplevel()
         visy1 = sw.translate_coordinates(top, 0, 0)[1]
         visy2 = visy1 + sw.get_allocation().height
-        coords = self.widget.translate_coordinates(top, 0, 0)
+        coords = self.canvas.translate_coordinates(top, 0, 0)
         if not coords: # probably broken after a reload()
             return False
         cany1 = coords[1]
-        cany2 = cany1 + self.widget.get_allocation().height
+        cany2 = cany1 + self.canvas.get_allocation().height
         return not (cany2 < visy1 or cany1 > visy2)
     def update_curve(self, *args):
         if not self.redrawsEnabled:
             return
         if not self.canvasIsVisible():
             self.culled = True
             return
         self.culled = False
-        self.size = self.widget.get_allocation()
+        self.size = self.canvas.get_allocation()
         cp = self.curve.points
         visible_x = (self.world_from_screen(0,0)[0],
                      self.world_from_screen(self.size.width, 0)[0])
         visible_idxs = self.curve.indices_between(visible_x[0], visible_x[1],
@@ @@ -389,13 +429,13 @@ class Curveview(object): @@
         if getattr(self, 'curveGroup', None):
             self.curveGroup.remove()
         self.curveGroup = goocanvas.Group(parent=self.root)
         # this makes gtk quietly stop working. Getting called too early?
-        #self.widget.set_property("background-color",
+        #self.canvas.set_property("background-color",
         #                         "gray20" if self.curve.muted else "black")
         if self.size.height < 40:
             #self._draw_gradient()
             self._draw_line(visible_points, area=True)
         else:
@@ @@ -479,13 +519,13 @@ class Curveview(object): @@
                        text=label)
     def _draw_line(self, visible_points, area=False):
         linepts=[]
         step=1
         linewidth = 1.5
-        maxPointsToDraw = self.size.width / 3
+        maxPointsToDraw = self.size.width / 2
         if len(visible_points) > maxPointsToDraw:
             step = int(len(visible_points) / maxPointsToDraw)
             linewidth = .8
         for p in visible_points[::step]:
             x,y = self.screen_from_world(p)
             linepts.append((int(x) + .5, int(y) + .5))

0 comments (0 inline, 0 general)