Changeset 925 for trunk

Timestamp:

Mar 6, 2008 2:23:54 PM (16 years ago)

Author:

gah

Message:

Fix: changed _CheckServerList to proc from method

File:

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

trunk/gui/scripts/visviewer.tcl

@@ -39 +39 @@
     }
     # Used internally only.
-    private method _CheckNameList {namelist} 
     private method _Shuffle { hostlist } 
     private method _ReceiveHelper {} 
@@ -45 +44 @@
     private method _SendHelper {}
 
-    protected method SendEcho {channel {data ""}}
-    protected method ReceiveEcho {channel {data ""}}
+    protected method SendEcho { channel {data ""} }
+    protected method ReceiveEcho { channel {data ""} }
     protected method Connect { hostlist }
     protected method Disconnect {}
@@ -53 +52 @@
     protected method ReceiveBytes { nbytes }
     protected method Flush {}
-    protected method Color2RGB {color}
-    protected method Euler2XYZ {theta phi psi}
-
-    public proc SetPymolServerList {namelist} {
-        _CheckNameList $namelist
-        set _servers(pymol) $namelist
-    }
-    public proc SetNanovisServerList {namelist} {
-        _CheckNameList $namelist
-        set _servers(nanovis) $namelist
-    }
-    public proc SetServerList {tag namelist} {
+    protected method Color2RGB { color }
+    protected method Euler2XYZ { theta phi psi }
+
+    private proc _CheckNameList { namelist }  {
+        set pattern {^[a-zA-Z0-9\.]+:[0-9]+(,[a-zA-Z0-9\.]+:[0-9]+)*$}
+        if { ![regexp $pattern $namelist match] } {
+            error "bad visualization server address \"$namelist\": should be host:port,host:port,..."
+        }
+    }
+    public proc GetServerList { tag } {
+        return $_servers($tag)
+    }
+    public proc SetServerList { tag namelist } {
         _CheckNameList $namelist
         set _servers($tag) $namelist
     }
-    public proc GetServerList { tag } {
-        return $_servers($tag)
+    public proc SetPymolServerList { namelist } {
+        SetServerList "pymol" $namelist
+    }
+    public proc SetNanovisServerList { namelist } {
+        SetServerList "nanovis" $namelist
     }
 }
@@ -154 +157 @@
     }
     return $random_hosts
-}
-
-#
-# _CheckNameList --
-# 
-#    Used within the class to check if provide list of hostname:port are
-#    correct.  Return an error if the list is invalid.
-#
-itcl::body Rappture::VisViewer::_CheckNameList { namelist } {
-    set pattern {^[a-zA-Z0-9\.]+:[0-9]+(,[a-zA-Z0-9\.]+:[0-9]+)*$}
-    if { ![regexp $pattern $namelist match] } {
-        error "bad visualization server address \"$namelist\": should be host:port,host:port,..."
-    }
 }