Changeset 3768

Timestamp:

Jul 10, 2013 1:19:25 PM (11 years ago)

Author:

ldelgass

Message:

Some minor cleanups

Location:

trunk/gui/scripts

Files:

• vtkheightmapviewer.tcl (modified) (3 diffs)
• vtkviewer.tcl (modified) (3 diffs)

trunk/gui/scripts/vtkheightmapviewer.tcl

@@ -88 +88 @@
     private method BuildDownloadPopup { widget command } 
     private method Combo { option }
-    private method ConvertToVtkData { dataobj comp } 
     private method DrawLegend {}
     private method EnterLegend { x y } 
@@ -389 +388 @@
 
     set _image(download) [image create photo]
-    puts stderr "args=$args"
     eval itk_initialize $args
     Connect
@@ -2172 +2170 @@
         foreach comp [$dataobj components] {
             set tag $dataobj-$comp
-            #set contents [ConvertToVtkData $dataobj $comp]
             set contents [$dataobj vtkdata $comp]
-            append bytes "$contents\n\n"
+            append bytes "$contents\n"
         }
     }

trunk/gui/scripts/vtkviewer.tcl

@@ -88 +88 @@
     private method BuildMeshTab {}
     private method BuildMoleculeTab {}
-    private method ConvertToVtkData { dataobj comp } 
     private method DrawLegend {}
     private method EnterLegend { x y } 
@@ -2184 +2183 @@
 }
 
-itcl::body Rappture::VtkViewer::ConvertToVtkData { dataobj comp } {
-    foreach { x1 x2 xN y1 y2 yN } [$dataobj mesh $comp] break
-    set values [$dataobj values $comp]
-    append out "# vtk DataFile Version 2.0 \n"
-    append out "Test data \n"
-    append out "ASCII \n"
-    append out "DATASET STRUCTURED_POINTS \n"
-    append out "DIMENSIONS $xN $yN 1 \n"
-    append out "ORIGIN 0 0 0 \n"
-    append out "SPACING 1 1 1 \n"
-    append out "POINT_DATA [expr $xN * $yN] \n"
-    append out "SCALARS field double 1 \n"
-    append out "LOOKUP_TABLE default \n"
-    append out [join $values "\n"]
-    append out "\n"
-    return $out
-}
-
 itcl::body Rappture::VtkViewer::GetVtkData { args } {
     set bytes ""
@@ -2209 +2190 @@
             set contents [$dataobj data $comp]
             append bytes "$contents\n"
-            append bytes "\# End of VTK file\n\n"
-        }
-    }
-    return [list .txt $bytes]
+        }
+    }
+    return [list .vtk $bytes]
 }