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

merge fixes from trunk

Location:
branches/1.7
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.7

  • 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
Note: See TracChangeset for help on using the changeset viewer.