Changeset 5096


Ignore:
Timestamp:
Mar 8, 2015 1:52:25 AM (5 years ago)
Author:
ldelgass
Message:

merge r5068:r5069 from trunk

Location:
branches/1.4
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • branches/1.4

  • branches/1.4/gui/scripts/visviewer.tcl

    r5007 r5096  
    5757    protected variable _debugConsole 0
    5858    protected variable _reportClientInfo 1
     59    # Number of milliscends to wait for server reply before displaying wait
     60    # dialog.  If set to 0, dialog is never displayed.
    5961    protected variable _waitTimeout 0
    6062
     
    9698    protected method SendBytes { bytes }
    9799    protected method SendCmd {string}
    98     protected method SendCmdNoWait {string}
    99100    protected method SendEcho { channel {data ""} }
    100101    protected method StartBufferingCommands {}
     
    478479# StartWaiting --
    479480#
    480 #    Read some number of bytes from the visualization server.
    481 #
    482 
     481#    Display a waiting dialog after a timeout has passed
     482#
    483483itcl::body Rappture::VisViewer::StartWaiting {} {
    484484    if { $_waitTimeout > 0 } {
     
    488488}
    489489
     490#
     491# StopWaiting --
     492#
     493#    Take down waiting dialog
     494#
    490495itcl::body Rappture::VisViewer::StopWaiting {} {
    491496    if { $_waitTimeout > 0 } {
     
    11801185    }
    11811186}
    1182 
    1183 #
    1184 # SendCmdNoWait
    1185 #
    1186 #       Send commands off to the rendering server.  If we're currently
    1187 #       sending data objects to the server, buffer the commands to be
    1188 #       sent later.
    1189 #
    1190 itcl::body Rappture::VisViewer::SendCmdNoWait {string} {
    1191     if { $_buffering } {
    1192         append _outbuf $string "\n"
    1193     } else {
    1194         SendBytes "$string\n"
    1195     }
    1196 }
  • branches/1.4/gui/scripts/vtkglyphviewer.tcl

    r5095 r5096  
    15651565    if { $_currentColormap != ""  } {
    15661566        set cmap $_currentColormap
    1567         SendCmdNoWait "legend $cmap $_colorMode $_curFldName {} $w $h 0"
     1567        SendCmd "legend $cmap $_colorMode $_curFldName {} $w $h 0"
    15681568    }
    15691569}
  • branches/1.4/gui/scripts/vtkisosurfaceviewer.tcl

    r5095 r5096  
    16901690    if { $_currentColormap != ""  } {
    16911691        set cmap $_currentColormap
    1692         SendCmdNoWait "legend $cmap scalar $_curFldName {} $w $h 0"
     1692        SendCmd "legend $cmap scalar $_curFldName {} $w $h 0"
    16931693    }
    16941694}
  • branches/1.4/gui/scripts/vtkstreamlinesviewer.tcl

    r5095 r5096  
    12391239itcl::body Rappture::VtkStreamlinesViewer::Pick {x y} {
    12401240    foreach tag [CurrentDatasets -visible] {
    1241         SendCmdNoWait "dataset getscalar pixel $x $y $tag"
     1241        SendCmd "dataset getscalar pixel $x $y $tag"
    12421242    }
    12431243}
     
    15231523        foreach {dataobj comp} [split $dataset -] break
    15241524        if { [info exists _dataset2style($dataset)] } {
    1525             SendCmdNoWait \
     1525            SendCmd \
    15261526                "legend $_dataset2style($dataset) $_colorMode $_curFldName {} $w $h 0"
    15271527            break;
  • branches/1.4/gui/scripts/vtksurfaceviewer.tcl

    r5095 r5096  
    14761476    if { $_currentColormap != ""  } {
    14771477        set cmap $_currentColormap
    1478         SendCmdNoWait "legend $cmap scalar $_curFldName {} $w $h 0"
     1478        SendCmd "legend $cmap scalar $_curFldName {} $w $h 0"
    14791479    }
    14801480}
  • branches/1.4/gui/scripts/vtkvolumeviewer.tcl

    r5095 r5096  
    15411541        foreach {dataobj comp} [split $dataset -] break
    15421542        if { [info exists _dataset2style($dataset)] } {
    1543             SendCmdNoWait \
     1543            SendCmd \
    15441544                "legend2 $_dataset2style($dataset) $w $h"
    15451545                #"legend $_dataset2style($dataset) $_colorMode $_curFldName {} $w $h 0"
Note: See TracChangeset for help on using the changeset viewer.