Changeset 839 for trunk/gui/scripts/field2dresult.tcl

Timestamp:

Jan 3, 2008, 1:18:00 PM (17 years ago)

Author:

gah

Message:

changes for surface plots

File:

• trunk/gui/scripts/field2dresult.tcl (modified) (4 diffs)

trunk/gui/scripts/field2dresult.tcl

@@ -40 +40 @@
     public method parameters {title args} { # do nothing }
     public method download {option args}
-
-    # resources file tells us the nanovis server
-    public common _nanovisHosts ""
-    public proc setNanovisServer {namelist} {
-        if {[regexp {^[a-zA-Z0-9\.]+:[0-9]+(,[a-zA-Z0-9\.]+:[0-9]+)*$} $namelist match]} {
-            set _nanovisHosts $namelist
-        } else {
-            error "bad nanovis server address \"$namelist\": should be host:port,host:port,..."
-        }
-    }
 }
 
@@ -55 +45 @@
 proc field2d_init_resources {} {
     Rappture::resources::register \
-        nanovis_server Rappture::Field2DResult::setNanovisServer
+        nanovis_server Rappture::NanovisServer::setServer
 }
 
@@ -71 +61 @@
     }
     array set flags $args
-
-    if {"" != $_nanovisHosts && $flags(-mode) != "vtk"} {
+    if { $flags(-mode) == "heightmap" } {
+        set servers [Rappture::NanovisServer::getServer]
+        if { $servers == "" } {
+            error "No nanovis servers available"
+        }
         itk_component add renderer {
-            Rappture::HeightMapViewer $itk_interior.ren $_nanovisHosts
+            Rappture::HeightmapViewer $itk_interior.ren $servers
         }
         pack $itk_component(renderer) -expand yes -fill both
-
-        # can't connect to rendering farm?  then fall back to older viewer
-        if {![$itk_component(renderer) isconnected]} {
-            destroy $itk_component(renderer)
-        }
-    }
-
-    if {![info exists itk_component(renderer)]} {
+    } else {
         itk_component add renderer {
             Rappture::ContourResult $itk_interior.ren
@@ -90 +76 @@
         pack $itk_component(renderer) -expand yes -fill both
     }
-
     eval itk_initialize $args
 }