Changeset 6306


Ignore:
Timestamp:
May 4, 2016 2:33:14 AM (6 years ago)
Author:
ldelgass
Message:

merge fixes from trunk

Location:
branches/1.7
Files:
14 edited

Legend:

Unmodified
Added
Removed
  • branches/1.7

  • branches/1.7/gui/scripts/flowvisviewer.tcl

    r6266 r6306  
    498498    bind $itk_component(speed) <<Value>> [itcl::code $this flow speed]
    499499
    500 
    501500    blt::table $itk_component(flowcontrols) \
    502501        0,0 $itk_component(rewind) -padx {3 0} \
     
    642641    set op [lindex $args 0]
    643642    switch -- $op {
    644         -objects {
     643        "-objects" {
    645644            # put the dataobj list in order according to -raise options
    646645            set dlist $_dlist
     
    657656            return $dlist
    658657        }
    659         -image {
     658        "-image" {
    660659            if {[llength $args] != 2} {
    661660                error "wrong # args: should be \"get -image view|legend\""
  • branches/1.7/gui/scripts/nanovisviewer.tcl

    r6266 r6306  
    448448    set op [lindex $args 0]
    449449    switch -- $op {
    450         -objects {
     450        "-objects" {
    451451            # put the dataobj list in order according to -raise options
    452452            set dlist $_dlist
     
    463463            return $dlist
    464464        }
    465         -image {
     465        "-image" {
    466466            if {[llength $args] != 2} {
    467467                error "wrong # args: should be \"get -image view|legend\""
  • branches/1.7/gui/scripts/transferfunctioneditor.tcl

    r5679 r6306  
    4242    private method GetScreenPosition { name }
    4343    private method LeaveTick { name }
    44     private method SetRelativeValue  { name x }
    45     private method GetRelativeValue  { name }
     44    private method SetRelativeValue { name x }
     45    private method GetRelativeValue { name }
    4646    private method RemoveDuplicateMarkers {name x y}
    4747    private method SetScreenPosition { name }
     
    225225}
    226226
    227 itcl::body Rappture::TransferFunctionEditor::GetRelativeValue  { name } {
     227itcl::body Rappture::TransferFunctionEditor::GetRelativeValue { name } {
    228228    return $_values($name)
    229229}
    230230
    231 itcl::body Rappture::TransferFunctionEditor::SetRelativeValue  { name value } {
     231itcl::body Rappture::TransferFunctionEditor::SetRelativeValue { name value } {
     232    if {$value < 0.0} {
     233        set value 0.0
     234    } elseif {$value > 1.0} {
     235        set value 1.0
     236    }
    232237    set _values($name) $value
    233238    set x [GetScreenPosition $name]
  • branches/1.7/gui/scripts/visviewer.tcl

    r6170 r6306  
    2020    itk_option define -receivecommand receiveCommand ReceiveCommand ""
    2121
    22     private common _servers         ;# array of visualization server lists
     22    private common _servers;            # array of visualization server lists
    2323    set _servers(nanovis) "localhost:2000"
    2424    set _servers(pymol)   "localhost:2020"
     
    2626    set _servers(vtkvis)  "localhost:2010"
    2727
    28     private common _done            ;   # Used to indicate status of send.
    29     private variable _buffer        ;   # buffer for incoming/outgoing commands
    30     private variable _outbuf       ;    # buffer for outgoing commands
     28    private common _done;               # Used to indicate status of send.
     29    private variable _buffer;           # buffer for incoming/outgoing commands
     30    private variable _outbuf;           # buffer for outgoing commands
    3131    private variable _blockOnWrite 0;   # Should writes to socket block?
    3232    private variable _initialized
     
    3434    private variable _afterId -1
    3535    private variable _icon 0
    36     private variable _trace 0        ;    # Protocol tracing for console
    37     private variable _logging 0      ;    # Command logging to file
     36    private variable _trace 0;          # Protocol tracing for console
     37    private variable _logging 0;        # Command logging to file
    3838    # Number of milliseconds to wait before idle timeout.  If greater than 0,
    3939    # automatically disconnect from the visualization server when idle timeout
    4040    # is reached.
    4141    private variable _idleTimeout 43200000; # 12 hours
    42     #private variable _idleTimeout 5000;    # 5 seconds
    43     #private variable _idleTimeout 0;       # No timeout
     42    #private variable _idleTimeout 5000;# 5 seconds
     43    #private variable _idleTimeout 0;   # No timeout
    4444
    4545    protected variable _debug 0
    4646    protected variable _serverType "???";# Type of server.
    47     protected variable _sid ""      ;   # socket connection to server
     47    protected variable _sid "";         # socket connection to server
    4848    protected variable _maxConnects 100
    4949    protected variable _buffering 0
    50     protected variable _cmdSeq 0     ;    # Command sequence number
     50    protected variable _cmdSeq 0;       # Command sequence number
    5151    protected variable _dispatcher "";  # dispatcher for !events
    52     protected variable _hosts ""    ;   # list of hosts for server
    53     protected variable _parser ""   ;   # interpreter for incoming commands
     52    protected variable _hosts "";       # list of hosts for server
     53    protected variable _parser "";      # interpreter for incoming commands
    5454    protected variable _image
    5555    protected variable _hostname
  • branches/1.7/gui/scripts/vtkglyphviewer.tcl

    r6238 r6306  
    591591    }
    592592    array set params $settings
    593     set params(-description) ""
    594     set params(-param) ""
    595     array set params $settings
    596593
    597594    if {$params(-color) == "auto" || $params(-color) == "autoreset"} {
     
    691688            return $dlist
    692689        }
    693         -image {
     690        "-image" {
    694691            if {[llength $args] != 2} {
    695692                error "wrong # args: should be \"get -image view\""
     
    705702        }
    706703        default {
    707             error "bad option \"$op\": should be -objects or -image"
     704            error "bad option \"$op\": should be -objects, -visible or -image"
    708705        }
    709706    }
  • branches/1.7/gui/scripts/vtkheightmapviewer.tcl

    r6266 r6306  
    483483    }
    484484    array set params $settings
    485     set params(-description) ""
    486     set params(-param) ""
    487     array set params $settings
    488485
    489486    if {$params(-color) == "auto" || $params(-color) == "autoreset"} {
     
    583580            return $dlist
    584581        }
    585         -image {
     582        "-image" {
    586583            if {[llength $args] != 2} {
    587584                error "wrong # args: should be \"get -image view\""
     
    597594        }
    598595        default {
    599             error "bad option \"$op\": should be -objects or -image"
     596            error "bad option \"$op\": should be -objects, -visible or -image"
    600597        }
    601598    }
  • branches/1.7/gui/scripts/vtkimageviewer.tcl

    r6266 r6306  
    473473    }
    474474    array set params $settings
    475     set params(-description) ""
    476     set params(-param) ""
    477     array set params $settings
    478475
    479476    if {$params(-color) == "auto" || $params(-color) == "autoreset"} {
     
    573570            return $dlist
    574571        }
    575         -image {
     572        "-image" {
    576573            if {[llength $args] != 2} {
    577574                error "wrong # args: should be \"get -image view\""
     
    587584        }
    588585        default {
    589             error "bad option \"$op\": should be -objects or -image"
     586            error "bad option \"$op\": should be -objects, -visible or -image"
    590587        }
    591588    }
  • branches/1.7/gui/scripts/vtkisosurfaceviewer.tcl

    r6238 r6306  
    618618    }
    619619    array set params $settings
    620     set params(-description) ""
    621     set params(-param) ""
    622     array set params $settings
    623620
    624621    if {$params(-color) == "auto" || $params(-color) == "autoreset"} {
     
    718715            return $dlist
    719716        }
    720         -image {
     717        "-image" {
    721718            if {[llength $args] != 2} {
    722719                error "wrong # args: should be \"get -image view\""
     
    732729        }
    733730        default {
    734             error "bad option \"$op\": should be -objects or -image"
     731            error "bad option \"$op\": should be -objects, -visible or -image"
    735732        }
    736733    }
  • branches/1.7/gui/scripts/vtkmeshviewer.tcl

    r6212 r6306  
    411411    }
    412412    array set params $settings
    413     set params(-description) ""
    414     set params(-param) ""
    415     array set params $settings
    416413
    417414    if {$params(-color) == "auto" || $params(-color) == "autoreset"} {
     
    510507            return $dlist
    511508        }
    512         -image {
     509        "-image" {
    513510            if {[llength $args] != 2} {
    514511                error "wrong # args: should be \"get -image view\""
     
    524521        }
    525522        default {
    526             error "bad option \"$op\": should be -objects or -image"
     523            error "bad option \"$op\": should be -objects, -visible or -image"
    527524        }
    528525    }
  • branches/1.7/gui/scripts/vtkstreamlinesviewer.tcl

    r6238 r6306  
    552552    }
    553553    array set params $settings
    554     set params(-description) ""
    555     set params(-param) ""
    556     array set params $settings
    557554
    558555    if {$params(-color) == "auto" || $params(-color) == "autoreset"} {
     
    653650            return $dlist
    654651        }
    655         -image {
     652        "-image" {
    656653            if {[llength $args] != 2} {
    657654                error "wrong # args: should be \"get -image view\""
     
    667664        }
    668665        default {
    669             error "bad option \"$op\": should be -objects or -image"
     666            error "bad option \"$op\": should be -objects, -visible or -image"
    670667        }
    671668    }
  • branches/1.7/gui/scripts/vtksurfaceviewer.tcl

    r6238 r6306  
    474474    }
    475475    array set params $settings
    476     set params(-description) ""
    477     set params(-param) ""
    478     array set params $settings
    479476
    480477    if {$params(-color) == "auto" || $params(-color) == "autoreset"} {
     
    574571            return $dlist
    575572        }
    576         -image {
     573        "-image" {
    577574            if {[llength $args] != 2} {
    578575                error "wrong # args: should be \"get -image view\""
     
    588585        }
    589586        default {
    590             error "bad option \"$op\": should be -objects or -image"
     587            error "bad option \"$op\": should be -objects, -visible or -image"
    591588        }
    592589    }
  • branches/1.7/gui/scripts/vtkviewer.tcl

    r6212 r6306  
    595595    }
    596596    array set params $settings
    597     set params(-description) ""
    598     set params(-param) ""
    599     array set params $settings
    600597
    601598    if {$params(-color) == "auto" || $params(-color) == "autoreset"} {
     
    695692            return $dlist
    696693        }
    697         -image {
     694        "-image" {
    698695            if {[llength $args] != 2} {
    699696                error "wrong # args: should be \"get -image view\""
     
    709706        }
    710707        default {
    711             error "bad option \"$op\": should be -objects or -image"
     708            error "bad option \"$op\": should be -objects, -visible or -image"
    712709        }
    713710    }
  • branches/1.7/gui/scripts/vtkvolumeviewer.tcl

    r6238 r6306  
    510510    }
    511511    array set params $settings
    512     set params(-description) ""
    513     set params(-param) ""
    514     array set params $settings
    515512
    516513    if {$params(-color) == "auto" || $params(-color) == "autoreset"} {
     
    612609            return $dlist
    613610        }
    614         -image {
     611        "-image" {
    615612            if {[llength $args] != 2} {
    616613                error "wrong # args: should be \"get -image view\""
     
    626623        }
    627624        default {
    628             error "bad option \"$op\": should be -objects or -image"
     625            error "bad option \"$op\": should be -objects, -visible or -image"
    629626        }
    630627    }
Note: See TracChangeset for help on using the changeset viewer.