Changeset 1927 for trunk/gui/scripts

Timestamp:

Oct 19, 2010, 6:18:44 PM (14 years ago)

Author:

dkearney

Message:

fixed layout issues with minordial canvas.
added -minortick and -majortick options to control how tick marks were layed out.
updated marker placement estimation code to handle placement of marker when a tick for a frame does not exist.
added current marker flag.
updated dialdemo test code

File:

• trunk/gui/scripts/videodial.tcl (modified) (21 diffs)

trunk/gui/scripts/videodial.tcl

@@ -36 +36 @@
     itk_option define -min min Min ""
     itk_option define -max max Max ""
+    itk_option define -minortick minortick Minortick 1
+    itk_option define -majortick majortick Majortick 1
     itk_option define -variable variable Variable ""
     itk_option define -offset offset Offset 1
@@ -73 +75 @@
     protected method _navigate {offset}
     protected method _fixSize {}
+    protected method _fixMinorSize {}
     protected method _fixValue {args}
     protected method _fixOffsets {}
@@ -99 +102 @@
     public variable min 0.0
     public variable max 1.0
+    public variable minortick 1
+    public variable majortick 5
 }
 
@@ -154 +159 @@
 
     blt::table configure $itk_interior c* -resize both
-    blt::table configure $itk_interior r0 -resize both -pady 1
-    blt::table configure $itk_interior r1 -resize none -pady 1
+    blt::table configure $itk_interior r0 -resize none
+    blt::table configure $itk_interior r1 -resize none
 
 
     eval itk_initialize $args
 
-    $itk_component(majordial) configure -background red
-    $itk_component(minordial) configure -background blue
+#    $itk_component(majordial) configure -background green
+#    $itk_component(minordial) configure -background cyan
 
     _fixSize
@@ -188 +193 @@
     }
     _current [ms2rel $value]
-    _see "frame[expr int($value)]"
+    set framenum [expr int($value)]
+    _see "frame$framenum"
+    mark current $framenum
     event generate $itk_component(hull) <<Value>>
 }
@@ -293 +300 @@
             set where [expr int([rel2ms ${_current}])]
         } elseif {[string is integer $where] == 0} {
-            error "bad value \"$where\": <where> should be an integer value"
-        }
-        foreach {frx0 fry0 frx1 fry1} [$c coords "frame$where"] break
-        set where "frame$where"
+            error "bad value \"$where\": while trying to place marker \"$type\": <where> should be an integer value"
+        }
+        set coords [$c coords "frame$where"]
+        if {![llength $coords]} {
+            # frame marker does not exist
+            # estimate where to put the marker
+            # use frame0 marker as a x=0 point
+            foreach {frx0 fry0 frx1 fry1} [$c coords "frame0"] break
+            set frx0 [expr {$frx0 + ((1.0*$where/$minortick)*${_imspace})}]
+        } else {
+            foreach {frx0 fry0 frx1 fry1} $coords break
+        }
+        # where already contains the frame number
     } elseif {$largs == 2} {
         set flag [lindex $args 0]
@@ -308 +324 @@
                 foreach {frx0 fry0 frx1 fry1} [$c coords $id] break
                 # find the frame# tag to associate with the marker with
-                if {[regexp {frame[0-9]+} $id] == 0} {
+                if {[regexp {frame([0-9]+)} $id] == 0} {
                     foreach tags [$c gettags $id] {
                         if {"" != [set tmp [lsearch -inline -regexp $tags {frame[0-9]+}]]} {
@@ -318 +334 @@
                     set where $id
                 }
+                # store the frame number in where
+                regexp {frame([0-9]+)} $where match where
             }
             default {
@@ -347 +365 @@
             set smy1 [expr {$smy0-10}]                  ;# triangle top y
             set smx2 $smx1                              ;# stem bottom right x
-            set smy2 [expr {$cy1+5}]                    ;# stem bottom right y
+            set smy2 $cy1                               ;# stem bottom right y
             set smx3 [expr {$smx0-1}]                   ;# stem bottom left x
             set smy3 $smy2                              ;# stem bottom left y
@@ -371 +389 @@
                 set _marks($type) $where
             }
+
+            _fixMinorSize
         }
         "end" {
@@ -381 +401 @@
             set emy1 [expr {$emy0-10}]                  ;# triangle top y
             set emx2 $emx1                              ;# stem bottom left x
-            set emy2 [expr {$cy1+5}]                    ;# stem bottom left y
+            set emy2 $cy1                               ;# stem bottom left y
             set emx3 [expr {$emx0+1}]                   ;# stem bottom right x
             set emy3 $emy2                              ;# stem bottom right y
@@ -405 +425 @@
                 set _marks($type) $where
             }
+
+            _fixMinorSize
         }
         "particle*" {
@@ -427 +449 @@
             }
 
+            _fixMinorSize
+
         }
         "arrow" {
@@ -448 +472 @@
             }
 
+            _fixMinorSize
+        }
+        "current" {
+
+            set cmx0 $frx0                              ;# current marker x0
+            set cmy0 $cy0                               ;# current marker y0
+
+            set cmx1 [expr {$cmx0+5}]                   ;# lower right diagonal edge x
+            set cmy1 [expr {$cmy0-5}]                   ;# lower right diagonal edge y
+            set cmx2 $cmx1                              ;# right top x
+            set cmy2 [expr {$cmy1-5}]                    ;# right top y
+            set cmx3 [expr {$cmx0-5}]                   ;# left top x
+            set cmy3 $cmy2                              ;# left top y
+            set cmx4 $cmx3                              ;# lower left diagonal edge x
+            set cmy4 $cmy1                              ;# lower left diagonal edge y
+
+            set tag $type
+            $c delete $tag
+            $c create polygon \
+                $cmx0 $cmy0 \
+                $cmx1 $cmy1 \
+                $cmx2 $cmy2 \
+                $cmx3 $cmy3 \
+                $cmx4 $cmy4 \
+                -outline black -fill red -tags $tag
+            $c create line $cmx0 $cmy0 $cmx0 $cy1 -fill red -tags $tag
+
+            if {[string compare "" $where] != 0} {
+                set _marks($type) $where
+            }
+
         }
         default {
@@ -470 +525 @@
     set p [winfo pixels $c $itk_option(-padding)]
     set t [expr {$itk_option(-thickness)+1}]
-    set ay1 [expr {$h-5}]
+    set ay1 [expr {$h-3}]
 
     if {"" != $_knob} {
@@ -583 +638 @@
     set p [winfo pixels $c $itk_option(-padding)]
     set t [expr {$itk_option(-thickness)+1}]
-    set cy1 [expr {$h-5}]
+    set cy1 [expr {$h-1}]
     set cy0 [expr {$cy1-$t}]
     set cx0 [expr {$p+1}]
@@ -608 +663 @@
     set imty [expr {$cy0-5}]                    ;# height of marker value
 
-    set bw 70                                   ;# bracketwidth, number of imarks
-    set _imspace 10                             ;# space between imarks
-
-
-    for {set i [expr {int($min)}]; set imx $cx0} {$i <= $max} {incr i; set imx [expr $imx+${_imspace}]} {
-        if {($i%5) == 0} {
+#    set _imspace 10                             ;# space between imarks
+
+    if {$minortick == 0} {
+        set majortick 5
+    }
+
+    if {$minortick == 0} {
+        set minortick 1
+    }
+
+
+    set imx $cx0
+    for {set i [expr {int($min)}]} {$i <= $max} {incr i} {
+        if {($i%$majortick) == 0} {
             # draw major tick
             $c create line $imx $imly0 $imx $imly1 \
@@ -622 +685 @@
             $c create text $imx $imty -anchor center -text $i \
                 -font $itk_option(-font) -tags "frame$i"
-        } else {
+
+            set imx [expr $imx+${_imspace}]
+        } elseif {($i%$minortick) == 0 } {
             # draw minor tick
             $c create line $imx $imsy0 $imx $imsy1 \
@@ -628 +693 @@
                 -width $imw \
                 -tags [list shortmark-c imark-c "frame$i"]
-        }
-    }
+
+            set imx [expr $imx+${_imspace}]
+        }
+    }
+
+
+    # calculate the height of the intermediate tick marks
+    # and frame numbers on our canvas, resize the imbox
+    # to include both of them.
+    set box [$c bbox "all"]
+    if {![llength $box]} {
+        set box [list 0 0 0 0]
+    }
+    foreach {cx0 cy0 cx1 cy1} $box break
+    $c coords "imbox" $box
 
     # add any marks that the user previously specified
     foreach n [array names _marks] {
-        mark $n -tag $_marks($n)
-    }
-
-    foreach {cx0 cy0 cx1 cy1} [$c bbox "all"] break
-    $c coords "imbox" [list $cx0 $cy0 $cx1 $cy1]
-    $c configure \
-        -scrollregion [list $cx0 $cy0 $cx1 $cy1] \
-        -xscrollincrement 1p \
-        -yscrollincrement 1p
-    if 0 {
-    }
-
+        # mark $n -tag $_marks($n)
+        mark $n $_marks($n)
+    }
+
+    _fixMinorSize
+}
+
+
+# ----------------------------------------------------------------------
+# USAGE: _fixMinorSize
+#
+# Used internally to compute the height of the minor dial based
+# on the items placed on the canvas
+#
+# FIXME: instead of calling this in the mark command, figure out how to
+#   make the canvas the correct size to start with
+# ----------------------------------------------------------------------
+itcl::body Rappture::Videodial::_fixMinorSize {} {
+    # resize the height of the minor timeline canvas
+    # to include everything we know about
+
+    set c $itk_component(minordial)
+
+    set box [$c bbox "all"]
+    if {![llength $box]} {
+        set box [list 0 0 0 0]
+    }
+
+    foreach {x0 y0 x1 y1} $box break
+    set h [expr $y1-$y0+1]                        ;# add a 1 pixel buffer
+
+    $c configure -height $h -scrollregion $box -xscrollincrement 1p
 }
 
@@ -800 +898 @@
             {p q xmax ymax} [$c cget -scrollregion] {
         set xpos [expr {(($x1+$x)/2.0)/$xmax - ($right-$left)/2.0}]
-        set ypos [expr {(($y1+$y)/2.0)/$ymax - ($btm-$top)/2.0}]
+        #set ypos [expr {(($y1+$y)/2.0)/$ymax - ($btm-$top)/2.0}]
     }
     $c xview moveto $xpos
@@ -900 +998 @@
 
     $itk_component(majordial) configure -width $w -height $h
+
+#    # resize the height of the minor canvas to include everything we know about
+#    set box [$itk_component(minordial) bbox "all"]
+#    if {![llength $box]} {
+#        set box [list 0 0 0 0]
+#    }
+#    foreach {cx0 cy0 cx1 cy1} $box break
+#    set h [expr $cy1-$cy0+1]
+#    $itk_component(minordial) configure -height $h
 }