refactor vis(), drawme, and new to make for cleaner new vs update handling

Author: eighthave

filterview.c

@@ -16,7 +16,7 @@ typedef struct filterview
 
     /* IDs for Tk widgets */
     t_symbol*   receive_name;  /* name to bind to to receive callbacks */
-    char        canvas_id[MAXPDSTRING];
+    char        tkcanvas[MAXPDSTRING];
     char        tag[MAXPDSTRING];
     char        my[MAXPDSTRING];
 
@@ -29,14 +29,6 @@ static t_widgetbehavior filterview_widgetbehavior;
 
 /* time to set up! */
 
-static void set_tkwidgets_ids(t_filterview* x, t_canvas* canvas)
-{
-    x->x_canvas = canvas;
-    snprintf(x->canvas_id, MAXPDSTRING, ".x%lx.c", (long unsigned int) canvas);
-    snprintf(x->tag, MAXPDSTRING, "T%lx", (long unsigned int)x);
-    snprintf(x->my, MAXPDSTRING, "::N%lx", (long unsigned int)x);
-}
-
 static void filterview_biquad_callback(t_filterview *x, t_symbol *s, int argc, t_atom* argv)
 {
     outlet_list(x->x_data_outlet, &s_list, argc, argv);
@@ -63,8 +55,8 @@ static void filterview_displace(t_gobj *z, t_glist *glist, int dx, int dy)
     if (glist_isvisible(glist))
     {
         sys_vgui("%s move %s %d %d\n",
-                 x->canvas_id, x->tag, dx, dy);
-        sys_vgui("%s move RSZ %d %d\n", x->canvas_id, dx, dy);
+                 x->tkcanvas, x->tag, dx, dy);
+        sys_vgui("%s move RSZ %d %d\n", x->tkcanvas, dx, dy);
         canvas_fixlinesfor(glist_getcanvas(glist), (t_text*) x);
     }
 }
@@ -85,15 +77,15 @@ static void filterview_vis(t_gobj *z, t_glist *glist, int vis)
     t_filterview* x = (t_filterview*)z;
     if (vis)
     {
-        set_tkwidgets_ids(x, glist_getcanvas(glist));
-        sys_vgui("filterview::new %s %s %s %s %d %d %d %d\n",
-                 x->my, x->canvas_id, x->receive_name->s_name, x->tag,
+        x->x_canvas = glist_getcanvas(glist);
+        snprintf(x->tkcanvas, MAXPDSTRING, ".x%lx.c", (long unsigned int) x->x_canvas);
+        sys_vgui("filterview::drawme %s %s %s %s %d %d %d %d %s\n",
+                 x->my, x->tkcanvas, x->receive_name->s_name, x->tag,
                  text_xpix(&x->x_obj, glist),
                  text_ypix(&x->x_obj, glist),
                  text_xpix(&x->x_obj, glist)+x->width,
-                 text_ypix(&x->x_obj, glist)+x->height);
-        sys_vgui("filterview::setfiltertype %s %s\n", x->my, x->filtertype->s_name);
-        sys_vgui("filterview::drawme %s\n", x->my);
+                 text_ypix(&x->x_obj, glist)+x->height,
+                 x->filtertype->s_name);
     }
     else
     {
@@ -196,6 +188,9 @@ static void *filterview_new(t_symbol* s)
     x->filtertype = gensym("peaking");
     x->x_glist = canvas_getcurrent();
 
+    snprintf(x->tag, MAXPDSTRING, "T%lx", (long unsigned int)x);
+    snprintf(x->my, MAXPDSTRING, "::N%lx", (long unsigned int)x);
+
     sprintf(buf, "#R%lx", (long unsigned int)x);
     x->receive_name = gensym(buf);
     pd_bind(&x->x_obj.ob_pd, x->receive_name);

filterview.tcl

@@ -2,9 +2,7 @@
 # This line continues for Tcl, but is a single line for 'sh' \
     exec /usr/bin/wish "$0" -- ${1+"$@"}
 
-# TODO accept biquad lists on the inlet
 # TODO handle changes in samplerate using [block~]
-# TODO make Tk tags local to each instance...
 
 #------------- .mmb edits ----------------
 #
@@ -605,6 +603,7 @@ proc filterview::changebandwidth {my x y} {
     }
     set filterwidth [expr $filterx2 - $filterx1]
     set filtercenter [expr $filterx1 + ($filterwidth/2)]
+
     $tkcanvas coords bandleft$tag $filterx1 $framey1  $filterx1 $framey2
     $tkcanvas coords bandcenter$tag $filtercenter $framey1  $filtercenter $framey2
     $tkcanvas coords bandright$tag $filterx2 $framey1  $filterx2 $framey2
@@ -731,14 +730,13 @@ proc filterview::set_for_editmode {mytoplevel} {
 
 #------------------------------------------------------------------------------#
 
-# sets up an instance of the class
-proc filterview::new {my canvas name t x1 y1 x2 y2} {
+# sets up an new instance of the class
+proc filterview::new {my canvas rname t x1 y1 x2 y2} {
     namespace eval $my {
-        #------------------------------
-        # per-instance variables
-        variable tag "tag"
-        variable tkcanvas ".tkcanvas"
-        variable receive_name "receive_name"
+        # init all here to make sure they are not blank
+        variable tag "tag"                   ;# unique ID for canvas elements
+        variable tkcanvas ".tkcanvas"        ;# Tk canvas this is drawn on
+        variable receive_name "receive_name" ;# Pd name to send callbacks to
 
         variable currentfiltertype "peaking"
 
@@ -752,23 +750,31 @@ proc filterview::new {my canvas name t x1 y1 x2 y2} {
         variable b1 0
         variable b2 0
     }
-    variable ${my}::tkcanvas $canvas
-    variable ${my}::receive_name $name
+
+    variable ${my}::receive_name $rname
     variable ${my}::tag $t
 
+    update $my $canvas $x1 $y1 $x2 $y2
+}
+
+# updates an existing instance when its about to be drawn again
+proc filterview::update {my canvas x1 y1 x2 y2} {
+    variable ${my}::tkcanvas $canvas
+
     # convert these all to floats so the math works properly
     variable ${my}::framex1 [expr $x1 * 1.0]
     variable ${my}::framey1 [expr $y1 * 1.0]
     variable ${my}::framex2 [expr $x2 * 1.0]
     variable ${my}::framey2 [expr $y2 * 1.0]
-    
+
     variable ${my}::midpoint [expr (($framey2 - $framey1) / 2) + $framey1]
     variable ${my}::hzperpixel [expr 20000.0 / ($framex2 - $framex1)]
     variable ${my}::magnatudeperpixel [expr 0.5 / ($framey2 - $framey1)]
 
     # TODO make these set by something else, saved state?
     variable ${my}::filterx1 [expr $framex1 + 120.0]
     variable ${my}::filterx2 [expr $framex1 + 180.0]
+    # TODO what about gain?
     
     variable ${my}::filtergain $midpoint
     variable ${my}::filterwidth [expr $filterx2 - $filterx1]
@@ -809,11 +815,17 @@ proc filterview::setfiltertype {my filtertype} {
     update_coefficients $my
 }
 
-proc filterview::drawme {my} {
+proc filterview::drawme {my canvas name t x1 y1 x2 y2 filtertype} {
+    # if the $my namespace already exists, that means we already
+    # have an instance active and setup.
+    if {[namespace exists $my]} {
+        update $my $canvas $x1 $y1 $x2 $y2
+    } else {
+        new $my $canvas $name $t $x1 $y1 $x2 $y2
+    }
     variable ${my}::tkcanvas
     variable ${my}::receive_name
     variable ${my}::tag
-    variable ${my}::currentfiltertype
     variable ${my}::framex1
     variable ${my}::framey1
     variable ${my}::framex2
@@ -878,7 +890,7 @@ proc filterview::drawme {my} {
         $framex2 $outlety $outletx $outlety $outletx $framey2 \
         -tags [list $tag nlet$tag]
 
-    setfiltertype $my $currentfiltertype
+    setfiltertype $my $filtertype
 
     # run to set things up
     stop_editing $my
@@ -936,10 +948,8 @@ proc filterview::setup {} {
         wm geometry . 400x400+500+40
         canvas $tkcanvas
         pack $tkcanvas -side left -expand 1 -fill both
-        filterview::new $my $tkcanvas FAKE_RECEIVE_NAME $tag 30.0 30.0 330.0 230.0
+        filterview::drawme $my $tkcanvas FAKE_RECEIVE_NAME $tag 30.0 30.0 330.0 230.0 "peaking"
         filterview::set_for_editmode .
-        filterview::setfiltertype $my "peaking"
-        filterview::drawme $my
     }
 }