Changeset 2293 for trunk/gui

Timestamp:

Jul 1, 2011 1:57:40 PM (13 years ago)

Author:

ldelgass

Message:

vtkviewer2-test needs to use a Rappture::Scene data object (for now). Also
remove send flow file menu item from vtkcontour-test (leftover from nanovis
test)

Location:

trunk/gui/apps

Files:

• vtkcontour-test (modified) (5 diffs)
• vtkviewer2-test (modified) (1 diff)

trunk/gui/apps/vtkcontour-test

@@ -68 +68 @@
 
 # ----------------------------------------------------------------------
-# Fake data object for sending DX or flow data...
+# Fake data object for sending VTK data file...
 # ----------------------------------------------------------------------
 itcl::class visData {
     constructor {args} {
-        set _data [Rappture::encoding::encode -as zb64 [lindex $args 0]]
+        set _data [lindex $args 0]
     }
 
@@ -81 +81 @@
         return ""
     }
+    public method data {args} {
+        return $_data
+    }
     public method values {args} {
         return $_data
@@ -100 +103 @@
     global widgets
 
-    set file [tk_getOpenFile -title "Open Command File"]
+    set file [tk_getOpenFile -title "Open VTK File"]
     if {"" != $file && [catch {
             set fid [open $file r]
@@ -109 +112 @@
         set obj [visData #auto $info]
         $widgets(vtkcontourviewer) add $obj
-    }
-}
-
-# ----------------------------------------------------------------------
-# USAGE: send_flow_file
-#
-# Prompts the user for a text file, and then sends the text within
-# that file along to the rendering widget.
-# ----------------------------------------------------------------------
-proc send_flow_file {} {
-    global widgets
-
-    set file [tk_getOpenFile -title "Open Command File"]
-    if {"" != $file && [catch {
-            set fid [open $file r]
-            fconfigure $fid -translation binary
-            set info [read $fid]
-            close $fid
-          }] == 0} {
-        set _data [Rappture::encoding::encode -as zb64 $info ]
-        set _data "flow data follows [string length $_data]\n$_data"
-        $widgets(command) insert 0 $_data
-        send_command
     }
 }
@@ -330 +310 @@
 menu .mbar
 menu .mbar.file
-.mbar.file add command -label "Send Volume File..." -underline 0 -command send_file
-.mbar.file add command -label "Send Flow File..." -underline 0 -command send_flow_file
+.mbar.file add command -label "Send VTK File..." -underline 0 -command send_file
 .mbar.file add command -label "Load script..." -underline 0 -command load_script
 .mbar.file add command -label "Reset" -underline 0 -command reset

trunk/gui/apps/vtkviewer2-test

@@ -71 +71 @@
 # ----------------------------------------------------------------------
 itcl::class visData {
-    inherit Rappture::Drawing3d
+    inherit Rappture::Scene
 
     constructor {args} {
-        Rappture::Drawing3d::constructor [Rappture::library standard] ""
+        Rappture::Scene::constructor [Rappture::library standard] ""
     } {
         set _data [lindex $args 0]