Changeset 3454


Ignore:
Timestamp:
Mar 5, 2013 3:22:29 PM (11 years ago)
Author:
gah
Message:

add KP_Enter to Return bindings. Implement OK handler in visviewer base class. Fix setting # of isolines while running a sequence of heightmaps/contours

Location:
trunk/gui/scripts
Files:
19 edited

Legend:

Unmodified
Added
Removed

  • trunk/gui/scripts/barchartresult.tcl

    r3330 r3454  
    12711271            $inner.label delete 0 end
    12721272            $inner.label insert end $label
    1273             bind $inner.label <KeyPress-Return> \
     1273            bind $inner.label <Return> \
     1274                [itcl::code $this _axis changed $axis label]
     1275            bind $inner.label <KP_Enter> \
    12741276                [itcl::code $this _axis changed $axis label]
    12751277            bind $inner.label <FocusOut> \
    … …  
    12801282            $inner.min delete 0 end
    12811283            $inner.min insert end $min
    1282             bind $inner.min <KeyPress-Return> \
     1284            bind $inner.min <Return> \
     1285                [itcl::code $this _axis changed $axis min]
     1286            bind $inner.min <KP_Enter> \
    12831287                [itcl::code $this _axis changed $axis min]
    12841288            bind $inner.min <FocusOut> \
    … …  
    12871291            $inner.max delete 0 end
    12881292            $inner.max insert end $max
    1289             bind $inner.max <KeyPress-Return> \
     1293            bind $inner.max <Return> \
     1294                [itcl::code $this _axis changed $axis max]
     1295            bind $inner.max <KP_Enter> \
    12901296                [itcl::code $this _axis changed $axis max]
    12911297            bind $inner.max <FocusOut> \

  • trunk/gui/scripts/field.tcl

    r3445 r3454  
    806806            set _comp2dims($cname) "3D"
    807807            set _comp2dx($cname)  [$_fldObj get -decode no $cname.dx]
    808             if 0 {
     808            if 1 {
    809809                set data  [$_fldObj get -decode yes $cname.dx]
    810810                set file "/tmp/junk.dx"

  • trunk/gui/scripts/flowspeed.tcl

    r3330 r3454  
    7272    bind $itk_component(entry) <KeyPress> \
    7373        [itcl::code $this _validate %A]
    74     bind $itk_component(entry) <KeyPress-Return> \
     74    bind $itk_component(entry) <Return> \
     75        "$this value \[$itk_component(entry) get\]"
     76    bind $itk_component(entry) <KP_Enter> \
    7577        "$this value \[$itk_component(entry) get\]"
    7678    bind $itk_component(entry) <KeyPress-Tab> \

  • trunk/gui/scripts/flowvisviewer.tcl

    r3441 r3454  
    217217    $_parser alias legend [itcl::code $this ReceiveLegend]
    218218    $_parser alias data [itcl::code $this ReceiveData]
    219     $_parser alias viserror [itcl::code $this ReceiveError]
    220219
    221220    # Initialize the view to some default parameters.
    … …  
    444443    }
    445444    bind $itk_component(duration) <Return> [itcl::code $this flow duration]
     445    bind $itk_component(duration) <KP_Enter> [itcl::code $this flow duration]
    446446    bind $itk_component(duration) <Tab> [itcl::code $this flow duration]
    447447    Rappture::Tooltip::for $itk_component(duration) \

  • trunk/gui/scripts/histogramresult.tcl

    r3330 r3454  
    12501250            $inner.label delete 0 end
    12511251            $inner.label insert end $label
    1252             bind $inner.label <KeyPress-Return> \
     1252            bind $inner.label <Return> \
     1253                [itcl::code $this Axis changed $axis label]
     1254            bind $inner.label <KP_Enter> \
    12531255                [itcl::code $this Axis changed $axis label]
    12541256            bind $inner.label <FocusOut> \
    … …  
    12591261            $inner.min delete 0 end
    12601262            $inner.min insert end $min
    1261             bind $inner.min <KeyPress-Return> \
     1263            bind $inner.min <Return> \
     1264                [itcl::code $this Axis changed $axis min]
     1265            bind $inner.min <KP_Enter> \
    12621266                [itcl::code $this Axis changed $axis min]
    12631267            bind $inner.min <FocusOut> \
    … …  
    12661270            $inner.max delete 0 end
    12671271            $inner.max insert end $max
    1268             bind $inner.max <KeyPress-Return> \
     1272            bind $inner.max <Return> \
     1273                [itcl::code $this Axis changed $axis max]
     1274            bind $inner.max <KP_Enter> \
    12691275                [itcl::code $this Axis changed $axis max]
    12701276            bind $inner.max <FocusOut> \

  • trunk/gui/scripts/molvisviewer.tcl

    r3441 r3454  
    195195    # the visualization server.
    196196    $_parser alias image [itcl::code $this ReceiveImage]
    197     $_parser alias viserror [itcl::code $this ReceiveError]
    198197
    199198    set _rocker(dir) 1
    … …  
    17721771        blt::table configure $inner r0 -pady 4
    17731772        blt::table configure $inner r2 -pady 4
    1774         bind $inner.cancel <KeyPress-Return> [list $inner.cancel invoke]
     1773        bind $inner.cancel <Return> [list $inner.cancel invoke]
     1774        bind $inner.cancel <KP_Enter> [list $inner.cancel invoke]
    17751775    } else {
    17761776        set inner [$popup component inner]

  • trunk/gui/scripts/nanovisviewer.tcl

    r3441 r3454  
    193193    $_parser alias legend [itcl::code $this ReceiveLegend]
    194194    $_parser alias data [itcl::code $this ReceiveData]
    195     $_parser alias viserror [itcl::code $this ReceiveError]
    196195
    197196    # Initialize the view to some default parameters.
    … …  
    19641963        entry $inner.${tag} -font "Arial 9"  -bg white \
    19651964            -textvariable [itcl::scope _settings($this-$tag)]
    1966         bind $inner.${tag} <KeyPress-Return> \
     1965        bind $inner.${tag} <Return> \
     1966            [itcl::code $this camera set ${tag}]
     1967        bind $inner.${tag} <KP_Enter> \
    19671968            [itcl::code $this camera set ${tag}]
    19681969        blt::table $inner \

  • trunk/gui/scripts/numberresult.tcl

    r3330 r3454  
    12421242            $inner.label delete 0 end
    12431243            $inner.label insert end $label
    1244             bind $inner.label <KeyPress-Return> \
     1244            bind $inner.label <Return> \
     1245                [itcl::code $this Axis changed $axis label]
     1246            bind $inner.label <KP_Enter> \
    12451247                [itcl::code $this Axis changed $axis label]
    12461248            bind $inner.label <FocusOut> \
    … …  
    12511253            $inner.min delete 0 end
    12521254            $inner.min insert end $min
    1253             bind $inner.min <KeyPress-Return> \
     1255            bind $inner.min <Return> \
     1256                [itcl::code $this Axis changed $axis min]
     1257            bind $inner.min <KP_Enter> \
    12541258                [itcl::code $this Axis changed $axis min]
    12551259            bind $inner.min <FocusOut> \
    … …  
    12581262            $inner.max delete 0 end
    12591263            $inner.max insert end $max
    1260             bind $inner.max <KeyPress-Return> \
     1264            bind $inner.max <Return> \
     1265                [itcl::code $this Axis changed $axis max]
     1266            bind $inner.max <KP_Enter> \
    12611267                [itcl::code $this Axis changed $axis max]
    12621268            bind $inner.max <FocusOut> \

  • trunk/gui/scripts/periodicelement.tcl

    r3330 r3454  
    9696    pack $itk_component(entry) -side left -expand yes -fill both
    9797
    98     bind $itk_component(entry) <KeyPress-Return> \
     98    bind $itk_component(entry) <Return> \
    9999        [itcl::code $this _entry apply]
    100     bind $itk_component(entry) <KeyPress-Tab> \
     100    bind $itk_component(entry) <KP_Enter> \
     101        [itcl::code $this _entry apply]
     102    bind $itk_component(entry) <Tab> \
    101103        [itcl::code $this _entry apply]
    102104    bind $itk_component(entry) <ButtonPress> \

  • trunk/gui/scripts/periodictable.tcl

    r3330 r3454  
    334334    # add bindings so the table can react to selections
    335335    bind RappturePeriodicTable-$this <ButtonRelease-1> [itcl::code $this _react]
    336     bind RappturePeriodicTable-$this <KeyPress-Return> [itcl::code $this _react]
    337     bind RappturePeriodicTable-$this <KeyPress-space> [itcl::code $this _react]
    338     bind RappturePeriodicTable-$this <KeyPress-Escape> [itcl::code $this unpost]
     336    bind RappturePeriodicTable-$this <Return> [itcl::code $this _react]
     337    bind RappturePeriodicTable-$this <KP_Enter> [itcl::code $this _react]
     338    bind RappturePeriodicTable-$this <space> [itcl::code $this _react]
     339    bind RappturePeriodicTable-$this <Escape> [itcl::code $this unpost]
    339340
    340341    set btags [bindtags $itk_component(table)]

  • trunk/gui/scripts/postern.tcl

    r3330 r3454  
    108108
    109109    bind $inner.area.text <KeyPress-Return> \
     110        [itcl::code $this command execute]
     111    bind $inner.area.text <KP_Enter> \
    110112        [itcl::code $this command execute]
    111113

  • trunk/gui/scripts/spinint.tcl

    r3330 r3454  
    7171    bind $itk_component(entry) <KeyPress> \
    7272        [itcl::code $this _validate %A]
    73     bind $itk_component(entry) <KeyPress-Return> \
     73    bind $itk_component(entry) <Return> \
     74        "$this value \[$itk_component(entry) get\]"
     75    bind $itk_component(entry) <KP_Enter> \
    7476        "$this value \[$itk_component(entry) get\]"
    7577

  • trunk/gui/scripts/visviewer.tcl

    r3446 r3454  
    5454    protected variable _debugConsole 0
    5555    protected variable _reportClientInfo 1
    56     protected variable _showWaitDialog 0
     56    protected variable _waitTimeout 0
    5757
    5858    constructor { servers args } {
    … …  
    6868    private method SendHelper {}
    6969    private method SendHelper.old {}
    70     private method SplashScreen { state }
     70    private method WaitDialog { state }
    7171
    7272    protected method ToggleConsole {}
    … …  
    7777    private method SendDebugCommand {}
    7878
    79     protected method EnableWaitDialog { bool }
    80     protected method StartBufferingCommands {}
    81     protected method StopBufferingCommands {}
    8279    protected method CheckConnection {}
    8380    protected method Color2RGB { color }
    … …  
    8582    protected method Connect { servers }
    8683    protected method Disconnect {}
     84    protected method EnableWaitDialog { bool }
    8785    protected method Euler2XYZ { theta phi psi }
    8886    protected method Flush {}
     87    protected method HandleError { args }
     88    protected method HandleOk { args }
    8989    protected method IsConnected {}
    9090    protected method ReceiveBytes { nbytes }
    9191    protected method ReceiveEcho { channel {data ""} }
    92     protected method ReceiveError { args }
    9392    protected method SendBytes { bytes }
    94     protected method SendEcho { channel {data ""} }
    95     protected method StartWaiting {}
    96     protected method StopWaiting {}
    9793    protected method SendCmd {string}
    9894    protected method SendCmdNoWait {string}
     95    protected method SendEcho { channel {data ""} }
     96    protected method StartBufferingCommands {}
     97    protected method StartWaiting {}
     98    protected method StopBufferingCommands {}
     99    protected method StopWaiting {}
    99100
    100101    private method Waiting { option widget }
    … …  
    166167        $_parser hide $cmd
    167168    }
     169    # Add default handlers for "ok" acknowledgement and server errors.
     170    $_parser alias ok       [itcl::code $this HandleOk]
     171    $_parser alias viserror [itcl::code $this HandleError]
     172
    168173    #
    169174    # Set up the widgets in the main body
    … …  
    331336# CheckConection --
    332337#
    333 #   This routine is called whenever we're about to send/recieve data on
     338#   This routine is called whenever we're about to send/receive data on
    334339#   the socket connection to the visualization server.  If we're connected,
    335340#   then reset the timeout event.  Otherwise try to reconnect to the
    … …  
    463468
    464469itcl::body Rappture::VisViewer::StartWaiting {} {
    465     if { $_showWaitDialog } {
     470    if { $_waitTimeout > 0 } {
    466471        after cancel $_afterId
    467         set _afterId [after 2000 [itcl::code $this SplashScreen on]]
     472        set _afterId [after $_waitTimeout [itcl::code $this WaitDialog on]]
    468473    }
    469474}
    470475
    471476itcl::body Rappture::VisViewer::StopWaiting {} {
    472     if { $_showWaitDialog } {
    473         SplashScreen off
    474     }
    475 }
    476 
    477 itcl::body Rappture::VisViewer::EnableWaitDialog { bool } {
    478     set _showWaitDialog $bool
     477    if { $_waitTimeout > 0 } {
     478        WaitDialog off
     479    }
     480}
     481
     482itcl::body Rappture::VisViewer::EnableWaitDialog { value } {
     483    set _waitTimeout $value
    479484}
    480485
    … …  
    614619}
    615620
    616 itcl::body Rappture::VisViewer::SplashScreen { state } {
     621itcl::body Rappture::VisViewer::WaitDialog { state } {
    617622    after cancel $_afterId
    618623    set _afterId -1
    … …  
    624629        $inner configure -relief raised -bd 2
    625630        label $inner.text1 -text "Rendering, please wait." \
    626             -font "Arial 10"
     631            -font "Arial 10" 
    627632        label $inner.icon
    628633        pack $inner -expand yes -anchor c
    … …  
    694699    }
    695700    pack $f.send.e -side left -expand yes -fill x
    696     bind $f.send.e <KeyPress-Return> [itcl::code $this SendDebugCommand]
     701    bind $f.send.e <Return> [itcl::code $this SendDebugCommand]
     702    bind $f.send.e <KP_Enter> [itcl::code $this SendDebugCommand]
    697703   
    698704    scrollbar $f.sb -orient vertical -command "$f.comm yview"
    … …  
    793799}
    794800
    795 
    796 #
    797 # ReceiveError -bytes <size> -type <type> -token <token>
    798 #
    799 itcl::body Rappture::VisViewer::ReceiveError { args } {
     801#
     802# HandleOk --
     803#
     804#       This handles the "ok" response from the server that acknowledges
     805#       the reception of a server command, but does not produce and image.
     806#       It may pass an argument such as "-token 9" that could be used to
     807#       determine how many commands have been processed by the server.
     808#
     809itcl::body Rappture::VisViewer::HandleOk { args } {
     810    if { $_waitTimeout > 0 } {
     811        StopWaiting
     812    }
     813}
     814
     815#
     816# HandleError --
     817#
     818#       This handles the "viserror" response from the server that reports
     819#       that a client-initiated error has occurred on the server.
     820#
     821itcl::body Rappture::VisViewer::HandleError { args } {
    800822    array set info {
    801823        -token "???"

  • trunk/gui/scripts/vtkheightmapviewer.tcl

    r3447 r3454  
    8484    private method BuildAxisTab {}
    8585    private method BuildCameraTab {}
    86     private method BuildColormap { name colors }
    87     private method ResetColormap { color }
     86    private method BuildColormap { name }
    8887    private method BuildContourTab {}
    8988    private method BuildDownloadPopup { widget command }
    … …  
    102101    private method PanCamera {}
    103102    private method RequestLegend {}
    104     private method SetCurrentColormap { stylelist }
     103    private method SetCurrentColormap { color }
    105104    private method SetLegendTip { x y }
    106105    private method SetObjectStyle { dataobj comp }
    … …  
    121120    # heightmaps displayed.
    122121    private variable _currentColormap "" ;   
     122    private variable _currentNumIsolines "" ;   
     123    private variable _currentOpacity "" ;   
    123124
    124125    private variable _click        ;    # info used for rotate operations
    … …  
    127128    private variable _view         ;    # view params for 3D view
    128129    private variable _settings
     130    private variable _changed
    129131    private variable _initialStyle "";  # First found style in dataobjects.
    130132    private variable _reset 1;          # Indicates if camera needs to be reset
    … …  
    144146    private variable _legendHeight 0
    145147    private variable _resizePending 0
    146     private variable _numIsolinesPending 0
    147148    private variable _rotatePending 0
    148149    private variable _legendPending 0
    … …  
    165166    set _serverType "vtkvis"
    166167
     168    EnableWaitDialog 1000
    167169    # Rebuild event
    168170    $_dispatcher register !rebuild
    … …  
    187189    $_parser alias dataset [itcl::code $this ReceiveDataset]
    188190    $_parser alias legend [itcl::code $this ReceiveLegend]
    189     $_parser alias viserror [itcl::code $this ReceiveError]
    190191
    191192    # Initialize the view to some default parameters.
    … …  
    204205    $_arcball quaternion $q
    205206
    206     array set _settings [subst {
     207    array set _settings {
    207208        axisFlymode             "static"
    208209        axisMinorTicks          1
    … …  
    228229        wireframe               0
    229230        saveOpacity             100
    230     }]
    231 
     231    }
     232    array set _changed {
     233        opacity                 0
     234        colormap                0
     235        numIsolines             0
     236    }
    232237    itk_component add view {
    233238        canvas $itk_component(plotarea).view \
    … …  
    986991        $itk_component(field) value $_curFldLabel
    987992    }
    988     InitSettings stretchToFit
     993    InitSettings stretchToFit 
    989994
    990995    if { $_reset } {
    … …  
    10401045        InitSettings axisXGrid axisYGrid axisZGrid \
    10411046            axisVisible axisLabels
    1042         InitSettings opacity heightmapScale lighting edges wireframe \
    1043             colormap field outline isHeightmap
     1047        InitSettings heightmapScale field isHeightmap
    10441048        if { [array size _fields] < 2 } {
    10451049            blt::table forget $itk_component(field) $itk_component(field_l)
    … …  
    13311335        }
    13321336        "colormap" {
     1337            set _changed(colormap) 1
    13331338            StartBufferingCommands
    13341339            set color [$itk_component(colormap) value]
    … …  
    13441349                    set _settings(colormapVisible) 1
    13451350                }
    1346                 ResetColormap $color
    1347                 SendCmd "heightmap colormap $_currentColormap"
     1351                SetCurrentColormap $color
    13481352            }
    13491353            #SendCmd "heightmap colormode scalar $_curFldName"
    … …  
    15241528        }
    15251529        "numIsolines" {
     1530            set _changed(numIsolines) 1
    15261531            set _settings(numIsolines) [$itk_component(numisolines) value]
     1532            set _currentNumIsolines $_settings(numIsolines)
    15271533            SendCmd "heightmap numcontours $_settings(numIsolines)"
    15281534            DrawLegend
    15291535        }
    15301536        "opacity" {
     1537            set _changed(opacity) 1
    15311538            if { $_settings(isHeightmap) } {
    15321539                set _settings(saveOpacity) $_settings(opacity)
    … …  
    16541661# SetCurrentColormap --
    16551662#
    1656 itcl::body Rappture::VtkHeightmapViewer::SetCurrentColormap { stylelist } {
    1657     array set style {
    1658         -color BCGYR
    1659         -levels 10
    1660         -opacity 1.0
    1661     }
    1662     array set style $stylelist
    1663 
    1664     set name "$style(-color):$style(-levels):$style(-opacity)"
     1663itcl::body Rappture::VtkHeightmapViewer::SetCurrentColormap { name } {
     1664    # Keep track of the colormaps that we build.
    16651665    if { ![info exists _colormaps($name)] } {
    1666         set stylelist [array get style]
    1667         BuildColormap $name $stylelist
    1668         set _colormaps($name) $stylelist
     1666        BuildColormap $name
     1667        set _colormaps($name) 1
    16691668    }
    16701669    set _currentColormap $name
     1670    SendCmd "heightmap colormap $_currentColormap"
    16711671}
    16721672
    … …  
    16751675# BuildColormap --
    16761676#
    1677 itcl::body Rappture::VtkHeightmapViewer::BuildColormap { name stylelist } {
    1678     array set style $stylelist
    1679     set cmap [ColorsToColormap $style(-color)]
     1677#       Build the designated colormap on the server.
     1678#
     1679itcl::body Rappture::VtkHeightmapViewer::BuildColormap { name } {
     1680    set cmap [ColorsToColormap $name]
    16801681    if { [llength $cmap] == 0 } {
    16811682        set cmap "0.0 0.0 0.0 0.0 1.0 1.0 1.0 1.0"
    16821683    }
    1683     if { ![info exists _settings(opacity)] } {
    1684         set _settings(opacity) $style(-opacity)
    1685     }
    1686     set max $_settings(opacity)
    1687 
    16881684    set wmap "0.0 1.0 1.0 1.0"
    16891685    SendCmd "colormap add $name { $cmap } { $wmap }"
    … …  
    20102006        entry $inner.${tag} -font "Arial 9"  -bg white \
    20112007            -textvariable [itcl::scope _view($tag)]
    2012         bind $inner.${tag} <KeyPress-Return> \
     2008        bind $inner.${tag} <Return> \
     2009            [itcl::code $this camera set ${tag}]
     2010        bind $inner.${tag} <KP_Enter> \
    20132011            [itcl::code $this camera set ${tag}]
    20142012        blt::table $inner \
    … …  
    21372135}
    21382136
     2137#
     2138# SetObjectStyle --
     2139#
     2140#       Set the style of the heightmap/contour object.  This gets calls
     2141#       for each dataset once as it is loaded.  It can overridden by
     2142#       the user controls.
     2143#
     2144#
    21392145itcl::body Rappture::VtkHeightmapViewer::SetObjectStyle { dataobj comp } {
    21402146    # Parse style string.
    … …  
    21422148    array set style {
    21432149        -color BCGYR
    2144         -edges 0
    2145         -edgecolor black
    2146         -linewidth 1.0
     2150        -opacity 100
    21472151        -levels 10
    2148         -visible 1
     2152    }
     2153    set stylelist [$dataobj style $comp]
     2154    if { $stylelist != "" } {
     2155        array set style $stylelist
     2156    }
     2157    # This is too complicated.  We want to set the colormap, number of
     2158    # isolines and opacity for the object.  They can be the default values,
     2159    # the style hints set with the dataset, or set by user controls.  As
     2160    # datasets get loaded, they first use the defaults that are overidden
     2161    # by the style hints.  If the user changes the global controls, then that
     2162    # overrides everything else.  I don't know what it means when global
     2163    # controls are specified as style hints by each dataset.  It complicates
     2164    # the code to handle aberrant cases.
     2165
     2166    if { $_changed(opacity) } {
     2167        set style(-opacity) $_settings(opacity)
     2168    }
     2169    if { $_changed(numIsolines) } {
     2170        set style(-levels) $_settings(numIsolines)
     2171    }
     2172    if { $_changed(colormap) } {
     2173        set style(-color) $_settings(colormap)
    21492174    }
    21502175    if { $_currentColormap == "" } {
    2151         set stylelist [$dataobj style $comp]
    2152         if { $stylelist != "" } {
    2153             array set style $stylelist
    2154             set stylelist [array get style]
    2155             SetCurrentColormap $stylelist
    2156         }
    2157         $itk_component(colormap) value $style(-color)
     2176        $itk_component(colormap) value $style(-color)
     2177    }
     2178    set _currentOpacity $style(-opacity)
     2179    if { $_currentNumIsolines != $style(-levels) } {
     2180        set _currentNumIsolines $style(-levels)
     2181        DrawLegend
    21582182    }
    21592183    SendCmd "dataset outline $_settings(outline) $tag"
    21602184    SendCmd "dataset color [Color2RGB $itk_option(-plotforeground)] $tag"
    2161     set _settings(numIsolines) $style(-levels)
    21622185    set scale [GetHeightmapScale]
    2163     SendCmd "heightmap add numcontours $_settings(numIsolines) $scale $tag"
     2186    SendCmd "heightmap add numcontours $_currentNumIsolines $scale $tag"
    21642187    set _comp2scale($tag) $_settings(heightmapScale)
    21652188    SendCmd "heightmap edges $_settings(edges) $tag"
    21662189    SendCmd "heightmap wireframe $_settings(wireframe) $tag"
    2167     SendCmd "heightmap colormap $_currentColormap $tag"
     2190    SetCurrentColormap $style(-color)
    21682191    set color [$itk_component(isolinecolor) value]
    21692192    SendCmd "heightmap isolinecolor [Color2RGB $color] $tag"
    … …  
    22662289    # Draw the isolines on the legend.
    22672290    if { $color != "none"  && [info exists _limits($_curFldName)] &&
    2268          $_settings(isolinesVisible) && $_settings(numIsolines) > 0 } {
     2291         $_settings(isolinesVisible) && $_currentNumIsolines > 0 } {
    22692292        set pixels [blt::vector create \#auto]
    22702293        set values [blt::vector create \#auto]
    22712294        set range [image height $_image(legend)]
    22722295        # Order of pixels is max to min (max is at top of legend).
    2273         $pixels seq $ih 0 $_settings(numIsolines)
     2296        $pixels seq $ih 0 $_currentNumIsolines
    22742297
    22752298        set offset [expr 2 + $lineht]
    … …  
    22812304        # Order of values is min to max.
    22822305        foreach { vmin vmax } $_limits($_curFldName) break
    2283         $values seq $vmin $vmax $_settings(numIsolines)
     2306        $values seq $vmin $vmax $_currentNumIsolines
    22842307        set tags "isoline legend"
    22852308        array unset _isolines
    … …  
    22912314            }
    22922315            set id [$c create line $x1 $y1 $x2 $y1 -fill $color -tags $tags]
    2293             #$c bind $id <B1-Enter> [itcl::code $this EnterIsoline %x %y $value]
    2294             #$c bind $id <Leave> [itcl::code $this LeaveIsoline]
    22952316        }
    22962317        blt::vector destroy $pixels $values
    … …  
    24602481}
    24612482
    2462 itcl::body Rappture::VtkHeightmapViewer::ResetColormap { color } {
    2463     array set style {
    2464         -color BCGYR
    2465         -levels 10
    2466         -opacity 1.0
    2467     }
    2468     if { [info exists _colormap($_currentColormap)] } {
    2469         array set style $_colormap($_currentColormap)
    2470     }
    2471     set style(-color) $color
    2472     SetCurrentColormap [array get style]
    2473 }
    2474 
     2483
     2484
     2485

  • trunk/gui/scripts/vtkisosurfaceviewer.tcl

    r3448 r3454  
    203203    $_parser alias dataset [itcl::code $this ReceiveDataset]
    204204    $_parser alias legend [itcl::code $this ReceiveLegend]
    205     $_parser alias viserror [itcl::code $this ReceiveError]
    206205
    207206    # Initialize the view to some default parameters.

  • trunk/gui/scripts/vtkstreamlinesviewer.tcl

    r3446 r3454  
    165165    set _serverType "vtkvis"
    166166
    167     EnableWaitDialog yes
     167    EnableWaitDialog 2000
    168168
    169169    # Rebuild event
    … …  
    208208    $_parser alias dataset [itcl::code $this ReceiveDataset]
    209209    $_parser alias legend [itcl::code $this ReceiveLegend]
    210     $_parser alias viserror [itcl::code $this ReceiveError]
    211210
    212211    array set _outline {

  • trunk/gui/scripts/vtkviewer.tcl

    r3443 r3454  
    178178    $_parser alias dataset  [itcl::code $this ReceiveDataset]
    179179    $_parser alias legend   [itcl::code $this ReceiveLegend]
    180     $_parser alias viserror [itcl::code $this ReceiveError]
    181180
    182181    array set _outline {

  • trunk/gui/scripts/vtkvolumeviewer.tcl

    r3443 r3454  
    201201    $_parser alias dataset [itcl::code $this ReceiveDataset]
    202202    $_parser alias legend [itcl::code $this ReceiveLegend]
    203     $_parser alias viserror [itcl::code $this ReceiveError]
    204203
    205204    array set _outline {

  • trunk/gui/scripts/xyresult.tcl

    r3330 r3454  
    12661266            $inner.label delete 0 end
    12671267            $inner.label insert end $label
    1268             bind $inner.label <KeyPress-Return> \
     1268            bind $inner.label <Return> \
     1269                [itcl::code $this Axis changed $axis label]
     1270            bind $inner.label <KP_Enter> \
    12691271                [itcl::code $this Axis changed $axis label]
    12701272            bind $inner.label <FocusOut> \
    … …  
    12751277            $inner.min delete 0 end
    12761278            $inner.min insert end $min
    1277             bind $inner.min <KeyPress-Return> \
     1279            bind $inner.min <Return> \
     1280                [itcl::code $this Axis changed $axis min]
     1281            bind $inner.min <KP_Enter> \
    12781282                [itcl::code $this Axis changed $axis min]
    12791283            bind $inner.min <FocusOut> \
    … …  
    12821286            $inner.max delete 0 end
    12831287            $inner.max insert end $max
    1284             bind $inner.max <KeyPress-Return> \
     1288            bind $inner.max <Return> \
     1289                [itcl::code $this Axis changed $axis max]
     1290            bind $inner.max <KP_Enter> \
    12851291                [itcl::code $this Axis changed $axis max]
    12861292            bind $inner.max <FocusOut> \
Note: See TracChangeset for help on using the changeset viewer.