Changeset 4528 for branches/1.3


Ignore:
Timestamp:
Jul 17, 2014 1:12:04 AM (6 years ago)
Author:
ldelgass
Message:

Merge r4506 from trunk

Location:
branches/1.3
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

    • Property svn:mergeinfo changed
      /trunkmerged: 4506
  • branches/1.3/gui/scripts/nanovisviewer.tcl

    r4504 r4528  
    148148    private variable _parsedFunction
    149149    private variable _transferFunctionEditors
    150     private variable  _settings
     150    private variable _settings
    151151    private variable _alphamap
    152152    private variable _widget
  • branches/1.3/gui/scripts/vtkviewer.tcl

    r4478 r4528  
    743743        }
    744744        array set bounds [limits $dataobj]
    745         if {![info exists _limits(xmin)] || $_limits(xmin) > $bounds(xmin)} {
     745        if {[info exists bounds(xmin)] && (![info exists _limits(xmin)] || $_limits(xmin) > $bounds(xmin))} {
    746746            set _limits(xmin) $bounds(xmin)
    747747        }
    748         if {![info exists _limits(xmax)] || $_limits(xmax) < $bounds(xmax)} {
     748        if {[info exists bounds(xmax)] && (![info exists _limits(xmax)] || $_limits(xmax) < $bounds(xmax))} {
    749749            set _limits(xmax) $bounds(xmax)
    750750        }
    751751
    752         if {![info exists _limits(ymin)] || $_limits(ymin) > $bounds(ymin)} {
     752        if {[info exists bounds(ymin)] && (![info exists _limits(ymin)] || $_limits(ymin) > $bounds(ymin))} {
    753753            set _limits(ymin) $bounds(ymin)
    754754        }
    755         if {![info exists _limits(ymax)] || $_limits(ymax) < $bounds(ymax)} {
     755        if {[info exists bounds(ymax)] && (![info exists _limits(ymax)] || $_limits(ymax) < $bounds(ymax))} {
    756756            set _limits(ymax) $bounds(ymax)
    757757        }
    758758
    759         if {![info exists _limits(zmin)] || $_limits(zmin) > $bounds(zmin)} {
     759        if {[info exists bounds(zmin)] && (![info exists _limits(zmin)] || $_limits(zmin) > $bounds(zmin))} {
    760760            set _limits(zmin) $bounds(zmin)
    761761        }
    762         if {![info exists _limits(zmax)] || $_limits(zmax) < $bounds(zmax)} {
     762        if {[info exists bounds(zmax)] && (![info exists _limits(zmax)] || $_limits(zmax) < $bounds(zmax))} {
    763763            set _limits(zmax) $bounds(zmax)
    764764        }
     
    19091909            file delete $tmpfile
    19101910            set output [$reader GetOutput]
     1911            if { $output == "" } {
     1912                # Invalid VTK file -- loader failed to parse
     1913                continue
     1914            }
    19111915            set _limits($tag) [$output GetBounds]
    19121916            if {$debug} {
Note: See TracChangeset for help on using the changeset viewer.