Changeset 1496 for trunk

Timestamp:

Jun 9, 2009, 3:55:46 PM (15 years ago)

Author:

gah

Message:

pick up extra flow settings from XML

Location:

trunk

Files:

• gui/scripts/field.tcl (modified) (1 diff)
• gui/scripts/flowhints.tcl (modified) (4 diffs)
• gui/scripts/flowspeed.tcl (modified) (1 diff)
• gui/scripts/flowvisviewer.tcl (modified) (9 diffs)
• gui/scripts/heightmapviewer.tcl (modified) (2 diffs)
• gui/scripts/unirect3d.tcl (modified) (1 diff)
• src/core/RpEncode.cc (modified) (1 diff)

trunk/gui/scripts/field.tcl

@@ -249 +249 @@
     }
     if {[info exists _comp2unirect2d($what)]} {
-        set mobj $_comp2unirect2d($what)
-        return [$mobj blob]
+        return [$_comp2unirect2d($what) blob]
     }
     if {[info exists _comp2unirect3d($what)]} {
-        set mobj $_comp2unirect3d($what)
-        return [$mobj blob]
+        return [$_comp2unirect3d($what) blob]
     }
     error "bad option \"$what\": should be [join [lsort [array names _comp2dims]] {, }]"

trunk/gui/scripts/flowhints.tcl

@@ -61 +61 @@
         "arrows"        "off"
         "volume"        "on"
+        "duration"      "1:00"
+        "speed"         "1x"
     }
     set _units $units
@@ -75 +77 @@
             "arrows"      { GetBoolean $f $child _hints(arrows) }
             "axis"        { GetAxis $f  $child _hints(axis) }
+            "speed"       { set _hints(speed) $value }
+            "duration"    { set _hints(duration) $value }
             "position"    { GetPosition $f $child _hints(position) }
             "particles*" {
@@ -112 +116 @@
                     "hide"          "no"
                     "label"         ""
+                    "linewidth"     "2"
                 }
                 set b [$f element -as object $child]
@@ -124 +129 @@
                         "description" { set data(description) $value }
                         "hide"        { GetBoolean $b hide data(hide) }
+                        "linewidth"   { set data(linewidth) $value }
                         "label"       { set data(label) $value }
                         "corner*" { 

trunk/gui/scripts/flowspeed.tcl

@@ -59 +59 @@
 itcl::body Rappture::Flowspeed::constructor {args} {
     itk_component add entry {
-        entry $itk_interior.entry -font "arial 9"
+        entry $itk_interior.entry
     } {
         usual
         keep -width
-        ignore -font
         rename -background -textbackground textBackground Background
         rename -foreground -textforeground textForeground Foreground

trunk/gui/scripts/flowvisviewer.tcl

@@ -904 +904 @@
         foreach comp [$dataobj components] {
             # Send the data as one huge base64-encoded mess -- yuck!
-            set data [$dataobj blob $comp]
-            set nbytes [string length $data]
+            set time [time {
+                set data [$dataobj blob $comp]
+                set nbytes [string length $data]
+            }]
+            puts stderr rebuild=$time
             set extents [$dataobj extents $comp]
+
             # I have a field. Is a vector field or a volume field?
             if { $extents == 1 } {
@@ -1169 +1173 @@
         foreach comp [$dataobj components] {
             # Send the data as one huge base64-encoded mess -- yuck!
-            set data [$dataobj blob $comp]
-            set nbytes [string length $data]
+            set blob [time { set data [$dataobj blob $comp] }]
+            puts stderr blob=$blob
+            set nbytes [string length $data]
             set extents [$dataobj extents $comp]
             # I have a field. Is a vector field or a volume field?
@@ -1196 +1201 @@
     FixSettings grid
     FixSettings axes
-    # nothing to send -- activate the proper ivol
+    FixSettings volume
+    FixSettings outline
+    FixSettings light
+    FixSettings transp
+    # nothing to send -- activate the proper volume
     set _first [lindex [get] 0]
     if {"" != $_first} {
         FixSettings light
         FixSettings transp
-        FixSettings outline
-
         set axis [$_first hints updir]
         if {"" != $axis} {
@@ -1266 +1273 @@
     # care.  We're finished here.
     blt::busy hold $itk_component(hull); update idletasks
-    SendBytes $_outbuf;                 
+    SendBytes $_outbuf
     blt::busy release $itk_component(hull)
     set _buffering 0;                   # Turn off buffering.
@@ -1737 +1744 @@
     }
     array set style [lindex [$dataobj components -style $comp] 0]
+    set _settings($this-light) $style(-light)
+    set _settings($this-transp) $style(-transp)
+    set _settings($this-opacity) [expr $style(-opacity) * 100]
     set tf "$style(-color):$style(-levels):$style(-opacity)"
     set _obj2style($dataobj-$comp) $tf
@@ -1757 +1767 @@
         -levels 6
         -opacity 1.0
+        -light 40
+        -transp 50
     }
     set dataobj ""; set comp ""
@@ -1809 +1821 @@
     }
     set max $_settings($tag-opacity)
-
+    
     set isovalues {}
     foreach m $_isomarkers($tf) {
@@ -2592 +2604 @@
     append cmd "if {\[flow exists $tag\]} {flow delete $tag}\n"
     array set info  [$flowobj hints]
+    set _settings($this-volume) $info(volume)
+    set _settings($this-outline) $info(outline)
+    set _settings($this-arrows) $info(arrows)
+    set _settings($this-duration) $info(duration)
+    $itk_component(speed) value $info(speed)
     append cmd "flow add $tag -position $info(position) -axis $info(axis) "
     append cmd "-volume $info(volume) -outline $info(outline) "
@@ -2612 +2629 @@
         set color [Color2RGB $info(color)]
         append cmd "$tag box add $info(name) -color {$color} "
-        append cmd "-hide $info(hide) "
+        append cmd "-hide $info(hide) -linewidth $info(linewidth) "
         append cmd "-corner1 {$info(corner1)} -corner2 {$info(corner2)}\n"
     }    

trunk/gui/scripts/heightmapviewer.tcl

@@ -541 +541 @@
     foreach dataobj $_sendobjs {
         foreach comp [$dataobj components] {
-            set data [$dataobj blob $comp]
-
             foreach { vmin vmax }  [$dataobj limits v] break
             if { $_limits(vmin) == "" || $vmin < $_limits(vmin) } {
@@ -550 +548 @@
                 set _limits(vmax) $vmax
             }
-
             # tell the engine to expect some data
+            set data [$dataobj blob $comp]
             set nbytes [string length $data]
             if { ![SendBytes "heightmap data follows $nbytes\n"] } {

trunk/gui/scripts/unirect3d.tcl

@@ -103 +103 @@
         lappend data "values" [$_values range 0 end]
     }
-    return [Rappture::encoding::encode -as zb64 "$data"]
+    return "@@RP-ENC:raw\n$data"
+    #return [Rappture::encoding::encode -as b64 "$data"]
 }
 

trunk/src/core/RpEncode.cc

@@ -261 +261 @@
             bytes += 11;
             size -= 11;
-            headerFlags |= RPENC_Z;
+            headerFlags = RPENC_Z;
         } else if ((size > 13) && (strncmp(bytes, "@@RP-ENC:b64\n", 13) == 0)){
             bytes += 13;
             size -= 13;
-            headerFlags |= RPENC_B64;
+            headerFlags = RPENC_B64;
         } else if ((size > 14) && (strncmp(bytes, "@@RP-ENC:zb64\n", 14) == 0)){
             bytes += 14;
             size -= 14;
-            headerFlags |= (RPENC_B64 | RPENC_Z);
-        } else if ((size > 13) && (strncmp(bytes, "@@RP-ENC:raw\n", 14) == 0)){
+            headerFlags = (RPENC_B64 | RPENC_Z);
+        } else if ((size > 13) && (strncmp(bytes, "@@RP-ENC:raw\n", 13) == 0)){
             bytes += 13;
             size -= 13;