Changeset 5364 for branches/1.3

Timestamp:

Apr 29, 2015, 6:32:23 AM (10 years ago)

Author:

ldelgass

Message:

merge r5333:5337 from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• gui/apps/vtkheightmap-test (modified) (1 diff)
• gui/apps/vtkisosurface-test (modified) (1 diff)
• gui/apps/vtkvolume-test (modified) (1 diff)
• gui/scripts/drawing.tcl (modified) (2 diffs)
• gui/scripts/field.tcl (modified) (1 diff)
• gui/scripts/vtkglyphviewer.tcl (modified) (1 diff)
• gui/scripts/vtkisosurfaceviewer.tcl (modified) (1 diff)
• gui/scripts/vtkmeshviewer.tcl (modified) (6 diffs)
• gui/scripts/vtkstreamlinesviewer.tcl (modified) (1 diff)
• gui/scripts/vtksurfaceviewer.tcl (modified) (1 diff)
• gui/scripts/vtkvolumeviewer.tcl (modified) (1 diff)

branches/1.3/gui/apps/vtkheightmap-test

@@ -26 +26 @@
 package require Rappture
 package require RapptureGUI
-package require vtk
 
 option add *comm.font -*-courier-medium-r-normal-*-*-120-*

branches/1.3/gui/apps/vtkisosurface-test

@@ -26 +26 @@
 package require Rappture
 package require RapptureGUI
-package require vtk
 
 option add *comm.font -*-courier-medium-r-normal-*-*-120-*

branches/1.3/gui/apps/vtkvolume-test

@@ -26 +26 @@
 package require Rappture
 package require RapptureGUI
-package require vtk
 
 option add *comm.font -*-courier-medium-r-normal-*-*-120-*

branches/1.3/gui/scripts/drawing.tcl

@@ -48 +48 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::Drawing::constructor {xmlobj path} {
-    package require vtk
     if {![Rappture::library isvalid $xmlobj]} {
         error "bad value \"$xmlobj\": should be Rappture::library"
@@ -123 +122 @@
         }
     }
-    foreach {key} { axisorder } {
-        set str [$_drawing get $key]
-        if {"" != $str} {
-            set _hints($key) $str
-        }
-    }
     foreach {key path} {
         toolid          tool.id

branches/1.3/gui/scripts/field.tcl

@@ -895 +895 @@
             #
             # Extract gzipped, base64-encoded OpenDX data
-            # 
+            #
             set viewer [$_field get "about.view"]
             if { $viewer != "" } {

branches/1.3/gui/scripts/vtkglyphviewer.tcl

@@ -158 +158 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::VtkGlyphViewer::constructor {hostlist args} {
-    package require vtk
     set _serverType "vtkvis"
 

branches/1.3/gui/scripts/vtkisosurfaceviewer.tcl

@@ -182 +182 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::VtkIsosurfaceViewer::constructor {hostlist args} {
-    package require vtk
     set _serverType "vtkvis"
 

branches/1.3/gui/scripts/vtkmeshviewer.tcl

@@ -57 +57 @@
     public method get {args}
     public method isconnected {}
-    public method limits { dataobj }
     public method parameters {title args} {
         # do nothing
@@ -135 +134 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::VtkMeshViewer::constructor {hostlist args} {
-    package require vtk
     set _serverType "vtkvis"
 
@@ -173 +171 @@
     set _arcball [blt::arcball create 100 100]
     $_arcball quaternion [ViewToQuaternion]
-
-    set _limits(zmin) 0.0
-    set _limits(zmax) 1.0
 
     array set _settings {
@@ -551 +546 @@
 itcl::body Rappture::VtkMeshViewer::scale {args} {
     foreach dataobj $args {
-        array set bounds [limits $dataobj]
-        if {![info exists _limits(xmin)] || $_limits(xmin) > $bounds(xmin)} {
-            set _limits(xmin) $bounds(xmin)
-        }
-        if {![info exists _limits(xmax)] || $_limits(xmax) < $bounds(xmax)} {
-            set _limits(xmax) $bounds(xmax)
-        }
-
-        if {![info exists _limits(ymin)] || $_limits(ymin) > $bounds(ymin)} {
-            set _limits(ymin) $bounds(ymin)
-        }
-        if {![info exists _limits(ymax)] || $_limits(ymax) < $bounds(ymax)} {
-            set _limits(ymax) $bounds(ymax)
-        }
-
-        if {![info exists _limits(zmin)] || $_limits(zmin) > $bounds(zmin)} {
-            set _limits(zmin) $bounds(zmin)
-        }
-        if {![info exists _limits(zmax)] || $_limits(zmax) < $bounds(zmax)} {
-            set _limits(zmax) $bounds(zmax)
+        if { ![$dataobj isvalid] } {
+            continue;                   # Object doesn't contain valid data.
+        }
+        foreach axis { x y z } {
+            set lim [$dataobj limits $axis]
+            if { ![info exists _limits($axis)] } {
+                set _limits($axis) $lim
+                continue
+            }
+            foreach {min max} $lim break
+            foreach {amin amax} $_limits($axis) break
+            if { $amin > $min } {
+                set amin $min
+            }
+            if { $amax < $max } {
+                set amax $max
+            }
+            set _limits($axis) [list $amin $amax]            
         }
     }
@@ -824 +817 @@
     }
 
-    set _limits(zmin) ""
-    set _limits(zmax) ""
     set _first ""
     SendCmd "dataset visible 0"
@@ -1226 +1217 @@
         SendCmd "outline color $rgb"
     }
-}
-
-itcl::body Rappture::VtkMeshViewer::limits { dataobj } {
-    set tag $dataobj
-    if { ![info exists _limits($tag)] } {
-        set data [$dataobj vtkdata -full]
-        if { $data == "" } {
-            continue
-        }
-        set tmpfile file[pid].vtk
-        set f [open "$tmpfile" "w"]
-        fconfigure $f -translation binary -encoding binary
-        puts $f $data
-        close $f
-        set reader [vtkDataSetReader $tag-xvtkDataSetReader]
-        $reader SetFileName $tmpfile
-        $reader Update
-        file delete $tmpfile
-        set output [$reader GetOutput]
-        set _limits($tag) [$output GetBounds]
-        rename $output ""
-        rename $reader ""
-    }
-    foreach { xMin xMax yMin yMax zMin zMax} $_limits($tag) break
-    if {![info exists limits(xmin)] || $limits(xmin) > $xMin} {
-        set limits(xmin) $xMin
-    }
-    if {![info exists limits(xmax)] || $limits(xmax) < $xMax} {
-        set limits(xmax) $xMax
-    }
-    if {![info exists limits(ymin)] || $limits(ymin) > $yMin} {
-        set limits(ymin) $xMin
-    }
-    if {![info exists limits(ymax)] || $limits(ymax) < $yMax} {
-        set limits(ymax) $yMax
-    }
-    if {![info exists limits(zmin)] || $limits(zmin) > $zMin} {
-        set limits(zmin) $zMin
-    }
-    if {![info exists limits(zmax)] || $limits(zmax) < $zMax} {
-        set limits(zmax) $zMax
-    }
-
-    return [array get limits]
 }
 

branches/1.3/gui/scripts/vtkstreamlinesviewer.tcl

@@ -164 +164 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::VtkStreamlinesViewer::constructor {hostlist args} {
-    package require vtk
     set _serverType "vtkvis"
 

branches/1.3/gui/scripts/vtksurfaceviewer.tcl

@@ -159 +159 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::VtkSurfaceViewer::constructor {hostlist args} {
-    package require vtk
     set _serverType "vtkvis"
 

branches/1.3/gui/scripts/vtkvolumeviewer.tcl

@@ -157 +157 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::VtkVolumeViewer::constructor {hostlist args} {
-    package require vtk
     set _serverType "vtkvis"