Changeset - 6e9b5ed1e863
Parent rev.
Child rev.
[Not reviewed]
default
0 2 0
Drew Perttula - 13 years ago 2012-06-09 10:28:06
drewp@bigasterisk.com
finesse ui. add some mouse events on the points in a curve
Ignore-this: 69ed00763985926b92e776fc14298b45
2 files changed with 40 insertions and 32 deletions:
bin/curvecalc
18
16
light9/curvecalc/curveview.py
22
16
0 comments (0 inline, 0 general)
bin/curvecalc
➞
Show inline comments
 
@@ -66,29 +66,31 @@ class Main(object):
 
            m = os.path.getmtime(curveview.__file__.replace('.pyc', '.py'))
 

			




	
	
	
		
 
            if not hasattr(self, 'curvesetView') or self.curvesetView._mtime != m:

			




	
	
	
		
 
                print "reload curveview.py"

			




	
	
	
		
 
                curvesVBox = wtree.get_object("curves")

			




	
	
	
		
 
                [curvesVBox.remove(c) for c in curvesVBox.get_children()]

			




	
	
	
		
 
                reload(curveview)

			




	
	
	
		
 
                # mem problem somewhere; need to hold a ref to this

			




	
	
	
		
 
                self.curvesetView = curveview.Curvesetview(

			




	
	
	
		
 
                    curvesVBox, curveset)

			




	
	
	
		
 
                self.curvesetView._mtime = m

			




	
	
	
		
 
                try:

			




	
	
	
		
 
                    reload(curveview)

			




	
	
	
		
 
                    # mem problem somewhere; need to hold a ref to this

			




	
	
	
		
 
                    self.curvesetView = curveview.Curvesetview(

			




	
	
	
		
 
                        curvesVBox, curveset)

			




	
	
	
		
 
                    self.curvesetView._mtime = m

			




	
	
	
		
 

			




	
	
	
		
 
                # curvesetview must already exist, since this makes 'add_curve'

			




	
	
	
		
 
                # signals for all the initial curves

			




	
	
	
		
 
                curveset.load(basename=os.path.join(

			




	
	
	
		
 
                    showconfig.curvesDir(),

			




	
	
	
		
 
                    showconfig.songFilenameFromURI(song)),

			




	
	
	
		
 
                              skipMusic=opts.skip_music)

			




	
	
	
		
 
                # this is scheduled after some tk shuffling, to try to minimize

			




	
	
	
		
 
                # the number of times we redraw the curve at startup. If tk is

			




	
	
	
		
 
                # very slow, it's ok. You'll just get some wasted redraws.

			




	
	
	
		
 
                self.curvesetView.goLive()

			




	
	
	
		
 
                

			




	
	
	
		
 
                    # curvesetview must already exist, since this makes 'add_curve'

			




	
	
	
		
 
                    # signals for all the initial curves

			




	
	
	
		
 
                    curveset.load(basename=os.path.join(

			




	
	
	
		
 
                        showconfig.curvesDir(),

			




	
	
	
		
 
                        showconfig.songFilenameFromURI(song)),

			




	
	
	
		
 
                                  skipMusic=opts.skip_music)

			




	
	
	
		
 
                    # this is scheduled after some tk shuffling, to try to minimize

			




	
	
	
		
 
                    # the number of times we redraw the curve at startup. If tk is

			




	
	
	
		
 
                    # very slow, it's ok. You'll just get some wasted redraws.

			




	
	
	
		
 
                    self.curvesetView.goLive()

			




	
	
	
		
 
                except Exception, e:

			




	
	
	
		
 
                    print "reload failed:", e

			




	
	
	
		
 
            reactor.callLater(1, refreshCurveView)

			




	
	
	
		
 
        refreshCurveView()       

			




	
	
	
		
 
        

			




	
	
	
		
 
        self.makeStatusLines(wtree.get_object("status"))

			




	
	
	
		
 

			




	
	
	
		
 
        #zc = Zoomcontrol(root)

			




        

    


    
    

    

        

                

                    light9/curvecalc/curveview.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -73,13 +73,13 @@ class Curveview(object):

			




	
	
	
		
 
    """

			




	
	
	
		
 
    def __init__(self, curve, knobEnabled=False, isMusic=False, **kw):

			




	
	
	
		
 
        """knobEnabled=True highlights the previous key and ties it to a

			




	
	
	
		
 
        hardware knob"""

			




	
	
	
		
 
        self.widget = goocanvas.Canvas()

			




	
	
	
		
 
        self.widget.set_property("background-color", "gray20")

			




	
	
	
		
 
        self.widget.set_size_request(-1, 130)

			




	
	
	
		
 
        self.widget.set_size_request(-1, 100)

			




	
	
	
		
 
        self.root = self.widget.get_root_item()

			




	
	
	
		
 

			




	
	
	
		
 
        self.redrawsEnabled = False

			




	
	
	
		
 
        self.curve = curve

			




	
	
	
		
 
        self.knobEnabled = knobEnabled

			




	
	
	
		
 
        self._isMusic = isMusic

			




	
	
		
 
@@ -96,12 +96,16 @@ class Curveview(object):

			




	
	
	
		
 
        dispatcher.connect(self.select_between, "select between")

			




	
	
	
		
 
        if self.knobEnabled:

			




	
	
	
		
 
            dispatcher.connect(self.knob_in, "knob in")

			




	
	
	
		
 
            dispatcher.connect(self.slider_in, "set key")

			




	
	
	
		
 

			




	
	
	
		
 
        self.widget.connect("size-allocate", self.update_curve)

			




	
	
	
		
 

			




	
	
	
		
 
        self.root.connect("motion-notify-event", self.dotmotion)

			




	
	
	
		
 
        self.root.connect("button-release-event", self.dotrelease)

			




	
	
	
		
 
        

			




	
	
	
		
 
        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))

			




	
	
	
		
 

			




	
	
		
 
@@ -189,13 +193,13 @@ class Curveview(object):

			




	
	
	
		
 
            value = self.curve.eval(self.current_time())

			




	
	
	
		
 

			




	
	
	
		
 
        self.curve.insert_pt((self.current_time(), value))

			




	
	
	
		
 
        self.update_curve()

			




	
	
	
		
 

			




	
	
	
		
 
    def print_state(self, msg=""):

			




	
	
	
		
 
        if 0:

			




	
	
	
		
 
        if 1:

			




	
	
	
		
 
            print "%s: dragging_dots=%s selecting=%s" % (

			




	
	
	
		
 
                msg, self.dragging_dots, self.selecting)

			




	
	
	
		
 

			




	
	
	
		
 
    def check_deselect(self,ev):

			




	
	
	
		
 
        try:

			




	
	
	
		
 
            self.find_index_near(ev.x, ev.y)

			




	
	
		
 
@@ -286,13 +290,13 @@ class Curveview(object):

			




	
	
	
		
 
        

			




	
	
	
		
 
    def update_curve(self, _widget=None, _rect=None):

			




	
	
	
		
 
        if not self.redrawsEnabled:

			




	
	
	
		
 
            return

			




	
	
	
		
 
        self.size = self.widget.get_allocation()

			




	
	
	
		
 

			




	
	
	
		
 
        self.zoom = 0, 3#dispatcher.send("zoom area")[0][1]

			




	
	
	
		
 
        self.zoom = 0, 228#dispatcher.send("zoom area")[0][1]

			




	
	
	
		
 
        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],

			




	
	
		
 
@@ -380,38 +384,39 @@ class Curveview(object):

			




	
	
	
		
 
        if not 0 <= x < self.size.width:

			




	
	
	
		
 
            return

			




	
	
	
		
 
        x = max(5, x) # cheat left-edge stuff onscreen

			




	
	
	
		
 
        goocanvas.polyline_new_line(self.curveGroup,

			




	
	
	
		
 
                                    x, ht,

			




	
	
	
		
 
                                    x, ht - 20,

			




	
	
	
		
 
                                    stroke_color='white')

			




	
	
	
		
 
                                    line_width=.5,

			




	
	
	
		
 
                                    stroke_color='gray70')

			




	
	
	
		
 
        goocanvas.Text(parent=self.curveGroup,

			




	
	
	
		
 
                       fill_color="white",

			




	
	
	
		
 
                       x=x, y=ht-20,

			




	
	
	
		
 
                       font="ubuntu 9",

			




	
	
	
		
 
                       x=x+3, y=ht-20,

			




	
	
	
		
 
                       text=label)

			




	
	
	
		
 

			




	
	
	
		
 
    def _draw_line(self,visible_points):

			




	
	
	
		
 
        linepts=[]

			




	
	
	
		
 
        step=1

			




	
	
	
		
 
        linewidth=2

			




	
	
	
		
 
        linewidth = 3

			




	
	
	
		
 
        # 800? maybe this should be related to self.width

			




	
	
	
		
 
        if len(visible_points)>800:

			




	
	
	
		
 
            step = int(len(visible_points)/800)

			




	
	
	
		
 
            linewidth=1

			




	
	
	
		
 
        if len(visible_points) > 800:

			




	
	
	
		
 
            step = int(len(visible_points) / 800)

			




	
	
	
		
 
            linewidth = .5

			




	
	
	
		
 
        for p in visible_points[::step]:

			




	
	
	
		
 
            linepts.append(self.screen_from_world(p))

			




	
	
	
		
 
        if len(linepts)<4:

			




	
	
	
		
 
            return

			




	
	
	
		
 

			




	
	
	
		
 
        if self.curve.muted:

			




	
	
	
		
 
            fill = 'grey34'

			




	
	
	
		
 
        else:

			




	
	
	
		
 
            fill = 'white'

			




	
	
	
		
 

			




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

			




	
	
	
		
 
                                     points=goocanvas.Points(linepts),

			




	
	
	
		
 
                                     width=linewidth,

			




	
	
	
		
 
                                     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):

			




	
	
		
 
@@ -427,13 +432,13 @@ class Curveview(object):

			




	
	
	
		
 
            rad=3

			




	
	
	
		
 
            worldp = p

			




	
	
	
		
 
            p = self.screen_from_world(p)

			




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

			




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

			




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

			




	
	
	
		
 
                                 stroke_color='gray20',

			




	
	
	
		
 
                                 stroke_color='gray90',

			




	
	
	
		
 
                                 fill_color='blue',

			




	
	
	
		
 
                                 line_width=1,

			




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

			




	
	
	
		
 
                                 )

			




	
	
	
		
 
            if worldp[1] == 0:

			




	
	
	
		
 
                rad += 3

			




	
	
		
 
@@ -443,12 +448,13 @@ class Curveview(object):

			




	
	
	
		
 
                                         radius_x=rad,

			




	
	
	
		
 
                                         radius_y=rad,

			




	
	
	
		
 
                                         line_width=.8,

			




	
	
	
		
 
                                         stroke_color='darkgreen',

			




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

			




	
	
	
		
 
                                         )

			




	
	
	
		
 
            dot.connect("button-press-event", self.dotpress, i)

			




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

			




	
	
	
		
 
            #              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

			




	
	
		
 
@@ -514,13 +520,13 @@ class Curveview(object):

			




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

			




	
	
	
		
 
            if i in self.selected_points:

			




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

			




	
	
	
		
 
            else:

			




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

			




	
	
	
		
 
        

			




	
	
	
		
 
    def dotpress(self,ev,dotidx):

			




	
	
	
		
 
    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()

			




	
	
	
		
 
        self.last_mouse_world = self.world_from_screen(ev.x, ev.y)

			




	
	
	
		
 
        self.dragging_dots = True

			




	
	
		
 
@@ -528,13 +534,13 @@ class Curveview(object):

			




	
	
	
		
 
    def select_between(self,start,end):

			




	
	
	
		
 
        if start > end:

			




	
	
	
		
 
            start, end = end, start

			




	
	
	
		
 
        self.selected_points = self.curve.indices_between(start,end)

			




	
	
	
		
 
        self.highlight_selected_dots()

			




	
	
	
		
 

			




	
	
	
		
 
    def dotmotion(self,ev):

			




	
	
	
		
 
    def dotmotion(self, group, hitObject, ev):

			




	
	
	
		
 
        if not self.dragging_dots:

			




	
	
	
		
 
            return

			




	
	
	
		
 
        if not ev.state & 256:

			




	
	
	
		
 
            return # not lmb-down

			




	
	
	
		
 
        cp = self.curve.points

			




	
	
	
		
 
        moved=0

			




	
	
		
 
@@ -563,13 +569,13 @@ class Curveview(object):

			




	
	
	
		
 
            self.update_curve()

			




	
	
	
		
 

			




	
	
	
		
 
    def unselect(self):

			




	
	
	
		
 
        self.selected_points=[]

			




	
	
	
		
 
        self.highlight_selected_dots()

			




	
	
	
		
 
        

			




	
	
	
		
 
    def dotrelease(self,ev):

			




	
	
	
		
 
    def dotrelease(self, group, hitObject, ev):

			




	
	
	
		
 
        self.print_state("dotrelease")

			




	
	
	
		
 
        if not self.dragging_dots:

			




	
	
	
		
 
            return

			




	
	
	
		
 
        self.last_mouse_world = None

			




	
	
	
		
 
        self.dragging_dots = False

			




	
	
	
		
 

			




        

    



    


    



    



      

      





    
    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