Changeset 3392 for trunk/gui/scripts/nanovisviewer.tcl

Timestamp:

Feb 28, 2013, 8:27:50 AM (12 years ago)

Author:

gah

Message:

fixes for new stats file

File:

• trunk/gui/scripts/nanovisviewer.tcl (modified) (3 diffs)

trunk/gui/scripts/nanovisviewer.tcl

@@ -889 +889 @@
     }
 
-    set _width [winfo width $itk_component(3dview)]
-    set _height [winfo height $itk_component(3dview)]
-    DoResize
-
+    if { $_reset } {
+        set _width [winfo width $itk_component(3dview)]
+        set _height [winfo height $itk_component(3dview)]
+        DoResize
+        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
+
+            set info {}
+            set user "???"
+            if { [info exists env(USER)] } {
+                set user $env(USER)
+            }
+            set session "???"
+            if { [info exists env(SESSION)] } {
+                set session $env(SESSION)
+            }
+            lappend info "hub" [exec hostname]
+            lappend info "client" "nanovisviewer"
+            lappend info "user" $user
+            lappend info "session" $session
+            SendCmd "clientinfo [list $info]"
+        }
+    }
     foreach dataobj [get] {
         foreach cname [$dataobj components] {
@@ -900 +923 @@
                 set data [$dataobj values $cname]
                 set nbytes [string length $data]
+                if 1 {
+                    set info {}
+                    lappend info "tool_id"       [$dataobj hints toolId]
+                    lappend info "tool_name"     [$dataobj hints toolName]
+                    lappend info "tool_version"  [$dataobj hints toolRevision]
+                    lappend info "tool_title"    [$dataobj hints toolTitle]
+                    lappend info "dataset_label" [$dataobj hints label]
+                    lappend info "dataset_size"  $nbytes
+                    SendCmd "clientinfo [list $info]"
+                }
                 append _outbuf "volume data follows $nbytes $tag\n"
                 append _outbuf $data
@@ -949 +982 @@
             if { $location != "" } {
                 array set _view $location
-            }
-            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" "nanovisviewer"
-                if { [info exists env(USER)] } {
-                    lappend out "user" $env(USER)
-                }
-                if { [info exists env(SESSION)] } {
-                    lappend out "session" $env(SESSION)
-                }
-                lappend out "tool_id"      [$_first hints toolId]
-                lappend out "tool_name"    [$_first hints toolName]
-                lappend out "tool_version" [$_first hints toolRevision]
-                lappend out "tool_title"   [$_first hints toolTitle]
-                lappend out "tool_dataset" [$_first hints label]
-                SendCmd "clientinfo [list $out]"
             }
         }