Changeset 3323 for branches

Timestamp:

Feb 22, 2013, 4:28:34 PM (11 years ago)

Author:

gah

Message:

mesh cleanup for curvilinear grid

Location:

branches/Rappture 1.2/gui/scripts

Files:

• mesh.tcl (modified) (7 diffs)
• visviewer.tcl (modified) (1 diff)
• vtkheightmapviewer.tcl (modified) (1 diff)
• vtkviewer.tcl (modified) (1 diff)

branches/Rappture 1.2/gui/scripts/mesh.tcl

@@ -71 +71 @@
     private variable _yv        ""
     private variable _zv        ""
-    private variable _bltmesh   ""
     private variable _xCoords   "";     # For the blt contour only
     private variable _yCoords   "";     # For the blt contour only
@@ -233 +232 @@
         rename $_points ""
     }
-    if { $_bltmesh != "" } {
-        blt::mesh destroy $_bltmesh
-    }
 }
 
@@ -310 +306 @@
         "vtk" { 
             return $_vtkgrid 
-        }
-        "blt" { 
-            return $_bltmesh
         }
         default { 
@@ -532 +525 @@
             error "curvilinear grid must be 2D or 3D."
         }
-        set data [$xmlobj get $path.grid.points]
+        set points [$xmlobj get $path.grid.points]
         if { $points == "" } {
             error "missing <points> from grid description."
@@ -547 +540 @@
         if { [info exists zNum] } {
             set _dim 3
-            set _numPoints [expr $xNum * $yNum * zNum]
+            set _numPoints [expr $xNum * $yNum * $zNum]
             $all set $points
             if { ($_numPoints*3) != $numCoords } {
@@ -557 +550 @@
             $all split $xv $yv $zv
             foreach axis {x y z} {
-                set vector ${axis}v
+                set vector [set ${axis}v]
                 set _limits($axis) [$vector limits]
             }
@@ -576 +569 @@
             }
             foreach axis {x y} {
-                set vector ${axis}v
+                set vector [set ${axis}v]
                 set _limits($axis) [$vector limits]
             }

branches/Rappture 1.2/gui/scripts/visviewer.tcl

@@ -72 +72 @@
     private method SendDebugCommand {} 
 
-    protected method ReceiveError { args }
-    protected method SendEcho { channel {data ""} }
-    protected method ReceiveEcho { channel {data ""} }
+    protected method Color2RGB { color }
     protected method Connect { servers }
     protected method Disconnect {}
+    protected method Euler2XYZ { theta phi psi }
+    protected method Flush {}
     protected method IsConnected {}
+    protected method ReceiveBytes { nbytes }
+    protected method ReceiveEcho { channel {data ""} }
+    protected method ReceiveError { args }
     protected method SendBytes { bytes }
-    protected method ReceiveBytes { nbytes }
-    protected method Flush {}
-    protected method Color2RGB { color }
-    protected method Euler2XYZ { theta phi psi }
+    protected method SendEcho { channel {data ""} }
     protected method StartWaiting {} 
     protected method StopWaiting {} 
-    protected method ReceiveError { args }
 
     private method Waiting { option widget } 

branches/Rappture 1.2/gui/scripts/vtkheightmapviewer.tcl

@@ -951 +951 @@
             if { ![info exists _datasets($tag)] } {
                 set bytes [$dataobj vtkdata $comp]
-                if 1 { 
+                if 0 { 
                 set f [open /tmp/vtkheightmap.vtk "w"]
                 puts $f $bytes

branches/Rappture 1.2/gui/scripts/vtkviewer.tcl

@@ -183 +183 @@
     # Populate parser with commands handle incoming requests
     #
-    $_parser alias image [itcl::code $this ReceiveImage]
-    $_parser alias dataset [itcl::code $this ReceiveDataset]
-    $_parser alias legend [itcl::code $this ReceiveLegend]
+    $_parser alias image    [itcl::code $this ReceiveImage]
+    $_parser alias dataset  [itcl::code $this ReceiveDataset]
+    $_parser alias legend   [itcl::code $this ReceiveLegend]
     $_parser alias viserror [itcl::code $this ReceiveError]