light9 Changeset - 1064aceb158e

Changeset - 1064aceb158e

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Drew Perttula - 13 years ago 2012-06-12 06:11:20
drewp@bigasterisk.com

point deleting. when you add new points by c-click or sketch, they're immediately selected. c-click now always adds the point on the existing curve
Ignore-this: 3ba2223d46f73d348229ae0017add2ee

3 files changed with 37 insertions and 12 deletions:

light9/curvecalc/curve.py

light9/curvecalc/curvecalc.glade

light9/curvecalc/curveview.py

0 comments (0 inline, 0 general)

light9/curvecalc/curve.py

➞

Show inline comments

@@ @@ -64,14 +64,16 @@ class Curve(object): @@
         frac = (t-p1[0])/(p2[0]-p1[0])
         y = p1[1]+(p2[1]-p1[1])*frac
         return y
     __call__=eval
     def insert_pt(self,new_pt):
         """returns index of new point"""
         i = bisect(self.points,(new_pt[0],None))
         self.points.insert(i,new_pt)
         return i
     def indices_between(self, x1, x2, beyond=0):
         leftidx = max(0, bisect(self.points, (x1,None)) - beyond)
         rightidx = min(len(self.points),
                        bisect(self.points, (x2,None)) + beyond)
         return range(leftidx, rightidx)

light9/curvecalc/curvecalc.glade

➞

Show inline comments

@@ @@ -89,12 +89,24 @@ @@
                         <property name="can_focus">False</property>
                         <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                       </object>
                     </child>
                     <child>
                       <object class="GtkImageMenuItem" id="imagemenuitem6">
                         <property name="label">gtk-delete</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_action_appearance">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
                         <accelerator key="Delete" signal="activate"/>
                         <signal name="activate" handler="onDelete" swapped="no"/>
                       </object>
                     </child>
                   </object>
                 </child>
               </object>
             </child>
             <child>
               <object class="GtkMenuItem" id="menuitem13">
@@ @@ -238,13 +250,13 @@ @@
                     <property name="can_focus">False</property>
                     <child>
                       <object class="GtkMenuItem" id="menuitem6">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="use_action_appearance">False</property>
-                        <property name="label" translatable="yes">Delete (del)</property>
                         <property name="label" translatable="yes">Delete</property>
                         <property name="use_underline">True</property>
                       </object>
                     </child>
                   </object>
                 </child>
               </object>

light9/curvecalc/curveview.py

➞

Show inline comments

@@ @@ -39,12 +39,13 @@ class Sketch: @@
         self.pts.append(p)
         self.curveview.add_point(p)
     def release(self,ev):
         pts = self.pts
         pts.sort()
         finalPoints = pts[:]
         dx = .01
         to_remove = []
         for i in range(1,len(pts)-1):
             x = pts[i][0]
@@ @@ -53,22 +54,25 @@ class Sketch: @@
             if angle_between(pts[i], p_left, p_right) > 160:
                 to_remove.append(i)
         for i in to_remove:
             self.curveview.curve.points.remove(pts[i])
             finalPoints.remove(pts[i])
         # the simplified curve may now be too far away from some of
         # the points, so we'll put them back. this has an unfortunate
         # bias toward reinserting the earlier points
         for i in to_remove:
             p = pts[i]
             if abs(self.curveview.curve(p[0]) - p[1]) > .1:
                 self.curveview.add_point(p)
                 finalPoints.append(p)
         self.curveview.update_curve()
         self.curveview.select_points(finalPoints)
 class Curveview(object):
     """
     graphical curve widget only. Please pack .widget
     """
     def __init__(self, curve, knobEnabled=False, isMusic=False, zoomControl=None, **kw):
@@ @@ -161,14 +165,12 @@ class Curveview(object): @@
             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
@@ @@ -221,12 +223,24 @@ class Curveview(object): @@
         try:
             self.find_index_near(ev.x, ev.y)
         except ValueError:
             self.selected_points[:] = []
             self.highlight_selected_dots()
     def select_points(self, pts):
         """set selection to the given point values (tuples, not indices)"""
         idxs = []
         for p in pts:
             idxs.append(self.curve.points.index(p))
         self.select_indices(idxs)
     def select_indices(self, idxs):
         """set selection to these point indices"""
         self.selected_points = idxs
         self.highlight_selected_dots()
     def select_press(self,ev):
         # todo: these select_ handlers are getting called on c-a-drag
         # zooms too. the dispatching should be more selective than
         # just calling both handlers all the time
         self.print_state("select_press")
         if self.dragging_dots:
@@ @@ -482,22 +496,20 @@ class Curveview(object): @@
             return int(handletags[0][6:])
         except IndexError:
             raise ValueError("no point found")
     def new_point_at_mouse(self, ev):
         p = self.world_from_screen(ev.x,ev.y)
         x, y = p
         y = max(0, y)
         y = min(1, y)
         p = x, y
         self.add_point(p)
         x = p[0]
         y = self.curve.eval(x)
         self.add_point((x, y))
     def add_point(self, p):
         self.unselect()
         self.curve.insert_pt(p)
         i = self.curve.insert_pt(p)
         self.update_curve()
         self.select_indices([i])
     def remove_point_idx(self, *idxs):
         idxs = list(idxs)
         while idxs:
             i = idxs.pop()
@@ @@ -536,14 +548,13 @@ class Curveview(object): @@
         self.last_mouse_world = self.world_from_screen(ev.x, ev.y)
         self.dragging_dots = True
     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()
         self.select_indices(self.curve.indices_between(start,end))
     def onEnter(self, widget, event):
         self.entered = True
     def onLeave(self, widget, event):
         self.entered = False

0 comments (0 inline, 0 general)