Changeset 5172 for branches/1.4


Ignore:
Timestamp:
Mar 29, 2015, 7:51:30 PM (10 years ago)
Author:
ldelgass
Message:

merge r5156 from trunk

Location:
branches/1.4
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • branches/1.4

    • Property svn:mergeinfo changed
      /trunkmerged: 5156

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

    r5143 r5172  
    132132    private variable _changed
    133133    private variable _initialStyle;     # Array of initial component styles.
    134     private variable _reset 1;          # indicates if camera needs to be reset
    135                                         # to starting position.
     134    private variable _reset 1;          # Connection to server has been reset.
    136135
    137136    private variable _first ""     ;    # This is the topmost dataset.
    … …  
    769768        return 0
    770769    }
     770    set _reset 1
    771771    set result [VisViewer::Connect $_hosts]
    772772    if { $result } {
    … …  
    10561056        Zoom reset
    10571057        foreach axis { x y z } {
    1058             # Another problem fixed by a <view>. We looking into a data
    1059             # object for the name of the axes. This should be global to
    1060             # the viewer itself.
    1061             set label [$_first hints ${axis}label]
     1058            set label ""
     1059            if { $_first != "" } {
     1060                set label [$_first hints ${axis}label]
     1061            }
    10621062            if { $label == "" } {
    10631063                set label [string toupper $axis]

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

    r5143 r5172  
    139139    private variable _changed
    140140    private variable _initialStyle "";  # First found style in dataobjects.
    141     private variable _reset 1;          # Indicates if the connection to the
    142                                         # render server was reset
    143     private variable _beforeConnect 1;  # Indicates if we are in the constructor
    144                                         # before the server connection is made
     141    private variable _reset 1;          # Connection to server has been reset.
    145142
    146143    private variable _first ""     ;    # This is the topmost dataset.
    … …  
    409406    eval itk_initialize $args
    410407    Connect
    411     set _beforeConnect 0
    412408}
    413409
    … …  
    747743    global readyForNextFrame
    748744    set readyForNextFrame 1
    749     set _reset 1
    750745    set _hosts [GetServerList "vtkvis"]
    751746    if { "" == $_hosts } {
    752747        return 0
    753748    }
     749    set _reset 1
    754750    set result [VisViewer::Connect $_hosts]
    755751    if { $result } {
    … …  
    13681364#
    13691365itcl::body Rappture::VtkHeightmapViewer::AdjustSetting {what {value ""}} {
    1370     if { $_beforeConnect } {
     1366    if { ![isconnected] } {
    13711367        return
    13721368    }

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

    r5143 r5172  
    134134    private variable _changed
    135135    private variable _initialStyle "";  # First found style in dataobjects.
    136     private variable _reset 1;          # Indicates if camera needs to be reset
    137                                         # to starting position.
    138     private variable _beforeConnect 1;  # Indicates if camera needs to be reset
    139                                         # to starting position.
     136    private variable _reset 1;          # Connection to server has been reset.
    140137
    141138    private variable _first ""     ;    # This is the topmost dataset.
    … …  
    399396    EnableWaitDialog 900
    400397    Connect
    401     set _beforeConnect 0
    402398}
    403399
    … …  
    737733    global readyForNextFrame
    738734    set readyForNextFrame 1
    739     set _reset 1
    740735    set _hosts [GetServerList "vtkvis"]
    741736    if { "" == $_hosts } {
    742737        return 0
    743738    }
     739    set _reset 1
    744740    set result [VisViewer::Connect $_hosts]
    745741    if { $result } {
    … …  
    10281024
    10291025        foreach axis { x y z } {
    1030             set label [$_first hints ${axis}label]
     1026            set label ""
     1027            if { $_first != "" } {
     1028                set label [$_first hints ${axis}label]
     1029            }
    10311030            if { $label == "" } {
    10321031                set label [string toupper $axis]
    … …  
    10351034            SendCmd [list axis name $axis $label]
    10361035
    1037             if {$axis == "z" && [$_first hints ${axis}units] == ""} {
    1038                 if {$_curFldName != ""} {
    1039                     set units [lindex $_fields($_curFldName) 1]
    1040                 }
    1041             } else {
    1042                 set units [$_first hints ${axis}units]
     1036            set units ""
     1037            if { $_first != "" } {
     1038                if {$axis == "z" && [$_first hints ${axis}units] == ""} {
     1039                    if {$_curFldName != ""} {
     1040                        set units [lindex $_fields($_curFldName) 1]
     1041                    }
     1042                } else {
     1043                    set units [$_first hints ${axis}units]
     1044                }
    10431045            }
    10441046            if { $units != "" } {
    … …  
    13091311#
    13101312itcl::body Rappture::VtkImageViewer::AdjustSetting {what {value ""}} {
    1311     if { $_beforeConnect } {
     1313    if { ![isconnected] } {
    13121314        return
    13131315    }

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

    r5143 r5172  
    149149    private variable _changed
    150150    private variable _initialStyle;     # Array of initial component styles.
    151     private variable _reset 1;          # indicates if camera needs to be reset
    152                                         # to starting position.
     151    private variable _reset 1;          # Connection to server has been reset.
    153152
    154153    private variable _first ""     ;    # This is the topmost dataset.
    … …  
    881880        return 0
    882881    }
     882    set _reset 1
    883883    set result [VisViewer::Connect $_hosts]
    884884    if { $result } {
    … …  
    11391139        Zoom reset
    11401140        foreach axis { x y z } {
    1141             # Another problem fixed by a <view>. We looking into a data
    1142             # object for the name of the axes. This should be global to
    1143             # the viewer itself.
    1144             set label [$_first hints ${axis}label]
     1141            set label ""
     1142            if { $_first != "" } {
     1143                set label [$_first hints ${axis}label]
     1144            }
    11451145            if { $label == "" } {
    11461146                set label [string toupper $axis]

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

    r5143 r5172  
    115115    private variable _style;            # Array of current component styles.
    116116    private variable _initialStyle;     # Array of initial component styles.
    117     private variable _reset 1;          # Indicates that server was reset and
    118                                         # needs to be reinitialized.
     117    private variable _reset 1;          # Connection to server has been reset.
    119118
    120119    private variable _first "";         # This is the topmost dataset.
    … …  
    652651        return 0
    653652    }
     653    set _reset 1
    654654    set result [VisViewer::Connect $_hosts]
    655655    if { $result } {

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

    r5143 r5172  
    130130    private variable _style;            # Array of current component styles.
    131131    private variable _initialStyle;     # Array of initial component styles.
    132     private variable _reset 1;          # indicates if camera needs to be reset
    133                                         # to starting position.
     132    private variable _reset 1;          # Connection to server has been reset.
    134133
    135134    private variable _first ""     ;    # This is the topmost dataset.
    … …  
    782781        return 0
    783782    }
     783    set _reset 1
    784784    set result [VisViewer::Connect $_hosts]
    785785    if { $result } {

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

    r5143 r5172  
    131131    private variable _changed
    132132    private variable _initialStyle;     # Array of initial component styles.
    133     private variable _reset 1;          # indicates if camera needs to be reset
    134                                         # to starting position.
     133    private variable _reset 1;          # Connection to server has been reset.
    135134
    136135    private variable _first ""     ;    # This is the topmost dataset.
    … …  
    719718        return 0
    720719    }
     720    set _reset 1
    721721    set result [VisViewer::Connect $_hosts]
    722722    if { $result } {
    … …  
    10001000        Zoom reset
    10011001        foreach axis { x y z } {
    1002             # Another problem fixed by a <view>. We looking into a data
    1003             # object for the name of the axes. This should be global to
    1004             # the viewer itself.
    1005             set label [$_first hints ${axis}label]
     1002            set label ""
     1003            if { $_first != "" } {
     1004                set label [$_first hints ${axis}label]
     1005            }
    10061006            if { $label == "" } {
    10071007                set label [string toupper $axis]

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

    r5143 r5172  
    142142    private variable _initialStyle;     # Array of initial component styles.
    143143    private variable _axis
    144     private variable _reset 1;          # Indicates that server was reset and
    145                                         # needs to be reinitialized.
     144    private variable _reset 1;          # Connection to server has been reset.
    146145    private variable _haveGlyphs 0
    147146    private variable _haveMolecules 0
    … …  
    865864        return 0
    866865    }
     866    set _reset 1
    867867    set result [VisViewer::Connect $_hosts]
    868868    if { $result } {

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

    r5143 r5172  
    133133    private variable _style;            # Array of current component styles.
    134134    private variable _initialStyle;     # Array of initial component styles.
    135     private variable _reset 1;          # indicates if camera needs to be reset
    136                                         # to starting position.
     135    private variable _reset 1;          # Connection to server has been reset.
    137136
    138137    private variable _first ""     ;    # This is the topmost dataset.
    … …  
    783782        return 0
    784783    }
     784    set _reset 1
    785785    set result [VisViewer::Connect $_hosts]
    786786    if { $result } {
    … …  
    861861    set _cutplanePending 0
    862862    set _legendPending 0
    863     set _reset 1
    864863}
    865864
Note: See TracChangeset for help on using the changeset viewer.