Changeset 6374 for vmdshow/branches/0.1

Timestamp:

Jun 6, 2016, 1:15:52 PM (8 years ago)

Author:

ldelgass

Message:

merge vmdshow trunk to 0.1 branch

Location:

vmdshow/branches/0.1

Files:

• . (modified) (1 prop)
• vmdserver.tcl (modified) (15 diffs)

vmdshow/branches/0.1/vmdserver.tcl

@@ +1 @@
+# -*- mode: tcl; indent-tabs-mode: nil -*-
 # ----------------------------------------------------------------------
 #  HUBZERO: server for VMD
@@ -103 +104 @@
     translate
     user
-
     vecadd
     veccross
@@ -120 +120 @@
     vecsum
     veczero
-    
     vmdcollab
     vmdcon
@@ -280 +279 @@
         switch -- $key {
             -rotate {
-                molinfo top set rotate_matrix [list $val]
+                foreach mol [molinfo list] {
+                    molinfo $mol set rotate_matrix [list $val]
+                }
             }
             -scale {
-                molinfo top set scale_matrix [list $val]
+                foreach mol [molinfo list] {
+                    molinfo $mol set scale_matrix [list $val]
+                }
             }
             -center {
-                molinfo top set center_matrix [list $val]
+                foreach mol [molinfo list] {
+                    molinfo $mol set center_matrix [list $val]
+                }
             }
             -global {
-                molinfo top set global_matrix [list $val]
+                foreach mol [molinfo list] {
+                    molinfo $mol set global_matrix [list $val]
+                }
             }
             default {
@@ -317 +324 @@
             display shadows off
 
-            if 0 {
+            # gah: turn off rep change
+            if 0 {
             foreach nmol [molinfo list] {
                 set max [molinfo $nmol get numreps]
@@ -324 +332 @@
                 }
             }
-            }
+            }
         }
         end {
@@ -332 +340 @@
             display shadows $DisplayProps(shadows)
 
-            if 0 {
+            # gah: turn off rep change
+            if 0 {
             # restore rendering methods for all representations
             foreach nmol [molinfo list] {
@@ -340 +349 @@
                 }
             }
-            }
+            }
         }
         default {
@@ -457 +466 @@
             continue
         }
-        if { $tmpDir != "" } {
-            set tmpFile [file join $tmpDir [file tail $file]]
-            if { [file exists $tmpFile] } {
-                set file $tmpFile
-            }
-        }
+        if { $tmpDir != "" } {
+            set tmpFile [file join $tmpDir [file tail $file]]
+            if { [file exists $tmpFile] } {
+                set file $tmpFile
+            }
+        }
         mol $op $file waitfor all
-        if { ![info exists name] } {
-            puts stderr "can't find name file=$file"
-        }
+        if { ![info exists name] } {
+            puts stderr "can't find name file=$file"
+        }
         if {$op eq "new"} {
             set newnum [lindex [molinfo list] end]
@@ -777 +786 @@
       }
       max {
-        set nmol [lindex [molinfo list] 0]
-        if {$nmol ne ""} {
-            return [molinfo $nmol get numframes]
-        }
-        return 0
+          set maxFrames 0
+          foreach mol [molinfo list] {
+              set n [molinfo $mol get numframes]
+              if { $n > $maxFrames } {
+                  set maxFrames $n
+              }
+          }
+          return $maxFrames
+          # gah: fix to return max correct max frames.
+          if 0 {
+              set nmol [lindex [molinfo list] 0]
+              if {$nmol ne ""} {
+                  return [molinfo $nmol get numframes]
+              }
+              return 0
+          }
       }
       default {
@@ -804 +824 @@
 
     if { [llength [molinfo list]] == 0 } {
-        return ""
+        return ""
     }
     if { $Scenes(@CURRENT) eq "" } {
-        return ""
+        return ""
     }
 
@@ -825 +845 @@
     
     foreach arg $args { 
-        if { $arg == "writepdb" } {
-            error "autoselect \"writepdb\" option is disallowed"
-        }
+        if { $arg == "writepdb" } {
+            error "autoselect \"writepdb\" option is disallowed"
+        }
     }
     set cmd [eval atomselect $args]
@@ -890 +910 @@
             } else {
                 server_oops $cout $result
-                if { [string match "invalid command*" $result] } {
+                if { [string match "invalid command*" $result] } {
                     bgerror "server received invalid command: $result"
-                    server_exit $cin $cout 1
-                }
+                    server_exit $cin $cout 1
+                }
             }
         }
@@ -980 +1000 @@
             animate goto $item(frame)
         } elseif {[info exists item(rotate)]} {
-            molinfo top set rotate_matrix [list $item(rotate)]
+            foreach mol [molinfo list] {
+                molinfo $mol set rotate_matrix [list $item(rotate)]
+            }
             # send rotation matrix back to the client so we can pause later
             server_send_latest $client [list nv>rotatemtx $item(num) $item(rotate)]
@@ -990 +1012 @@
         if {[info exists item(defview)] && $item(defview)} {
             if {[info exists Views($item(frame))]} {
-                eval molinfo top set $Views($item(frame))
+                foreach mol [molinfo list] {
+                    eval molinfo $mol set $Views($item(frame))
+                }
             }
         }