Changeset 3291
- Timestamp:
- Feb 10, 2013, 6:59:06 AM (12 years ago)
- Location:
- branches/Rappture 1.2/gui/scripts
- Files:
-
- 5 edited
-
field.tcl (modified) (2 diffs)
-
resultviewer.tcl (modified) (1 diff)
-
sequence.tcl (modified) (6 diffs)
-
sequenceresult.tcl (modified) (9 diffs)
-
vtkheightmapviewer.tcl (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/Rappture 1.2/gui/scripts/field.tcl
r3290 r3291 21 21 22 22 # 23 # Possible field types: 24 # 25 # unirect2d -- heightmap. if extents > 1, flow. 26 # unirect3d -- flow 27 # cloud (2d) -- contour 28 # cloud (3d) -- isosurface 29 # mesh (3d) -- isosurface 30 # mesh (2d) -- coutour 31 # dx -- volume 32 # ucd -- isosurface 33 # vtk (3d) -- isosurface 34 # vtk (2d) -- contour 35 # 36 # Types: 23 # Possible field dataset types: 24 # 25 # 2D Datasets 26 # vtk (range of z-axis is zero). 27 # unirect2d (deprecated except where extents > 1) 28 # cloud (x,y point coordinates) (deprecated) 29 # mesh 30 # 3D Datasets 31 # vtk 32 # unirect3d 33 # cloud (x,y,z coordinates) (deprecated) 34 # mesh 35 # dx (FIXME: make dx-to-vtk converter work) 36 # ucd avs 37 # 38 # Viewers: 37 39 # Format Dim Description Viewer Server 38 40 # vtk 2 vtk file data. contour vtkvis … … 44 46 # unirect3d 3 unirect2d + extents > 1 flow flow nanovis 45 47 # 46 48 # The goal should be any 3D dataset can view a isosurface, streamlines, 49 # volume (or flow if extents > 1). Any 2D dataset can view a 50 # contour, heightmap (or flow if extents > 1). 51 # 52 # 47 53 itcl::class Rappture::Field { 48 54 private variable _dim 0; # Dimension of mesh -
branches/Rappture 1.2/gui/scripts/resultviewer.tcl
r3290 r3291 294 294 } 295 295 2D { 296 set mode "heightmap" 297 if {![info exists _mode2widget($mode)]} { 298 set viewer [$dataobj viewer] 299 set extents [$dataobj extents] 300 if { $extents > 1 } { 301 set viewer "flowvis" 302 } 303 set w $itk_interior.field2d 296 set mode [$dataobj viewer] 297 set extents [$dataobj extents] 298 if { $extents > 1 } { 299 set mode "flowvis" 300 } 301 if {![info exists _mode2widget($mode)]} { 302 set w $itk_interior.$mode 304 303 if { ![winfo exists $w] } { 305 Rappture::Field2DResult $w -mode $viewer 304 Rappture::Field2DResult $w -mode $mode 305 set _mode2widget($mode) $w 306 306 } 307 set _mode2widget($mode) $w308 307 } 309 308 } 310 309 3D { 311 set mode "field3D" 312 if {![info exists _mode2widget($mode)]} { 313 set fmt [$dataobj viewer] 314 set w $itk_interior.field3d 315 Rappture::Field3DResult $w -mode $fmt 310 set mode [$dataobj viewer] 311 set extents [$dataobj extents] 312 if { $extents > 1 } { 313 set mode "flowvis" 314 } 315 if {![info exists _mode2widget($mode)]} { 316 set w $itk_interior.$mode 317 Rappture::Field3DResult $w -mode $mode 316 318 set _mode2widget($mode) $w 317 319 } -
branches/Rappture 1.2/gui/scripts/sequence.tcl
r3177 r3291 1 1 2 # ---------------------------------------------------------------------- 2 3 # COMPONENT: sequence - represents a sequence of output results … … 71 72 } 72 73 curve { 73 set obj [Rappture::Curve :: #auto $xmlobj $path.$name.$cname]74 set obj [Rappture::Curve ::\#auto $xmlobj $path.$name.$cname] 74 75 } 75 76 datatable { 76 set obj [Rappture::DataTable :: #auto $xmlobj $path.$name.$cname]77 set obj [Rappture::DataTable ::\#auto $xmlobj $path.$name.$cname] 77 78 } 78 79 histogram { 79 set obj [Rappture::Histogram :: #auto $xmlobj $path.$name.$cname]80 set obj [Rappture::Histogram ::\#auto $xmlobj $path.$name.$cname] 80 81 } 81 82 field { 82 set obj [Rappture::Field :: #auto $xmlobj $path.$name.$cname]83 set obj [Rappture::Field ::\#auto $xmlobj $path.$name.$cname] 83 84 } 84 85 image { 85 set obj [Rappture::Image :: #auto $xmlobj $path.$name.$cname]86 set obj [Rappture::Image ::\#auto $xmlobj $path.$name.$cname] 86 87 } 87 88 structure { … … 119 120 } 120 121 } 121 122 122 # 123 123 # Generate a list of sorted index values. … … 134 134 # sort according to raw values; store both values 135 135 set _indices [lsort -real -index 1 $vals] 136 137 136 } else { 138 137 # are the indices integers, reals, or strings? … … 182 181 itcl::body Rappture::Sequence::value {pos} { 183 182 set i [lindex [lindex $_indices $pos] 0] 183 184 # FIXME: This is a bandaid on what appears to be a timing problem. 185 # This "dataobjs" method is now called before any sequence frames 186 # have been added. 187 if { ![info exists _dataobjs($i)] } { 188 return "" 189 } 190 184 191 return $_dataobjs($i) 185 192 } … … 193 200 itcl::body Rappture::Sequence::label {pos} { 194 201 set i [lindex [lindex $_indices $pos] 0] 202 203 # FIXME: This is a bandaid on what appears to be a timing problem. 204 # This "label" method is now called before any sequence frames 205 # have been added. 206 if { ![info exists _labels($i)] } { 207 return "" 208 } 209 195 210 return $_labels($i) 196 211 } -
branches/Rappture 1.2/gui/scripts/sequenceresult.tcl
r3246 r3291 436 436 # Otherwise, hide it. 437 437 # 438 set viewer$itk_component(area).viewer439 if {[winfo exists $ viewer]} {438 set w $itk_component(area).viewer 439 if {[winfo exists $w]} { 440 440 if {"" == $_topmost} { 441 pack forget $ viewer441 pack forget $w 442 442 pack forget $itk_component(player) 443 443 return 444 444 } else { 445 pack $ viewer-expand yes -fill both445 pack $w -expand yes -fill both 446 446 pack $itk_component(player) -side bottom -fill x 447 447 } … … 458 458 switch -- $type { 459 459 ::Rappture::Drawing { 460 Rappture::VtkViewer $ viewer461 pack $ viewer-expand yes -fill both460 Rappture::VtkViewer $w 461 pack $w -expand yes -fill both 462 462 } 463 463 ::Rappture::Curve { 464 Rappture::XyResult $ viewer465 pack $ viewer-expand yes -fill both464 Rappture::XyResult $w 465 pack $w -expand yes -fill both 466 466 } 467 467 ::Rappture::Histogram { 468 Rappture::HistogramResult $ viewer469 pack $ viewer-expand yes -fill both468 Rappture::HistogramResult $w 469 pack $w -expand yes -fill both 470 470 } 471 471 ::Rappture::DataTable { 472 Rappture::DataTable $ viewer473 pack $ viewer-expand yes -fill both472 Rappture::DataTable $w 473 pack $w -expand yes -fill both 474 474 } 475 475 ::Rappture::Image { 476 Rappture::ImageResult $ viewer477 pack $ viewer-expand yes -fill both476 Rappture::ImageResult $w 477 pack $w -expand yes -fill both 478 478 } 479 479 ::Rappture::Field { … … 495 495 } 496 496 } 497 set mode [$dataobj viewer] 497 498 switch -- $dimensions { 498 499 2D { 499 set mode [$dataobj viewer] 500 set extents [$dataobj extents] 501 if { $extents > 1 } { 502 set mode "flowvis" 503 } 504 Rappture::Field2DResult $viewer -mode $mode 500 Rappture::Field2DResult $w -mode $mode 505 501 } 506 502 3D { 507 set fmt [$dataobj type] 508 switch -- $fmt { 509 "points-on-mesh" { 510 set mesh [$dataobj mesh] 511 set fmt [expr {("" != $mesh) ? "vtk" : "nanovis"}] 512 set extents [$dataobj extents] 513 if { $extents > 1 } { 514 set fmt "flowvis" 515 } 516 } 517 "opendx" - "dx" { 518 set fmt "nanovis" 519 set extents [$dataobj extents] 520 if { $extents > 1 } { 521 set fmt "flowvis" 522 } 523 } 524 "vtkvolume" { 525 set fmt "vtkvolume" 526 } 527 "vtkstreamlines" { 528 set fmt "vtkstreamlines" 529 } 530 "" { 531 set fmt "auto" 532 } 533 } 534 Rappture::Field3DResult $viewer -mode $fmt 503 Rappture::Field3DResult $w -mode $mode 535 504 } 536 505 default { … … 539 508 } 540 509 } 541 pack $ viewer-expand yes -fill both510 pack $w -expand yes -fill both 542 511 } 543 512 ::Rappture::LibraryObj { 544 513 switch -- [$dataobj element -as type] { 545 514 structure { 546 Rappture::DeviceResult $ viewer547 pack $ viewer-expand yes -fill both515 Rappture::DeviceResult $w 516 pack $w -expand yes -fill both 548 517 } 549 518 default { … … 559 528 } 560 529 } 561 562 530 # 563 531 # Load the current sequence info the viewer. 564 532 # 565 533 $itk_component(indexLabel) configure -text [$_topmost hints indexlabel] 566 567 $ viewerdelete534 535 $w delete 568 536 $itk_component(dial) clear 569 537 … … 573 541 eval lappend all [$_topmost value $i] 574 542 } 575 eval $ viewerscale $all543 eval $w scale $all 576 544 577 545 set _indices "" … … 621 589 # ---------------------------------------------------------------------- 622 590 itcl::body Rappture::SequenceResult::_fixValue {} { 623 set viewer$itk_component(area).viewer624 if {![winfo exists $ viewer]} {591 set w $itk_component(area).viewer 592 if {![winfo exists $w]} { 625 593 return 626 594 } 627 $ viewerdelete595 $w delete 628 596 if { $_topmost == "" } { 629 597 return … … 631 599 set val [$itk_component(dial) get -format label current] 632 600 set _pos [lsearch -glob $_indices $val*] 601 633 602 # populate the label for this element 634 603 if { "" != [$_topmost hints indexlabel] } { … … 646 615 } 647 616 } 648 $ vieweradd $dataobj $settings649 } 650 } 617 $w add $dataobj $settings 618 } 619 } -
branches/Rappture 1.2/gui/scripts/vtkheightmapviewer.tcl
r3289 r3291 168 168 # ---------------------------------------------------------------------- 169 169 itcl::body Rappture::VtkHeightmapViewer::constructor {hostlist args} { 170 package require vtk171 170 set _serverType "vtkvis" 172 171
Note: See TracChangeset
for help on using the changeset viewer.
