Changeset 5081

Timestamp:

Mar 5, 2015 2:46:40 AM (9 years ago)

Author:

ldelgass

Message:

merge from trunk

Location:

vmdshow/branches/0.1

Files:

• . (modified) (1 prop)
• INSTALL.txt (modified) (1 diff)
• Makefile.in (copied) (copied from vmdshow/trunk/Makefile.in)
• cf (copied) (copied from vmdshow/trunk/cf)
• configure (copied) (copied from vmdshow/trunk/configure)
• configure.in (copied) (copied from vmdshow/trunk/configure.in)
• vmdserver.tcl (modified) (6 diffs)

vmdshow/branches/0.1/INSTALL.txt

@@ -5 +5 @@
 Follow instructions in INSTALL.txt there.  You'll need the vmdserver.tcl
 script from here.
-
-
-
-

vmdshow/branches/0.1/vmdserver.tcl

@@ -76 +76 @@
   color
   gettimestep
+  graphics
   imd
   label
@@ -147 +148 @@
 
 # ----------------------------------------------------------------------
+# USAGE: queryinfo <x> <y> ?-add?
+#
+# Resizes the visualization window to the given width <w> and height
+# <h>.  The next image sent should be this size.
+# ----------------------------------------------------------------------
+proc cmd_queryinfo {x y args} {
+    global DisplayProps MolNames MolInfo
+
+    # be careful -- VMD uses coordinates from LOWER-left corner of window
+    set vmdy [expr {$DisplayProps(frameh)-$y}]
+
+    set vals [pick $x $vmdy]
+    if {$vals ne ""} {
+        array set data $vals
+
+        # map the molecule ID back to the name used within MD Showcase
+        foreach molname $MolNames {
+            if {$MolInfo($molname) == $data(mol)} {
+                set data(molname) $molname
+                break
+            }
+        }
+
+        # pass back the click coord on screen so we know where this came from
+        set data(screenx) $x
+        set data(screeny) $y
+
+        set vals [array get data]
+    }
+    return $vals
+}
+$parser alias queryinfo cmd_queryinfo
+
+# ----------------------------------------------------------------------
 # USAGE: resize <w> <h>
 #
@@ -327 +362 @@
 # ----------------------------------------------------------------------
 proc cmd_load {args} {
-    global MolInfo
+    global MolInfo MolNames
 
     # clear all existing molecules
@@ -334 +369 @@
     }
     catch {unset MolInfo}
+    set MolNames ""
 
     # load new files
@@ -351 +387 @@
         if {$op eq "new"} {
             set newnum [lindex [molinfo list] end]
+            if {[lsearch -exact MolNames $name] < 0} {
+                lappend MolNames $name
+            }
             set MolInfo($name) $newnum
             set MolInfo($slot) $newnum
@@ -751 +790 @@
                 server_oops $cout $result
                 if { [string match "invalid command*" $result] } {
-                    bgerror "I got a invalid command: $result"
+                    bgerror "server received invalid command: $result"
                     exit 1
                 }