Changeset 3302 for branches/Rappture 1.2/gui/scripts/molvisviewer.tcl

Timestamp:

Feb 17, 2013, 8:27:24 AM (12 years ago)

Author:

gah

Message:

fixes for clientdata output, fix streamlines to use vtkdata

File:

• branches/Rappture 1.2/gui/scripts/molvisviewer.tcl (modified) (4 diffs)

branches/Rappture 1.2/gui/scripts/molvisviewer.tcl

@@ -85 +85 @@
     private variable _cell 0;           # Restore camera settings
 
-    constructor { hostlist args } {
-        Rappture::VisViewer::constructor $hostlist
+    constructor { servers args } {
+        Rappture::VisViewer::constructor $servers
     } {
         # defined below
@@ -158 +158 @@
 # CONSTRUCTOR
 # ----------------------------------------------------------------------
-itcl::body Rappture::MolvisViewer::constructor {hostlist args} {
+itcl::body Rappture::MolvisViewer::constructor {servers args} {
     set _serverType "pymol"
 
@@ -203 +203 @@
     set _state(server) 1
     set _state(client) 1
-    set _hostlist $hostlist
     set _reset 1
 
@@ -1106 +1105 @@
             # what data objects are using the renderer until be get here.
             global env
-            lappend data "hub" [exec hostname]
-            lappend data "viewer" "molvisviewer"
+            lappend out "hub" [exec hostname]
+            lappend out "viewer" "molvisviewer"
             if { [info exists env(USER)] } {
-                lappend data "user" $env(USER)
+                lappend out "user" $env(USER)
             }
             if { [info exists env(SESSION)] } {
-                lappend data "session" $env(SESSION)
+                lappend out "session" $env(SESSION)
             }
-            lappend data "tool_id" [$_first get tool.id]
-            lappend data "tool_name" [$_first get tool.name]
-            lappend data "tool_version" [$_first get tool.version]
-            lappend data "tool_title" [$_first get tool.title]
-            SendCmd "clientinfo $data"
+            set parent [$_first parent -as object]
+            while { $parent != "" } {
+                set xmlobj $parent
+                set parent [$parent parent -as object]
+            }
+            lappend out "tool_id" [$xmlobj get tool.id]
+            lappend out "tool_name" [$xmlobj get tool.name]
+            lappend out "tool_title" [$xmlobj get tool.title]
+            lappend out "tool_command" [$xmlobj get tool.execute]
+            lappend out "tool_revision" \
+                [$xmlobj get tool.version.application.revision]
+            SendCmd "clientinfo $out"
         }