Changeset - e94989da079c
Parent rev.
Child rev.
[Not reviewed]
default
0 2 0
drewp@bigasterisk.com - 13 years ago 2012-06-10 21:05:57
drewp@bigasterisk.com
more curve editor bindings. delete signal isn't done
Ignore-this: e81c81134cd87f3633821841c4ec8dac
2 files changed with 61 insertions and 36 deletions:
bin/curvecalc
3
light9/curvecalc/curveview.py
58
36
0 comments (0 inline, 0 general)
bin/curvecalc
➞
Show inline comments
 
@@ -109,12 +109,15 @@ class Main(object):
 
    def onQuit(self, *args):
 
        reactor.crash()
 
        # there's a hang after this, maybe in sem_wait in two
 
        # threads. I don't know whose they are.
 
        os.kill(os.getpid(), signal.SIGKILL)
 

			




	
	
	
		
 
    def onDelete(self, *args):

			




	
	
	
		
 
        self.curvesetView.onDelete()

			




	
	
	
		
 

			




	
	
	
		
 
    def onPythonConsole(self, item):

			




	
	
	
		
 
        togglePyConsole(self, item, self.__dict__)

			




	
	
	
		
 
        

			




	
	
	
		
 
    def onSeeCurrentTime(self, item):

			




	
	
	
		
 
        dispatcher.send("see time")

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    light9/curvecalc/curveview.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -106,32 +106,33 @@ class Curveview(object):

			




	
	
	
		
 

			




	
	
	
		
 
        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)

			




	
	
	
		
 

			




	
	
	
		
 
        # todo: hold control to get a [+] cursor

			




	
	
	
		
 
        #        def curs(ev):

			




	
	
	
		
 
        #            print ev.state

			




	
	
	
		
 
        #        self.bind("<KeyPress>",curs)

			




	
	
	
		
 
        #        self.bind("<KeyRelease-Control_L>",lambda ev: curs(0))

			




	
	
	
		
 
        

			




	
	
	
		
 
        if 0:

			




	
	
	
		
 

			




	
	
	
		
 
            for x in range(1, 6):

			




	
	
	
		
 
                def add_kb_marker_point(evt, x=x):

			




	
	
	
		
 
                    self.add_point((self.current_time(), (x - 1) / 4.0))

			




	
	
	
		
 

			




	
	
	
		
 
                self.bind("<Key-%s>" % x, add_kb_marker_point)

			




	
	
	
		
 

			




	
	
	
		
 
        # this binds on c-a-b1, etc

			




	
	
	
		
 
        if 0:

			




	
	
	
		
 
            self.regionzoom = RegionZoom(self, self.world_from_screen,

			




	
	
	
		
 
                                         self.screen_from_world)

			




	
	
	
		
 

			




	
	
	
		
 
        self.sketch = None # an in-progress sketch

			




	
	
	
		
 
        if 0:

			




	
	
	
		
 
            self.bind("<Shift-ButtonPress-1>", self.sketch_press)

			




	
	
	
		
 
            self.bind("<Shift-B1-Motion>", self.sketch_motion)

			




	
	
	
		
 
            self.bind("<Shift-ButtonRelease-1>", self.sketch_release)

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
        self.dragging_dots = False

			




	
	
	
		
 
        self.selecting = False

			




	
	
	
		
 
        if 0:

			




	
	
	
		
 
            self.bind("<ButtonPress-1>",#"<Alt-Key>",

			




	
	
	
		
 
                      self.select_press, add=True)

			




	
	
		
 
@@ -142,12 +143,32 @@ class Curveview(object):

			




	
	
	
		
 
            self.bind("<ButtonPress-1>", self.check_deselect, add=True)

			




	
	
	
		
 

			




	
	
	
		
 
            self.bind("<Key-m>", lambda *args: self.curve.toggleMute())

			




	
	
	
		
 
            self.bind("<Key-c>", lambda *args: dispatcher.send('toggle collapse',

			




	
	
	
		
 
                                                               sender=self.curve))

			




	
	
	
		
 

			




	
	
	
		
 
    def onDelete(self):

			




	
	
	
		
 
        if self.selected_points:

			




	
	
	
		
 
            self.remove_point_idx(*self.selected_points)

			




	
	
	
		
 
        

			




	
	
	
		
 

			




	
	
	
		
 
    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

			




	
	
	
		
 
        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)

			




	
	
	
		
 

			




	
	
	
		
 
            

			




	
	
	
		
 

			




	
	
	
		
 
    def playPause(self):

			




	
	
	
		
 
        """

			




	
	
	
		
 
        user has pressed ctrl-p over a curve view, possibly this

			




	
	
	
		
 
        one. Returns the time under the mouse if we know it, or else

			




	
	
	
		
 
        None

			




	
	
	
		
 

			




	
	
		
 
@@ -210,13 +231,13 @@ class Curveview(object):

			




	
	
	
		
 
        self.print_state("select_press")

			




	
	
	
		
 
        if self.dragging_dots:

			




	
	
	
		
 
            return

			




	
	
	
		
 
        if not self.selecting:

			




	
	
	
		
 
            self.selecting = True

			




	
	
	
		
 
            self.select_start = self.world_from_screen(ev.x,0)[0]

			




	
	
	
		
 
            cursors.push(self,"gumby")

			




	
	
	
		
 
            #cursors.push(self,"gumby")

			




	
	
	
		
 
        

			




	
	
	
		
 
    def select_motion(self,ev):

			




	
	
	
		
 
        if not self.selecting:

			




	
	
	
		
 
            return

			




	
	
	
		
 
        start = self.select_start

			




	
	
	
		
 
        cur = self.world_from_screen(ev.x, 0)[0]

			




	
	
		
 
@@ -227,13 +248,13 @@ class Curveview(object):

			




	
	
	
		
 

			




	
	
	
		
 
        # dotrelease never gets called, but I can clear that state here

			




	
	
	
		
 
        self.dragging_dots = False

			




	
	
	
		
 
        

			




	
	
	
		
 
        if not self.selecting:

			




	
	
	
		
 
            return

			




	
	
	
		
 
        cursors.pop(self)

			




	
	
	
		
 
        #cursors.pop(self)

			




	
	
	
		
 
        self.selecting = False

			




	
	
	
		
 
        self.select_between(self.select_start,

			




	
	
	
		
 
                            self.world_from_screen(ev.x,0)[0])

			




	
	
	
		
 

			




	
	
	
		
 
    def sketch_press(self,ev):

			




	
	
	
		
 
        self.sketch = Sketch(self,ev)

			




	
	
		
 
@@ -305,17 +326,15 @@ class Curveview(object):

			




	
	
	
		
 
        visible_points = [cp[i] for i in visible_idxs]

			




	
	
	
		
 

			




	
	
	
		
 
        if getattr(self, 'curveGroup', None):

			




	
	
	
		
 
            self.curveGroup.remove()

			




	
	
	
		
 
        self.curveGroup = goocanvas.Group(parent=self.root)

			




	
	
	
		
 

			




	
	
	
		
 
        if 0:

			




	
	
	
		
 
            if self.curve.muted:

			




	
	
	
		
 
                self['bg'] = 'grey20'

			




	
	
	
		
 
            else:

			




	
	
	
		
 
                self['bg'] = 'black'

			




	
	
	
		
 
        # this makes gtk quietly stop working. Getting called too early?

			




	
	
	
		
 
        #self.widget.set_property("background-color",

			




	
	
	
		
 
        #                         "gray20" if self.curve.muted else "black")

			




	
	
	
		
 

			




	
	
	
		
 
        if self.size.height < .40:

			




	
	
	
		
 
            self._draw_gradient()

			




	
	
	
		
 
        else:

			




	
	
	
		
 
            self._draw_markers(visible_x)

			




	
	
	
		
 
            self._draw_line(visible_points)

			




	
	
		
 
@@ -403,48 +422,41 @@ class Curveview(object):

			




	
	
	
		
 
        linewidth = 1.5

			




	
	
	
		
 
        maxPointsToDraw = self.size.width / 2

			




	
	
	
		
 
        if len(visible_points) > maxPointsToDraw:

			




	
	
	
		
 
            step = int(len(visible_points) / maxPointsToDraw)

			




	
	
	
		
 
            linewidth = .8

			




	
	
	
		
 
        for p in visible_points[::step]:

			




	
	
	
		
 
            linepts.append(self.screen_from_world(p))

			




	
	
	
		
 
            x,y = self.screen_from_world(p)

			




	
	
	
		
 
            linepts.append((int(x) + .5, y))

			




	
	
	
		
 

			




	
	
	
		
 
        if self.curve.muted:

			




	
	
	
		
 
            fill = 'grey34'

			




	
	
	
		
 
        else:

			




	
	
	
		
 
            fill = 'white'

			




	
	
	
		
 

			




	
	
	
		
 
        self.pl = goocanvas.Polyline(parent=self.curveGroup,

			




	
	
	
		
 
                                     points=goocanvas.Points(linepts),

			




	
	
	
		
 
                                     line_width=linewidth,

			




	
	
	
		
 
                                     stroke_color=fill,

			




	
	
	
		
 
                                     )

			




	
	
	
		
 
            

			




	
	
	
		
 
        # canvas doesnt have keyboard focus, so i can't easily change the

			




	
	
	
		
 
        # cursor when ctrl is pressed

			




	
	
	
		
 
        #        def curs(ev):

			




	
	
	
		
 
        #            print ev.state

			




	
	
	
		
 
        #        self.bind("<KeyPress>",curs)

			




	
	
	
		
 
        #        self.bind("<KeyRelease-Control_L>",lambda ev: curs(0))

			




	
	
	
		
 
        if 0:

			




	
	
	
		
 
            self.tag_bind(line,"<Control-ButtonPress-1>",self.new_point_at_mouse)

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
    def _draw_handle_points(self,visible_idxs,visible_points):

			




	
	
	
		
 
        for i,p in zip(visible_idxs,visible_points):

			




	
	
	
		
 
            rad=3

			




	
	
	
		
 
            worldp = p

			




	
	
	
		
 
            p = self.screen_from_world(p)

			




	
	
	
		
 
            dot = goocanvas.Rect(parent=self.curveGroup,

			




	
	
	
		
 
                                 x=p[0] - rad, y=p[1] - rad,

			




	
	
	
		
 
                                 x=int(p[0] - rad) + .5,

			




	
	
	
		
 
                                 y=int(p[1] - rad) + .5,

			




	
	
	
		
 
                                 width=rad * 2, height=rad * 2,

			




	
	
	
		
 
                                 stroke_color='gray90',

			




	
	
	
		
 
                                 fill_color='blue',

			




	
	
	
		
 
                                 line_width=1,

			




	
	
	
		
 
                                 #tags=('curve','point', 'handle%d' % i)

			




	
	
	
		
 
                                 )

			




	
	
	
		
 

			




	
	
	
		
 
            if worldp[1] == 0:

			




	
	
	
		
 
                rad += 3

			




	
	
	
		
 
                goocanvas.Ellipse(parent=self.curveGroup,

			




	
	
	
		
 
                                  center_x=p[0],

			




	
	
	
		
 
                                  center_y=p[1],

			




	
	
	
		
 
                                  radius_x=rad,

			




	
	
		
 
@@ -458,20 +470,12 @@ class Curveview(object):

			




	
	
	
		
 
            #              lambda ev,i=i: self.dotpress(ev,i))

			




	
	
	
		
 
            #self.tag_bind('handle%d' % i, "<Key-d>",

			




	
	
	
		
 
            #              lambda ev, i=i: self.remove_point_idx(i))

			




	
	
	
		
 
                      

			




	
	
	
		
 
            self.dots[i]=dot

			




	
	
	
		
 

			




	
	
	
		
 
        def delpoint(ev):

			




	
	
	
		
 
            # had a hard time tag_binding to the points, so i trap at

			




	
	
	
		
 
            # the widget level (which might be nice anyway when there

			




	
	
	
		
 
            # are multiple pts selected)

			




	
	
	
		
 
            if self.selected_points:

			




	
	
	
		
 
                self.remove_point_idx(*self.selected_points)

			




	
	
	
		
 
        #self.bind("<Key-Delete>", delpoint)

			




	
	
	
		
 

			




	
	
	
		
 
        self.highlight_selected_dots()

			




	
	
	
		
 

			




	
	
	
		
 
    def find_index_near(self,x,y):

			




	
	
	
		
 
        tags = self.gettags(self.find_closest(x, y))

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            handletags = [t for t in tags if t.startswith('handle')]

			




	
	
		
 
@@ -515,18 +519,17 @@ class Curveview(object):

			




	
	
	
		
 
            self.selected_points[:] = newsel

			




	
	
	
		
 
            idxs[:] = newidxs

			




	
	
	
		
 
            

			




	
	
	
		
 
        self.update_curve()

			




	
	
	
		
 

			




	
	
	
		
 
    def highlight_selected_dots(self):

			




	
	
	
		
 
        return

			




	
	
	
		
 
        for i,d in self.dots.items():

			




	
	
	
		
 
            if i in self.selected_points:

			




	
	
	
		
 
                self.itemconfigure(d,fill='red')

			




	
	
	
		
 
                d.set_property('fill_color', 'red')

			




	
	
	
		
 
            else:

			




	
	
	
		
 
                self.itemconfigure(d,fill='blue')

			




	
	
	
		
 
                d.set_property('fill_color', 'blue')

			




	
	
	
		
 
        

			




	
	
	
		
 
    def dotpress(self, r1, r2, ev, dotidx):

			




	
	
	
		
 
        self.print_state("dotpress")

			




	
	
	
		
 
        if dotidx not in self.selected_points:

			




	
	
	
		
 
            self.selected_points=[dotidx]

			




	
	
	
		
 
        self.highlight_selected_dots()

			




	
	
		
 
@@ -544,12 +547,18 @@ class Curveview(object):

			




	
	
	
		
 

			




	
	
	
		
 
    def onLeave(self, widget, event):

			




	
	
	
		
 
        self.entered = False

			




	
	
	
		
 

			




	
	
	
		
 
    def onMotion(self, widget, event):

			




	
	
	
		
 
        self.lastMouseX = event.x

			




	
	
	
		
 

			




	
	
	
		
 
        if event.state & gtk.gdk.SHIFT_MASK and 1: # and B1

			




	
	
	
		
 
            self.sketch_motion(event)

			




	
	
	
		
 
            return

			




	
	
	
		
 

			




	
	
	
		
 
        self.select_motion(event)

			




	
	
	
		
 
        

			




	
	
	
		
 
        if not self.dragging_dots:

			




	
	
	
		
 
            return

			




	
	
	
		
 
        if not event.state & 256:

			




	
	
	
		
 
            return # not lmb-down

			




	
	
	
		
 
        cp = self.curve.points

			




	
	
		
 
@@ -586,12 +595,19 @@ class Curveview(object):

			




	
	
	
		
 
        t = self.world_from_screen(event.x, 0)[0]

			




	
	
	
		
 
        self.zoomControl.zoom_about_mouse(

			




	
	
	
		
 
            t, factor=1.5 if event.direction == gtk.gdk.SCROLL_DOWN else 1/1.5)

			




	
	
	
		
 
        

			




	
	
	
		
 
    def onRelease(self, widget, event):

			




	
	
	
		
 
        self.print_state("dotrelease")

			




	
	
	
		
 

			




	
	
	
		
 
        if event.state & gtk.gdk.SHIFT_MASK: # relese-B1

			




	
	
	
		
 
            self.sketch_release(event)

			




	
	
	
		
 
            return

			




	
	
	
		
 

			




	
	
	
		
 
        self.select_release(event)

			




	
	
	
		
 
 

			




	
	
	
		
 
        if not self.dragging_dots:

			




	
	
	
		
 
            return

			




	
	
	
		
 
        self.last_mouse_world = None

			




	
	
	
		
 
        self.dragging_dots = False

			




	
	
	
		
 

			




	
	
	
		
 
class CurveRow(object):

			




	
	
		
 
@@ -657,12 +673,15 @@ class CurveRow(object):

			




	
	
	
		
 
        # widgets that need recoloring when we tint the row:

			




	
	
	
		
 
        #self.widgets = [leftside, collapsed_cb, muted_cb,

			




	
	
	
		
 
        #                curve_name_label, self]

			




	
	
	
		
 
        #if self.sliderLabel:

			




	
	
	
		
 
        #    self.widgets.append(self.sliderLabel)

			




	
	
	
		
 

			




	
	
	
		
 
    def onDelete(self):

			




	
	
	
		
 
        self.curveView.onDelete()

			




	
	
	
		
 
        

			




	
	
	
		
 
    def toggleCollapsed(self):

			




	
	
	
		
 
        self.collapsed.set(not self.collapsed.get())

			




	
	
	
		
 

			




	
	
	
		
 
    def update_ui_to_collapsed_state(self, *args):

			




	
	
	
		
 
        if self.collapsed.get():

			




	
	
	
		
 
            if self.sliderLabel:

			




	
	
		
 
@@ -742,6 +761,9 @@ class Curvesetview(object):

			




	
	
	
		
 
        """for startup performance, none of the curves redraw

			




	
	
	
		
 
        themselves until this is called once (and then they're normal)"""

			




	
	
	
		
 
        

			




	
	
	
		
 
        for cr in self.allCurveRows:

			




	
	
	
		
 
            cr.curveView.goLive()

			




	
	
	
		
 

			




	
	
	
		
 
    def onDelete(self):

			




	
	
	
		
 
        for r in self.allCurveRows:

			




	
	
	
		
 
            r.onDelete()

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: kallithea-749ff669b6-v9g5f-75
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2021 by various authors & licensed under GPLv3.
            – Support