Changeset 5110
- Timestamp:
- Mar 9, 2015 3:10:38 PM (9 years ago)
- Location:
- branches/1.3
- Files:
-
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/1.3
- Property svn:mergeinfo changed
/trunk merged: 5092-5094,5097
- Property svn:mergeinfo changed
-
branches/1.3/gui/scripts/field.tcl
r5011 r5110 924 924 } 925 925 if { [catch { Rappture::DxToVtk $contents } vtkdata] == 0 } { 926 unset contents 926 927 ReadVtkDataSet $cname $vtkdata 927 928 if 0 { … … 931 932 } 932 933 } else { 933 puts stderr "Can't parse dx data: $vtkdata" 934 unset contents 935 puts stderr "Can't parse dx data" 934 936 } 935 937 if { $_alwaysConvertDX || … … 941 943 set _comp2dx($cname) $data 942 944 } 945 unset data 946 unset vtkdata 943 947 set _comp2style($cname) [$_field get $cname.style] 944 948 if {[$_field element $cname.flow] != ""} { … … 1402 1406 if {[$_xmlobj element $path] == ""} { 1403 1407 # Unknown mesh designated. 1408 puts stderr "ERROR: Unknown mesh \"$path\"" 1404 1409 return 0 1405 1410 } … … 1604 1609 $v set [$_field get $cname.values] 1605 1610 if { [$v length] == 0 } { 1611 puts stderr "ERROR: No field values" 1606 1612 return 0 1607 1613 } -
branches/1.3/gui/scripts/flowvisviewer.tcl
r4848 r5110 553 553 eval itk_initialize $args 554 554 555 EnableWaitDialog 900 555 556 Connect 556 557 } … … 1179 1180 set h [winfo height $itk_component(3dview)] 1180 1181 if { $w < 2 || $h < 2 } { 1182 update 1181 1183 $_dispatcher event -idle !rebuild 1182 1184 return -
branches/1.3/gui/scripts/nanovisviewer.tcl
r4865 r5110 373 373 eval itk_initialize $args 374 374 375 EnableWaitDialog 900 375 376 Connect 376 377 } … … 865 866 set h [winfo height $itk_component(3dview)] 866 867 if { $w < 2 || $h < 2 } { 868 update 867 869 $_dispatcher event -idle !rebuild 868 870 return -
branches/1.3/gui/scripts/vtkglyphviewer.tcl
r5108 r5110 442 442 443 443 eval itk_initialize $args 444 445 EnableWaitDialog 900 444 446 Connect 445 447 } … … 933 935 set h [winfo height $itk_component(view)] 934 936 if { $w < 2 || $h < 2 } { 937 update 935 938 $_dispatcher event -idle !rebuild 936 939 return -
branches/1.3/gui/scripts/vtkheightmapviewer.tcl
r5013 r5110 916 916 set h [winfo height $itk_component(view)] 917 917 if { $w < 2 || $h < 2 } { 918 update 918 919 $_dispatcher event -idle !rebuild 919 920 return -
branches/1.3/gui/scripts/vtkimageviewer.tcl
r5011 r5110 171 171 set _serverType "vtkvis" 172 172 173 EnableWaitDialog 900174 173 # Rebuild event 175 174 $_dispatcher register !rebuild … … 395 394 396 395 set _image(download) [image create photo] 396 397 397 eval itk_initialize $args 398 399 EnableWaitDialog 900 398 400 Connect 399 401 set _beforeConnect 0 … … 904 906 set h [winfo height $itk_component(view)] 905 907 if { $w < 2 || $h < 2 } { 908 update 906 909 $_dispatcher event -idle !rebuild 907 910 return -
branches/1.3/gui/scripts/vtkisosurfaceviewer.tcl
r5108 r5110 471 471 eval itk_initialize $args 472 472 473 EnableWaitDialog 500473 EnableWaitDialog 900 474 474 Connect 475 # FIXME: Removing this update breaks wizard mode (see examples/3D)476 # However, it also allows an error in the initialization order477 # where FieldResult::add is called from ResultViewer before this478 # constructor is completed.479 #update480 475 } 481 476 … … 1054 1049 set h [winfo height $itk_component(view)] 1055 1050 if { $w < 2 || $h < 2 } { 1051 update 1056 1052 $_dispatcher event -idle !rebuild 1057 1053 return -
branches/1.3/gui/scripts/vtkmeshviewer.tcl
r5011 r5110 342 342 343 343 eval itk_initialize $args 344 345 EnableWaitDialog 900 344 346 Connect 345 347 } … … 804 806 # ---------------------------------------------------------------------- 805 807 itcl::body Rappture::VtkMeshViewer::Rebuild {} { 806 807 808 set w [winfo width $itk_component(view)] 808 809 set h [winfo height $itk_component(view)] 809 810 if { $w < 2 || $h < 2 } { 811 update 810 812 $_dispatcher event -idle !rebuild 811 813 return -
branches/1.3/gui/scripts/vtkstreamlinesviewer.tcl
r5108 r5110 952 952 set h [winfo height $itk_component(view)] 953 953 if { $w < 2 || $h < 2 } { 954 update 954 955 $_dispatcher event -idle !rebuild 955 956 return -
branches/1.3/gui/scripts/vtksurfaceviewer.tcl
r5108 r5110 400 400 eval itk_initialize $args 401 401 402 EnableWaitDialog 500402 EnableWaitDialog 900 403 403 Connect 404 404 } … … 884 884 set h [winfo height $itk_component(view)] 885 885 if { $w < 2 || $h < 2 } { 886 update 886 887 $_dispatcher event -idle !rebuild 887 888 return -
branches/1.3/gui/scripts/vtkviewer.tcl
r5009 r5110 443 443 444 444 eval itk_initialize $args 445 446 EnableWaitDialog 900 445 447 Connect 446 448 } … … 1019 1021 # ---------------------------------------------------------------------- 1020 1022 itcl::body Rappture::VtkViewer::Rebuild {} { 1021 1022 1023 set w [winfo width $itk_component(view)] 1023 1024 set h [winfo height $itk_component(view)] 1024 1025 if { $w < 2 || $h < 2 } { 1026 update 1025 1027 $_dispatcher event -idle !rebuild 1026 1028 return -
branches/1.3/gui/scripts/vtkvolumeviewer.tcl
r5108 r5110 917 917 set h [winfo height $itk_component(view)] 918 918 if { $w < 2 || $h < 2 } { 919 update 919 920 $_dispatcher event -idle !rebuild 920 921 return
Note: See TracChangeset
for help on using the changeset viewer.