light9 Changeset - 35a234c7e6ff

Changeset - 35a234c7e6ff

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Drew Perttula - 11 years ago 2014-06-03 06:31:24
drewp@bigasterisk.com

remove some more 'collapsed' curve code
Ignore-this: 609c9b2f898a5fa89be8719258e82f27

2 files changed with 28 insertions and 52 deletions:

light9/curvecalc/curvecalc.glade

light9/curvecalc/curveview.py

0 comments (0 inline, 0 general)

light9/curvecalc/curvecalc.glade

➞

Show inline comments

@@ @@ -7,15 +7,18 @@ @@
     <property name="upper">100</property>
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
   <object class="GtkTextBuffer" id="help">
     <property name="text">Mousewheel zoom; C-p play/pause music at mouse
 Keys in a selected curve: 1..5 add point at time cursor
 Keys in any curve: q,w,e,r,t,y set marker at time cursor
 Curve point bindings: B1 drag point; C-B1 curve add point; S-B1 sketch points; B1 drag select points
 Old subterm system may still work:
 Drag sub into curve area for new curve+subterm
 Keys in a selected curve: C to collapse; R to rebuild broken canvas widget; 1..5 add point at time cursor; q,w,e,r,t,y set marker at time cursor
 Curve point bindings: B1 drag point; C-B1 curve add point; S-B1 sketch points; B1 drag select points
 Available in functions: nsin/ncos period=amp=1; within(a,b) bef(x) aft(x) compare to time; smoove(x) cubic smoothstep; chan(name); curvename(t) eval curve</property>
   </object>
   <object class="GtkWindow" id="MainWindow">
     <property name="can_focus">False</property>
     <child>
       <object class="GtkBox" id="vbox1">
@@ @@ -432,40 +435,16 @@ Available in functions: nsin/ncos period @@
                             <property name="expand">False</property>
                             <property name="fill">False</property>
                             <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkButton" id="button7">
                             <property name="label" translatable="yes">Collapse all</property>
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <signal name="clicked" handler="onCollapseAll" swapped="no"/>
                           </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">True</property>
                             <property name="position">1</property>
                           </packing>
                           <placeholder/>
                         </child>
                         <child>
                           <object class="GtkButton" id="button6">
                             <property name="label" translatable="yes">Collapse none	</property>
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <signal name="clicked" handler="onCollapseNone" swapped="no"/>
                           </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">True</property>
                             <property name="position">2</property>
                           </packing>
                           <placeholder/>
                         </child>
                         <child>
                           <placeholder/>
                         </child>
                         <child>
                           <placeholder/>
@@ @@ -614,12 +593,18 @@ Available in functions: nsin/ncos period @@
                                 <child>
                                   <placeholder/>
                                 </child>
                                 <child>
                                   <placeholder/>
                                 </child>
                                 <child>
                                   <placeholder/>
                                 </child>
                                 <child>
                                   <placeholder/>
                                 </child>
                               </object>
                             </child>
                           </object>
                         </child>
                       </object>
                       <packing>
@@ @@ -739,12 +724,18 @@ Available in functions: nsin/ncos period @@
                     <child>
                       <placeholder/>
                     </child>
                     <child>
                       <placeholder/>
                     </child>
                     <child>
                       <placeholder/>
                     </child>
                     <child>
                       <placeholder/>
                     </child>
                   </object>
                 </child>
                 <child type="label">
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>

light9/curvecalc/curveview.py

➞

Show inline comments

@@ @@ -381,14 +381,15 @@ class Curveview(object): @@
     def trackWidgetSize(self):
         """
         Also tried:
             visibility-notify-event
             (Gdk.EventMask.VISIBILITY_NOTIFY_MASK) fires on some
             resizes but maybe not all. Could be doing the right thing,
             though
             resizes but definitely not all. During window resizes,
             sometimes I have to 'shake' the window size to get all
             curves to update.
             configure-event seems to never fire.
             size-allocate seems right but i get into infinite bounces
             between two sizes
         """
@@ @@ -1151,20 +1152,12 @@ class CurveRow(object): @@
         box.pack_start(curve_name_label, expand=True, fill=True, padding=0)
         box.pack_start(self.muted, expand=True, fill=True, padding=0)
     def onDelete(self):
         self.curveView.onDelete()
     def update_ui_to_collapsed_state(self, *args):
         if self.collapsed.get_active():
             self.curveView.widget.set_size_request(-1, 25)
             [w.hide() for w in self.hideWhenCollapsed]
         else:
             self.curveView.widget.set_size_request(-1, 100)
             [w.show() for w in self.hideWhenCollapsed]
     def sync_mute_to_curve(self, *args):
         """send value from CheckButton to the master attribute inside Curve"""
         new_mute = self.muted.get_active()
         self.curveView.curve.muted = new_mute
     def update_mute_look(self):
@@ @@ -1254,23 +1247,22 @@ class Curvesetview(object): @@
                                           Gtk.PACK_START)
     def onKeyPress(self, widget, event):
         if not self.live: # workaround for old instances living past reload()
             return
         if event.string == 'c':
             r = self.row_under_mouse()
             # calling toggled() had no effect; don't know why
             r.collapsed.set_active(not r.collapsed.get_active())
         r = self.row_under_mouse()
         key = event.string
         pass # no handlers right now
     def row_under_mouse(self):
         x, y = self.curvesVBox.get_pointer()
         for r in self.allCurveRows:
             inRowX, inRowY = self.curvesVBox.translate_coordinates(r.box, x, y)
             _, _, w, h = r.box.get_allocation()
             if 0 <= inRowX < w and 0 <= inRowY < h:
             alloc = r.box.get_allocation()
             if 0 <= inRowX < alloc.width and 0 <= inRowY < alloc.height:
                 return r
         raise ValueError("no curveRow is under the mouse")
     def focus_entry(self):
         self.entry.focus()
@@ @@ -1292,13 +1284,13 @@ class Curvesetview(object): @@
     def watchCurveAreaHeight(self):
         def sizeEvent(w, size):
             # this is firing really often
             if self.visibleHeight == size.height:
                 return
-            print "size.height is new", size.height
+            log.debug("size.height is new: %s", size.height)
             self.visibleHeight = size.height
             self.setRowHeights()
         visibleArea = self.curvesVBox.get_parent().get_parent()
         visibleArea.connect('size-allocate', sizeEvent)
@@ @@ -1339,15 +1331,8 @@ class Curvesetview(object): @@
             cr.curveView.goLive()
     def onDelete(self):
         for r in self.allCurveRows:
             r.onDelete()
     def collapseAll(self):
         for r in self.allCurveRows:
             r.collapsed.set_active(True)
     def collapseNone(self):
         for r in self.allCurveRows:
             r.collapsed.set_active(False)

0 comments (0 inline, 0 general)