Changeset 5610 for trunk

Timestamp:

May 27, 2015, 1:17:43 PM (9 years ago)

Author:

ldelgass

Message:

Remove unused mesh methods. mesh/values methods are only used for field acting
as a curve (XY data).

Location:

trunk/gui/scripts

Files:

• cloud.tcl (modified) (2 diffs)
• field.tcl (modified) (7 diffs)
• unirect2d.tcl (modified) (2 diffs)
• unirect3d.tcl (modified) (2 diffs)

trunk/gui/scripts/cloud.tcl

@@ -25 +25 @@
     }
     public method points {}
-    public method mesh {}
     public method units { axis }
     public method label { axis }
@@ -216 +215 @@
 
 # ----------------------------------------------------------------------
-# USAGE: mesh
-#
-# Returns the vtk object representing the mesh.
-# ----------------------------------------------------------------------
-itcl::body Rappture::Cloud::mesh {} {
-    return $_points
-}
-
-# ----------------------------------------------------------------------
 # USAGE: dimensions
 #

trunk/gui/scripts/field.tcl

@@ -306 +306 @@
 #
 # For 1D data (curve), returns a BLT vector of x values for the field
-# component <name>.  Otherwise, this method is unused
+# component <name>.  Otherwise, this method is unused.
 # ----------------------------------------------------------------------
 itcl::body Rappture::Field::mesh {{cname -overall}} {
@@ -316 +316 @@
     }
     if {[info exists _comp2vtk($cname)]} {
-        # FIXME: extract mesh from VTK file data.
         error "method \"mesh\" is not implemented for VTK file data"
     }
@@ -323 +322 @@
     }
     if {[info exists _comp2mesh($cname)]} {
-        # FIXME: This only works for cloud
-        set mesh [lindex $_comp2mesh($cname) 0]
-        return [$mesh points]
+        error "method \"mesh\" is not implemented for Rappture::Mesh"
     }
     if {[info exists _comp2unirect2d($cname)]} {
-        # FIXME: unirect2d mesh is a list: xMin xMax xNum yMin yMax yNum
-        return [$_comp2unirect2d($cname) mesh]
+        error "method \"mesh\" is not implemented for unirect2d"
     }
     if {[info exists _comp2unirect3d($cname)]} {
-        # This returns a list of x,y,z points
-        return [$_comp2unirect3d($cname) mesh]
+        error "method \"mesh\" is not implemented for unirect3d"
     }
     error "can't get field mesh: Unknown component \"$cname\": should be one of [join [lsort [array names _comp2dims]] {, }]"
@@ -342 +337 @@
 #
 # For 1D data (curve), returns a BLT vector of field values (y coords)
-# for the field component <name>.  Otherwise, this method is unused
+# for the field component <name>.  Otherwise, this method is unused.
+# The number of elements in the vector should be a multiple of the
+# return value of [numComponents]
 # ----------------------------------------------------------------------
 itcl::body Rappture::Field::values {cname} {
@@ -351 +348 @@
         return [lindex $_comp2xy($cname) 1]  ;# return yv
     }
-    if { [info exists _comp2vtk($cname)] } {
-        # FIXME: extract the values from the VTK file data
+    if {[info exists _comp2vtk($cname)]} {
         error "method \"values\" is not implemented for VTK file data"
     }
@@ -358 +354 @@
         error "method \"values\" is not implemented for DX file data"
     }
-    if { [info exists _comp2mesh($cname)] } {
-        set vector [lindex $_comp2mesh($cname) 1]
-        return [$vector range 0 end]
+    if {[info exists _comp2mesh($cname)]} {
+        return [lindex $_comp2mesh($cname) 1] ;# return vector
     }
     if {[info exists _comp2unirect2d($cname)]} {
-        return $_values
+        error "method \"values\" is not implemented for unirect2d"
     }
     if {[info exists _comp2unirect3d($cname)]} {
-        return [$_comp2unirect3d($cname) values]
+        error "method \"values\" is not implemented for unirect3d"
     }
     error "can't get field values. Unknown component \"$cname\": should be one of [join [lsort [array names _comp2dims]] {, }]"
@@ -391 +386 @@
         return [$_comp2unirect3d($cname) blob]
     }
+    if {[info exists _comp2mesh($cname)]} {
+        error "method \"blob\" not implemented for Rappture::Mesh"
+    }
     if { [info exists _comp2vtk($cname)] } {
-        error "blob not implemented for VTK file data"
+        error "method \"blob\" not implemented for VTK file data"
     }
     if {[info exists _comp2xy($cname)]} {
-        error "blob not implemented for XY data"
+        error "method \"blob\" not implemented for XY data"
     }
     error "can't get field blob: Unknown component \"$cname\": should be one of [join [lsort [array names _comp2dims]] {, }]"

trunk/gui/scripts/unirect2d.tcl

@@ -39 +39 @@
     public method label { axis }
     public method limits {axis}
-    public method mesh {}
     public method numpoints {} {
         return $_numPoints
@@ -195 +194 @@
 
 # ----------------------------------------------------------------------
-# method mesh
-#       Returns a Tcl list that represents the mesh limits and dims.
-# ----------------------------------------------------------------------
-itcl::body Rappture::Unirect2d::mesh {} {
-    lappend out $_xMin $_xMax $_xNum $_yMin $_yMax $_yNum
-    return $out
-}
-
-# ----------------------------------------------------------------------
 # method limits <axis>
 #       Returns a list {min max} representing the limits for the

trunk/gui/scripts/unirect3d.tcl

@@ -37 +37 @@
     public method label { axis }
     public method limits {axis}
-    public method mesh {}
     public method numpoints {} {
         return $_numPoints
@@ -189 +188 @@
 
 # ----------------------------------------------------------------------
-# method mesh
-#       Returns a Tcl list that represents the points of the uniform
-#       grid.  Each point has x,y and z values in the list.
-# ----------------------------------------------------------------------
-itcl::body Rappture::Unirect3d::mesh {} {
-    set dx [expr {($_xMax - $_xMin) / double($_xNum - 1)}]
-    set dy [expr {($_yMax - $_yMin) / double($_yNum - 1)}]
-    set dz [expr {($_zMax - $_zMin) / double($_zNum - 1)}]
-    foreach {a b c} $_axisOrder break
-    for { set i 0 } { $i < [set _${a}Num] } { incr i } {
-        set v1 [expr {[set _${a}Min] + (double($i) * [set d${a}])}]
-        for { set j 0 } { $j < [set _${b}Num] } { incr j } {
-            set v2 [expr {[set _${b}Min] + (double($i) * [set d${b}])}]
-            for { set k 0 } { $k < [set _${c}Num] } { incr k } {
-                set v3 [expr {[set _${c}Min] + (double($i) * [set d${c}])}]
-                lappend data $v1 $v2 $v3
-            }
-        }
-    }
-    return $data
-}
-
-# ----------------------------------------------------------------------
 # method values
 #       Returns a BLT vector that represents the field values