Changeset 3067 for trunk

Timestamp:

Jun 28, 2012 11:55:09 AM (12 years ago)

Author:

gah

Message:

change drawing to use glyphs tag

Location:

trunk/gui/scripts

Files:

• drawing.tcl (modified) (5 diffs)
• vtkviewer.tcl (modified) (22 diffs)

trunk/gui/scripts/drawing.tcl

@@ -27 +27 @@
     public method type { elem }
     public method style { elem }
+    public method shape { elem }
     public method values { elem }
     public method data { elem }
@@ -36 +37 @@
     private variable _actors 
     private variable _styles 
+    private variable _shapes 
     private variable _labels 
     private variable _types 
@@ -73 +75 @@
             polygon* {
                 set _data($elem) [$_xmlobj get $path.$elem.vtk]
+                set _data($elem) [string trim $_data($elem)]
                 set _styles($elem) [$_xmlobj get $path.$elem.about.style]
                 set _labels($elem) [$_xmlobj get $path.$elem.about.label]
@@ -79 +82 @@
             streamlines* {
                 set _data($elem) [$_xmlobj get $path.$elem.vtk]
+                set _data($elem) [string trim $_data($elem)]
                 set _styles($elem) [$_xmlobj get $path.$elem.about.style]
                 set _labels($elem) [$_xmlobj get $path.$elem.about.label]
                 set _types($elem) streamlines
             }
-            spheres* {
+            glyphs* {
                 set _data($elem) [$_xmlobj get $path.$elem.vtk]
+                set _data($elem) [string trim $_data($elem)]
                 set _styles($elem) [$_xmlobj get $path.$elem.about.style]
                 set _labels($elem) [$_xmlobj get $path.$elem.about.label]
-                set _types($elem) spheres
+                set _shapes($elem) [$_xmlobj get $path.$elem.about.shape]
+                set _types($elem) glyphs
             }
         }
@@ -173 +179 @@
 
 # 
+# shape -- 
+# 
+#       Returns the shape of the glyphs in the drawing element.
+#
+itcl::body Rappture::Drawing::shape { elem } {
+    if { [info exists _shapes($elem)] } {
+        return $_shapes($elem)
+    } 
+    return ""
+}
+
+# 
 # data -- 
 # 

trunk/gui/scripts/vtkviewer.tcl

@@ -128 +128 @@
     private variable _reset 1      ;# indicates if camera needs to be reset
                                     # to starting position.
-    private variable _haveSpheres 0
+    private variable _haveGlyphs 0
 
     private variable _first ""     ;# This is the topmost dataset.
@@ -294 +294 @@
     Rappture::Tooltip::for $itk_component(zoomout) "Zoom out"
 
-    if { [catch {
     BuildVolumeTab
     BuildAxisTab
     BuildCutawayTab
     BuildCameraTab
-    } errs] != 0 } {
-        puts stderr errs=$errs
-    }
+
     # Legend
 
@@ -405 +402 @@
         set _height 500
     }
-    #puts stderr "DoResize screen size $_width $_height"
     set _start [clock clicks -milliseconds]
-    #puts stderr "screen size request width=$_width height=$_height"
     SendCmd "screen size $_width $_height"
     #SendCmd "imgflush"
@@ -424 +419 @@
 
 itcl::body Rappture::VtkViewer::EventuallyResize { w h } {
-    #puts stderr "EventuallyResize $w $h"
     set _width $w
     set _height $h
@@ -437 +431 @@
 
 itcl::body Rappture::VtkViewer::EventuallyRotate { q } {
-    #puts stderr "EventuallyRotate $w $h"
     foreach { _view(qw) _view(qx) _view(qy) _view(qz) } $q break
     if { !$_rotatePending } {
@@ -695 +688 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::VtkViewer::Connect {} {
-    #puts stderr "Enter Connect: [info level -1]"
     set _hosts [GetServerList "vtkvis"]
     if { "" == $_hosts } {
@@ -702 +694 @@
     set result [VisViewer::Connect $_hosts]
     if { $result } {
-        #puts stderr "Connected to $_hostname sid=$_sid"
         set w [winfo width $itk_component(view)]
         set h [winfo height $itk_component(view)]
@@ -789 +780 @@
         set time [clock seconds]
         set date [clock format $time]
-        #puts stderr "$date: received image [image width $_image(plot)]x[image height $_image(plot)] image>"        
         if { $_start > 0 } {
             set finish [clock clicks -milliseconds]
-            #puts stderr "round trip time [expr $finish -$_start] milliseconds"
             set _start 0
         }
@@ -907 +896 @@
                 append _outbuf "dataset add $tag data follows $length\n"
                 append _outbuf $bytes
-                if { [$dataobj type $comp] != "spheres" } {
+                if { [$dataobj type $comp] != "glyphs" } {
                 }
                 set _datasets($tag) 1
@@ -1270 +1259 @@
 #
 itcl::body Rappture::VtkViewer::RequestLegend {} {
-    #puts stderr "RequestLegend _first=$_first"
-    #puts stderr "RequestLegend width=$_width height=$_height"
     set font "Arial 8"
     set lineht [font metrics $font -linespace]
@@ -1284 +1271 @@
         foreach {dataobj comp} [split $dataset -] break
         if { [info exists _dataset2style($dataset)] } {
-            #puts stderr "RequestLegend w=$w h=$h"
             SendCmd "legend $_dataset2style($dataset) vmag {} {} $w $h 0"
             break;
@@ -1304 +1290 @@
     set colormap "$style(-color):$style(-levels):$style(-opacity)"
     if { [info exists _colormaps($colormap)] } {
-        puts stderr "Colormap $colormap already built"
         return $colormap
     }
@@ -1320 +1305 @@
             SendCmd "pseudocolor colormap $colormap $tag"
         }
-        "spheres" {
+        "glyphs" {
             #SendCmd "glyphs colormap $colormap $tag"
         }
@@ -1406 +1391 @@
             set _limits($tag) [$output GetBounds]
             set pointData [$output GetPointData]
-            puts stderr "\#scalars=[$reader GetNumberOfScalarsInFile]"
-            puts stderr "\#vectors=[$reader GetNumberOfVectorsInFile]"
-            puts stderr "\#tensors=[$reader GetNumberOfTensorsInFile]"
-            puts stderr "\#normals=[$reader GetNumberOfNormalsInFile]"
-            puts stderr "\#fielddata=[$reader GetNumberOfFieldDataInFile]"
-            puts stderr "fielddataname=[$reader GetFieldDataNameInFile 0]"
             set fieldData [$output GetFieldData]
-            set pointData [$output GetPointData]
-            puts stderr "field \#arrays=[$fieldData GetNumberOfArrays]"
-            puts stderr "point \#arrays=[$pointData GetNumberOfArrays]"
-            puts stderr "field \#components=[$fieldData GetNumberOfComponents]"
-            puts stderr "point \#components=[$pointData GetNumberOfComponents]"
-            puts stderr "field \#tuples=[$fieldData GetNumberOfTuples]"
-            puts stderr "point \#tuples=[$pointData GetNumberOfTuples]"
-            puts stderr "point \#scalars=[$pointData GetScalars]"
-            puts stderr vectors=[$pointData GetVectors]
+            if 0 {
+                puts stderr "\#scalars=[$reader GetNumberOfScalarsInFile]"
+                puts stderr "\#vectors=[$reader GetNumberOfVectorsInFile]"
+                puts stderr "\#tensors=[$reader GetNumberOfTensorsInFile]"
+                puts stderr "\#normals=[$reader GetNumberOfNormalsInFile]"
+                puts stderr "\#fielddata=[$reader GetNumberOfFieldDataInFile]"
+                puts stderr "fielddataname=[$reader GetFieldDataNameInFile 0]"
+                puts stderr "field \#arrays=[$fieldData GetNumberOfArrays]"
+                puts stderr "point \#arrays=[$pointData GetNumberOfArrays]"
+                puts stderr "field \#components=[$fieldData GetNumberOfComponents]"
+                puts stderr "point \#components=[$pointData GetNumberOfComponents]"
+                puts stderr "field \#tuples=[$fieldData GetNumberOfTuples]"
+                puts stderr "point \#tuples=[$pointData GetNumberOfTuples]"
+                puts stderr "point \#scalars=[$pointData GetScalars]"
+                puts stderr vectors=[$pointData GetVectors]
+            }
             rename $output ""
             rename $reader ""
@@ -1875 +1861 @@
         set settings(-wireframe) 1
     }
-    if { $type == "spheres" } {
+    if { $type == "glyphs" } {
         array set settings {
             -color \#808080
@@ -1887 +1873 @@
             -visible 1
         }
+        set shape [$dataobj shape $comp]
         array set settings $style
-        SendCmd "glyphs add sphere $tag"
+        SendCmd "glyphs add $shape $tag"
         SendCmd "glyphs normscale 0 $tag"
         SendCmd "glyphs gscale $settings(-gscale) $tag"
@@ -1897 +1884 @@
         SendCmd "glyphs opacity $settings(-opacity) $tag"
         SendCmd "glyphs visible $settings(-visible) $tag"
-        set _haveSpheres 1
+        set _haveGlyphs 1
     } else {
         array set settings {
@@ -1914 +1901 @@
         set _volume(visible) $settings(-visible)
     } 
-    if { $type != "spheres" } {
+    if { $type != "glyphs" } {
         SendCmd "polydata edges $settings(-edges) $tag"
         set _volume(edges) $settings(-edges)
@@ -1946 +1933 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::VtkViewer::ReceiveLegend { colormap title vmin vmax size } {
-    #puts stderr "ReceiveLegend colormap=$colormap title=$title range=$vmin,$vmax size=$size"
     set _limits(vmin) $vmin
     set _limits(vmax) $vmax
@@ -1956 +1942 @@
         }
         $_image(legend) configure -data $bytes
-        #puts stderr "read $size bytes for [image width $_image(legend)]x[image height $_image(legend)] legend>"
         DrawLegend
     }
@@ -2046 +2031 @@
     # Make a swatch of the selected color
     if { [catch { $_image(legend) get 10 $imgY } pixel] != 0 } {
-        #puts stderr "out of range: $imgY"
         return
     }
@@ -2059 +2043 @@
     # Compute the value of the point
     set t [expr 1.0 - (double($imgY) / double($imgHeight-1))]
-    #puts stderr "t=$t x=$x y=$y imgY=$imgY"
     set value [expr $t * ($_limits(vmax) - $_limits(vmin)) + $_limits(vmin)]
     set tipx [expr $x + 15] 
     set tipy [expr $y - 5]
-    #puts stderr "tipx=$tipx tipy=$tipy x=$x y=$y"
     Rappture::Tooltip::text $c "$_title $value"
     Rappture::Tooltip::tooltip show $c +$tipx,+$tipy