Changeset 3330 for trunk/gui/scripts/molvisviewer.tcl

Timestamp:

Feb 24, 2013, 1:11:18 PM (12 years ago)

Author:

gah

Message:

merge (by hand) with Rappture1.2 branch

File:

• trunk/gui/scripts/molvisviewer.tcl (modified) (12 diffs)

trunk/gui/scripts/molvisviewer.tcl

@@ +1 @@
+# -*- mode: tcl; indent-tabs-mode: nil -*- 
 
 # ----------------------------------------------------------------------
@@ -65 +66 @@
     private variable _cacheid ""
     private variable _cacheimage ""
+    private variable _first     ""
 
     private common _settings  ;         # Array of settings for all known 
@@ -81 +83 @@
     private variable _width
     private variable _height
-    private variable _reset 1;  # Restore camera settings
+    private variable _reset 1;          # Restore camera settings
     private variable _cell 0;           # Restore camera settings
-    private variable _flush 1
-
-    constructor { hostlist args } {
-        Rappture::VisViewer::constructor $hostlist
+
+    constructor { servers args } {
+        Rappture::VisViewer::constructor $servers
     } {
         # defined below
@@ -158 +159 @@
 # CONSTRUCTOR
 # ----------------------------------------------------------------------
-itcl::body Rappture::MolvisViewer::constructor {hostlist args} {
+itcl::body Rappture::MolvisViewer::constructor {servers args} {
     set _serverType "pymol"
 
@@ -196 +197 @@
     # the visualization server.
     $_parser alias image [itcl::code $this ReceiveImage]
+    $_parser alias viserror [itcl::code $this ReceiveError]
 
     set _rocker(dir) 1
@@ -203 +205 @@
     set _state(server) 1
     set _state(client) 1
-    set _hostlist $hostlist
     set _reset 1
 
@@ -246 +247 @@
         ignore -highlightthickness -borderwidth  -background
     }
+    bind $itk_component(3dview) <Control-F1> [itcl::code $this ToggleConsole]
 
     set f [$itk_component(main) component controls]
@@ -501 +503 @@
     # delete all specified dataobjs
     set changed 0
-    set _flush 1
     foreach dataobj $args {
         set pos [lsearch -exact $_dlist $dataobj]
@@ -712 +713 @@
     global readyForNextFrame
     set readyForNextFrame 1
+    set _reset 1
 }
 
@@ -893 +895 @@
         SendCmd "raw -defer {set auto_show_lines,0}"
     }
+    set _first ""
     set dlist [get]
     foreach dataobj $dlist {
+        if { $_first == "" } {
+            set _first $dataobj
+        }
         set model [$dataobj get components.molecule.model]
         if {"" == $model } {
@@ -1096 +1102 @@
     }
     if { $_reset } {
+        if 1 {
+            # Tell the server the name of the tool, the version, and dataset
+            # that we are rendering.  Have to do it here because we don't know
+            # what data objects are using the renderer until be get here.
+            global env
+            lappend out "hub" [exec hostname]
+            lappend out "viewer" "molvisviewer"
+            if { [info exists env(USER)] } {
+                lappend out "user" $env(USER)
+            }
+            if { [info exists env(SESSION)] } {
+                lappend out "session" $env(SESSION)
+            }
+            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"
+        }
+
         # Set or restore viewing parameters.  We do this for the first
         # model and assume this works for everything else.
@@ -1134 +1167 @@
                                         # until we get an image.
         #SendCmd "ppm";                 # Flush the results.
-        set _flush 0
     }
     set _buffering 0;                   # Turn off buffering.