- Timestamp:
- Jun 28, 2012, 11:55:09 AM (12 years ago)
- Location:
- trunk/gui/scripts
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gui/scripts/drawing.tcl
r2792 r3067 27 27 public method type { elem } 28 28 public method style { elem } 29 public method shape { elem } 29 30 public method values { elem } 30 31 public method data { elem } … … 36 37 private variable _actors 37 38 private variable _styles 39 private variable _shapes 38 40 private variable _labels 39 41 private variable _types … … 73 75 polygon* { 74 76 set _data($elem) [$_xmlobj get $path.$elem.vtk] 77 set _data($elem) [string trim $_data($elem)] 75 78 set _styles($elem) [$_xmlobj get $path.$elem.about.style] 76 79 set _labels($elem) [$_xmlobj get $path.$elem.about.label] … … 79 82 streamlines* { 80 83 set _data($elem) [$_xmlobj get $path.$elem.vtk] 84 set _data($elem) [string trim $_data($elem)] 81 85 set _styles($elem) [$_xmlobj get $path.$elem.about.style] 82 86 set _labels($elem) [$_xmlobj get $path.$elem.about.label] 83 87 set _types($elem) streamlines 84 88 } 85 spheres* {89 glyphs* { 86 90 set _data($elem) [$_xmlobj get $path.$elem.vtk] 91 set _data($elem) [string trim $_data($elem)] 87 92 set _styles($elem) [$_xmlobj get $path.$elem.about.style] 88 93 set _labels($elem) [$_xmlobj get $path.$elem.about.label] 89 set _types($elem) spheres 94 set _shapes($elem) [$_xmlobj get $path.$elem.about.shape] 95 set _types($elem) glyphs 90 96 } 91 97 } … … 173 179 174 180 # 181 # shape -- 182 # 183 # Returns the shape of the glyphs in the drawing element. 184 # 185 itcl::body Rappture::Drawing::shape { elem } { 186 if { [info exists _shapes($elem)] } { 187 return $_shapes($elem) 188 } 189 return "" 190 } 191 192 # 175 193 # data -- 176 194 # -
trunk/gui/scripts/vtkviewer.tcl
r3054 r3067 128 128 private variable _reset 1 ;# indicates if camera needs to be reset 129 129 # to starting position. 130 private variable _have Spheres 0130 private variable _haveGlyphs 0 131 131 132 132 private variable _first "" ;# This is the topmost dataset. … … 294 294 Rappture::Tooltip::for $itk_component(zoomout) "Zoom out" 295 295 296 if { [catch {297 296 BuildVolumeTab 298 297 BuildAxisTab 299 298 BuildCutawayTab 300 299 BuildCameraTab 301 } errs] != 0 } { 302 puts stderr errs=$errs 303 } 300 304 301 # Legend 305 302 … … 405 402 set _height 500 406 403 } 407 #puts stderr "DoResize screen size $_width $_height"408 404 set _start [clock clicks -milliseconds] 409 #puts stderr "screen size request width=$_width height=$_height"410 405 SendCmd "screen size $_width $_height" 411 406 #SendCmd "imgflush" … … 424 419 425 420 itcl::body Rappture::VtkViewer::EventuallyResize { w h } { 426 #puts stderr "EventuallyResize $w $h"427 421 set _width $w 428 422 set _height $h … … 437 431 438 432 itcl::body Rappture::VtkViewer::EventuallyRotate { q } { 439 #puts stderr "EventuallyRotate $w $h"440 433 foreach { _view(qw) _view(qx) _view(qy) _view(qz) } $q break 441 434 if { !$_rotatePending } { … … 695 688 # ---------------------------------------------------------------------- 696 689 itcl::body Rappture::VtkViewer::Connect {} { 697 #puts stderr "Enter Connect: [info level -1]"698 690 set _hosts [GetServerList "vtkvis"] 699 691 if { "" == $_hosts } { … … 702 694 set result [VisViewer::Connect $_hosts] 703 695 if { $result } { 704 #puts stderr "Connected to $_hostname sid=$_sid"705 696 set w [winfo width $itk_component(view)] 706 697 set h [winfo height $itk_component(view)] … … 789 780 set time [clock seconds] 790 781 set date [clock format $time] 791 #puts stderr "$date: received image [image width $_image(plot)]x[image height $_image(plot)] image>"792 782 if { $_start > 0 } { 793 783 set finish [clock clicks -milliseconds] 794 #puts stderr "round trip time [expr $finish -$_start] milliseconds"795 784 set _start 0 796 785 } … … 907 896 append _outbuf "dataset add $tag data follows $length\n" 908 897 append _outbuf $bytes 909 if { [$dataobj type $comp] != " spheres" } {898 if { [$dataobj type $comp] != "glyphs" } { 910 899 } 911 900 set _datasets($tag) 1 … … 1270 1259 # 1271 1260 itcl::body Rappture::VtkViewer::RequestLegend {} { 1272 #puts stderr "RequestLegend _first=$_first"1273 #puts stderr "RequestLegend width=$_width height=$_height"1274 1261 set font "Arial 8" 1275 1262 set lineht [font metrics $font -linespace] … … 1284 1271 foreach {dataobj comp} [split $dataset -] break 1285 1272 if { [info exists _dataset2style($dataset)] } { 1286 #puts stderr "RequestLegend w=$w h=$h"1287 1273 SendCmd "legend $_dataset2style($dataset) vmag {} {} $w $h 0" 1288 1274 break; … … 1304 1290 set colormap "$style(-color):$style(-levels):$style(-opacity)" 1305 1291 if { [info exists _colormaps($colormap)] } { 1306 puts stderr "Colormap $colormap already built"1307 1292 return $colormap 1308 1293 } … … 1320 1305 SendCmd "pseudocolor colormap $colormap $tag" 1321 1306 } 1322 " spheres" {1307 "glyphs" { 1323 1308 #SendCmd "glyphs colormap $colormap $tag" 1324 1309 } … … 1406 1391 set _limits($tag) [$output GetBounds] 1407 1392 set pointData [$output GetPointData] 1408 puts stderr "\#scalars=[$reader GetNumberOfScalarsInFile]"1409 puts stderr "\#vectors=[$reader GetNumberOfVectorsInFile]"1410 puts stderr "\#tensors=[$reader GetNumberOfTensorsInFile]"1411 puts stderr "\#normals=[$reader GetNumberOfNormalsInFile]"1412 puts stderr "\#fielddata=[$reader GetNumberOfFieldDataInFile]"1413 puts stderr "fielddataname=[$reader GetFieldDataNameInFile 0]"1414 1393 set fieldData [$output GetFieldData] 1415 set pointData [$output GetPointData] 1416 puts stderr "field \#arrays=[$fieldData GetNumberOfArrays]" 1417 puts stderr "point \#arrays=[$pointData GetNumberOfArrays]" 1418 puts stderr "field \#components=[$fieldData GetNumberOfComponents]" 1419 puts stderr "point \#components=[$pointData GetNumberOfComponents]" 1420 puts stderr "field \#tuples=[$fieldData GetNumberOfTuples]" 1421 puts stderr "point \#tuples=[$pointData GetNumberOfTuples]" 1422 puts stderr "point \#scalars=[$pointData GetScalars]" 1423 puts stderr vectors=[$pointData GetVectors] 1394 if 0 { 1395 puts stderr "\#scalars=[$reader GetNumberOfScalarsInFile]" 1396 puts stderr "\#vectors=[$reader GetNumberOfVectorsInFile]" 1397 puts stderr "\#tensors=[$reader GetNumberOfTensorsInFile]" 1398 puts stderr "\#normals=[$reader GetNumberOfNormalsInFile]" 1399 puts stderr "\#fielddata=[$reader GetNumberOfFieldDataInFile]" 1400 puts stderr "fielddataname=[$reader GetFieldDataNameInFile 0]" 1401 puts stderr "field \#arrays=[$fieldData GetNumberOfArrays]" 1402 puts stderr "point \#arrays=[$pointData GetNumberOfArrays]" 1403 puts stderr "field \#components=[$fieldData GetNumberOfComponents]" 1404 puts stderr "point \#components=[$pointData GetNumberOfComponents]" 1405 puts stderr "field \#tuples=[$fieldData GetNumberOfTuples]" 1406 puts stderr "point \#tuples=[$pointData GetNumberOfTuples]" 1407 puts stderr "point \#scalars=[$pointData GetScalars]" 1408 puts stderr vectors=[$pointData GetVectors] 1409 } 1424 1410 rename $output "" 1425 1411 rename $reader "" … … 1875 1861 set settings(-wireframe) 1 1876 1862 } 1877 if { $type == " spheres" } {1863 if { $type == "glyphs" } { 1878 1864 array set settings { 1879 1865 -color \#808080 … … 1887 1873 -visible 1 1888 1874 } 1875 set shape [$dataobj shape $comp] 1889 1876 array set settings $style 1890 SendCmd "glyphs add sphere $tag"1877 SendCmd "glyphs add $shape $tag" 1891 1878 SendCmd "glyphs normscale 0 $tag" 1892 1879 SendCmd "glyphs gscale $settings(-gscale) $tag" … … 1897 1884 SendCmd "glyphs opacity $settings(-opacity) $tag" 1898 1885 SendCmd "glyphs visible $settings(-visible) $tag" 1899 set _have Spheres 11886 set _haveGlyphs 1 1900 1887 } else { 1901 1888 array set settings { … … 1914 1901 set _volume(visible) $settings(-visible) 1915 1902 } 1916 if { $type != " spheres" } {1903 if { $type != "glyphs" } { 1917 1904 SendCmd "polydata edges $settings(-edges) $tag" 1918 1905 set _volume(edges) $settings(-edges) … … 1946 1933 # ---------------------------------------------------------------------- 1947 1934 itcl::body Rappture::VtkViewer::ReceiveLegend { colormap title vmin vmax size } { 1948 #puts stderr "ReceiveLegend colormap=$colormap title=$title range=$vmin,$vmax size=$size"1949 1935 set _limits(vmin) $vmin 1950 1936 set _limits(vmax) $vmax … … 1956 1942 } 1957 1943 $_image(legend) configure -data $bytes 1958 #puts stderr "read $size bytes for [image width $_image(legend)]x[image height $_image(legend)] legend>"1959 1944 DrawLegend 1960 1945 } … … 2046 2031 # Make a swatch of the selected color 2047 2032 if { [catch { $_image(legend) get 10 $imgY } pixel] != 0 } { 2048 #puts stderr "out of range: $imgY"2049 2033 return 2050 2034 } … … 2059 2043 # Compute the value of the point 2060 2044 set t [expr 1.0 - (double($imgY) / double($imgHeight-1))] 2061 #puts stderr "t=$t x=$x y=$y imgY=$imgY"2062 2045 set value [expr $t * ($_limits(vmax) - $_limits(vmin)) + $_limits(vmin)] 2063 2046 set tipx [expr $x + 15] 2064 2047 set tipy [expr $y - 5] 2065 #puts stderr "tipx=$tipx tipy=$tipy x=$x y=$y"2066 2048 Rappture::Tooltip::text $c "$_title $value" 2067 2049 Rappture::Tooltip::tooltip show $c +$tipx,+$tipy
Note: See TracChangeset
for help on using the changeset viewer.