Changeset 1483

Timestamp:

Jun 2, 2009, 8:43:00 AM (15 years ago)

Author:

gah

Message:

fix newlines when sending data to pymolproxy

Location:

trunk/gui/scripts

Files:

• gauge.tcl (modified) (2 diffs)
• molvisviewer.tcl (modified) (5 diffs)
• visviewer.tcl (modified) (1 diff)

trunk/gui/scripts/gauge.tcl

@@ -234 +234 @@
         switch -- $itk_option(-type) {
             integer {
-                if {[string length $nv] <= 0 
-                      || ![string is integer $nv] } {
-                    error "Should be an integer value"
+                if { [scan $nv "%g" value] != 1 || int($nv) != $value } {
+                    error "bad value \"$nv\": should be an integer value"
                 }
             }
@@ -243 +242 @@
                       || ![string is double $nv]
                       || [regexp -nocase {^(inf|nan)$} $nv]} {
-                    error "Should be a real number"
+                    error "bad value \"$nv\": should be a real number"
                 }
             }

trunk/gui/scripts/molvisviewer.tcl

@@ -70 +70 @@
     public method ResetView {} 
 
-    protected method SendCmd {args}
+    protected method SendCmd { string }
     protected method Update { args }
     protected method Rebuild { }
@@ -598 +598 @@
 }
 
-itcl::body Rappture::MolvisViewer::SendCmd { args } {
-    debug "SendCmd $args"
+itcl::body Rappture::MolvisViewer::SendCmd { cmd } {
+    debug "in SendCmd ($cmd)\n"
 
     if { $_buffering } {
@@ -611 +611 @@
             set _rocker(server) $_rocker(client)
         }
-        append _outbuf "$args\n"
+        append _outbuf "$cmd\n"
     } else {
         if { $_state(server) != $_state(client) } {
@@ -623 +623 @@
             }
         }
-        eval SendBytes "$args\n"
+        SendBytes "$cmd\n"
     }
 }
@@ -1480 +1480 @@
 # are specified, then all dataobjs are deleted.
 # ----------------------------------------------------------------------
-itcl::body Rappture::MolvisViewer::delete {args} {
+itcl::body Rappture::MolvisViewer::delete { args } {
     if {[llength $args] == 0} {
         set args $_dlist

trunk/gui/scripts/visviewer.tcl

@@ -527 +527 @@
 #
 itcl::body Rappture::VisViewer::SendEcho {channel {data ""}} {
-    #puts stderr ">>$data"
+    #puts stderr ">>($data)"
     if {[string length $itk_option(-sendcommand)] > 0} {
         uplevel #0 $itk_option(-sendcommand) [list $channel $data]