Changeset 2398 for trunk

Timestamp:

Aug 19, 2011, 1:05:41 AM (13 years ago)

Author:

ldelgass

Message:

Fix vtkviewer test

File:

• trunk/gui/apps/vtkviewer2-test (modified) (9 diffs)

trunk/gui/apps/vtkviewer2-test

@@ -1 +1 @@
 #!/bin/sh
 # ----------------------------------------------------------------------
-#  TEST PROGRAM for VtkViewer2
+#  TEST PROGRAM for VtkViewer
 #
 #  This program is a test harness for the VtkVis visualization
@@ -71 +71 @@
 # ----------------------------------------------------------------------
 itcl::class visData {
-    inherit Rappture::Scene
+    inherit Rappture::Drawing
 
     constructor {args} {
@@ -115 +115 @@
           }] == 0} {
         set obj [visData #auto $info]
-        $widgets(vtkviewer2) add $obj
+        $widgets(vtkviewer) add $obj
     }
 }
@@ -159 +159 @@
         set cmd $last_command
     }
-    namespace eval Rappture::VtkViewer2 [list $widgets(vtkviewer2) SendCmd $cmd]
+    namespace eval Rappture::VtkViewer [list $widgets(vtkviewer) SendCmd $cmd]
     $widgets(command) delete 0 end
 }
@@ -171 +171 @@
 proc reset {} {
     global widgets
-    $widgets(vtkviewer2) delete
-    $widgets(vtkviewer2) disconnect
+    $widgets(vtkviewer) delete
+    $widgets(vtkviewer) disconnect
     $widgets(comm) configure -state normal
     $widgets(comm) delete 1.0 end
@@ -242 +242 @@
     global widgets images
 
-    set imh [$widgets(vtkviewer2) get -image $images(which)]
+    set imh [$widgets(vtkviewer) get -image $images(which)]
 
     set file [tk_getSaveFile -title "Save Image File" \
@@ -271 +271 @@
     set h [winfo height $c]
 
-    set imh [$widgets(vtkviewer2) get -image $images(which)]
+    set imh [$widgets(vtkviewer) get -image $images(which)]
     set iw [image width $imh]
     set ih [image height $imh]
@@ -282 +282 @@
 
 toplevel .images
-wm title .images "Vtkviewer2: Images"
+wm title .images "Vtkviewer: Images"
 wm withdraw .images
 wm protocol .images WM_DELETE_WINDOW {wm withdraw .images}
@@ -335 +335 @@
 set f [.main pane 0]
 set servers [Rappture::VisViewer::GetServerList "vtkvis"]
-Rappture::VtkViewer2 $f.viewer $servers
+Rappture::VtkViewer $f.viewer $servers
 pack $f.viewer -expand yes -fill both
-set widgets(vtkviewer2) $f.viewer
-
-puts stderr [winfo class $widgets(vtkviewer2)]
+set widgets(vtkviewer) $f.viewer
+
+puts stderr [winfo class $widgets(vtkviewer)]
 
 $f.viewer configure \