Changeset 4458 for branches

Timestamp:

Jul 3, 2014 9:11:15 AM (10 years ago)

Author:

ldelgass

Message:

Merge from trunk (drawing(3d))

File:

• branches/1.3/gui/scripts/drawing.tcl (modified) (8 diffs)

branches/1.3/gui/scripts/drawing.tcl

@@ -2 +2 @@
 
 # ----------------------------------------------------------------------
-#  COMPONENT: drawing - 2D drawing of data
+#  COMPONENT: drawing - 3D drawing of data
 # ======================================================================
 #  AUTHOR:  Michael McLennan, Purdue University
@@ -20 +20 @@
     private variable _drawing
     private variable _xmlobj 
-    private variable _actors 
     private variable _styles 
     private variable _shapes 
@@ -28 +27 @@
     private variable _hints
     private variable _units
-    private variable _limits
 
     constructor {xmlobj path} { 
@@ -36 +34 @@
         # defined below 
     }
-    public method limits {axis}
+
     public method label { elem }
     public method type { elem }
@@ -63 +61 @@
         set xunits "um"
     }
-    array set _limits {
-        xMin 0 
-        xMax 0 
-        yMin 0 
-        yMax 0 
-        zMin 0 
-        zMax 0 
-    }
     # determine the overall size of the device
     foreach elem [$_xmlobj children $path] {
         switch -glob -- $elem {
-            polygon* {
-                set _data($elem) [$_xmlobj get $path.$elem.vtk]
-                set _data($elem) [string trim $_data($elem)]
-                set _styles($elem) [$_xmlobj get $path.$elem.about.style]
-                set _labels($elem) [$_xmlobj get $path.$elem.about.label]
-                set _types($elem) polydata
-            }
-            polydata* {
+            # polygon is deprecated in favor of polydata
+            polygon* - polydata* {
                 set _data($elem) [$_xmlobj get $path.$elem.vtk]
                 set _data($elem) [string trim $_data($elem)]
@@ -87 +71 @@
                 set _labels($elem) [$_xmlobj get $path.$elem.about.label]
                 set _types($elem) polydata
-            }
-            streamlines* {
-                set _data($elem) [$_xmlobj get $path.$elem.vtk]
-                set _data($elem) [string trim $_data($elem)]
-                set _styles($elem) [$_xmlobj get $path.$elem.about.style]
-                set _labels($elem) [$_xmlobj get $path.$elem.about.label]
-                set _types($elem) streamlines
             }
             glyphs* {
@@ -250 +227 @@
 
 # ----------------------------------------------------------------------
-# method limits <axis>
-#       Returns a list {min max} representing the limits for the 
-#       specified axis.
-# ----------------------------------------------------------------------
-itcl::body Rappture::Drawing::limits {which} {
-    set min ""
-    set max ""
-    foreach key [array names _data] {
-        set actor $_actors($key)
-        foreach key { xMin xMax yMin yMax zMin zMax} value [$actor GetBounds] {
-            set _limits($key) $value
-        }
-        break
-    }    
-    
-    foreach key [array names _actors] {
-        set actor $_actors($key)
-        foreach { xMin xMax yMin yMax zMin zMax} [$actor GetBounds] break
-        if { $xMin < $_limits(xMin) } {
-            set _limits(xMin) $xMin
-        } 
-        if { $xMax > $_limits(xMax) } {
-            set _limits(xMax) $xMax
-        } 
-        if { $yMin < $_limits(yMin) } {
-            set _limits(yMin) $yMin
-        } 
-        if { $yMax > $_limits(yMax) } {
-            set _limits(yMax) $yMax
-        } 
-        if { $zMin < $_limits(zMin) } {
-            set _limits(zMin) $zMin
-        } 
-        if { $zMax > $_limits(zMax) } {
-            set _limits(zMax) $zMax
-        } 
-    }
-    switch -- $which {
-        x {
-            set min $_limits(xMin)
-            set max $_limits(xMax)
-            set axis "xaxis"
-        }
-        y {
-            set min $_limits(yMin)
-            set max $_limits(yMax)
-            set axis "yaxis"
-        }
-        v - z {
-            set min $_limits(zMin)
-            set max $_limits(zMax)
-            set axis "zaxis"
-        }
-        default {
-            error "unknown axis description \"$which\""
-        }
-    }
-    return [list $min $max]
-}
-
-# ----------------------------------------------------------------------
 # USAGE: hints ?<keyword>?
 #
@@ -340 +256 @@
     return [array get _hints]
 }
-