Changeset 807

Timestamp:

Oct 2, 2007, 1:43:47 PM (17 years ago)

Author:

dkearney

Message:

adjusted nanovis-test to always send gzip mime encoded data to nanovis server. took out the dx regular expression check. this allows transfer function and camera commands for non-dx data to be sent in the same manner as dx data.

File:

• trunk/gui/apps/nanovis-test (modified) (1 diff)

trunk/gui/apps/nanovis-test

@@ -97 +97 @@
     if {"" != $file && [catch {
             set fid [open $file r]
+            fconfigure $fid -translation binary
             set info [read $fid]
             close $fid
           }] == 0} {
-        if {[regexp {(#[^\n]*\n)*object [0-9]+ class} $info]} {
-            set obj [DxData #auto $info]
-            $widgets(nanovis) add $obj
-        } else {
-            set fid [open $file r]
-            fconfigure $fid -translation binary
-            set info [Rappture::encoding::encode -as zb64 [read $fid]]
-            close $fid
-            set send_cmd "volume data follows [string length $info]\n$info"
-            namespace eval Rappture::NanovisViewer [list $widgets(nanovis) _send_text $send_cmd]
-        }
+        set obj [DxData #auto $info]
+        $widgets(nanovis) add $obj
     }
 }