Changeset 711

Timestamp:

May 7, 2007, 3:18:15 PM (17 years ago)

Author:

mmc

Message:

Fixed the older MoleculeViewer? to work properly with the add/delete
calls needed for the new PyMol?-based viewer.

Disabled the syncCutBuffer stuff in mainwin that used to be used for
copy/paste with desktop. This never worked very well, and we have
the newer upload/download stuff in place now.

A few small tweaks to the graph example and the loader example.

Location:

trunk

Files:

• examples/graph/graph.py (modified) (1 diff)
• examples/zoo/loader/tool.xml (modified) (2 diffs)
• gui/scripts/mainwin.tcl (modified) (1 diff)
• gui/scripts/moleculeViewer.tcl (modified) (5 diffs)

trunk/examples/graph/graph.py

@@ -27 +27 @@
 
 io.put('output.curve(result).about.label','Formula: Y vs X',append=0)
+io.put('output.curve(result).yaxis.label','Y')
+io.put('output.curve(result).xaxis.label','X')
 
 for i in range(npts):

trunk/examples/zoo/loader/tool.xml

@@ -22 +22 @@
     </about>
     <example>*.xml</example>
+    <upload>
+      <to>input.string(one)</to>
+      <to>input.string(two)</to>
+    </upload>
+    <download>
+      <from>input.string(one)</from>
+      <from>input.string(two)</from>
+    </download>
   </loader>
 
@@ -34 +42 @@
     </about>
   </string>
+  <number id="e">
+    <about>
+      <label>Mass</label>
+    </about>
+    <units>kg</units>
+    <default>10g</default>
+  </number>
 </input>
 </run>

trunk/gui/scripts/mainwin.tcl

@@ -150 +150 @@
     set _sync(selection) ""
 
-    global tcl_platform
-    if {$tcl_platform(platform) == "unix"} {
-        # this sync stuff works only for X windows
-        blt::cutbuffer set ""
-        syncCutBuffer ifneeded
-    }
+    #
+    # We used to do this to make "copy/paste with desktop" work
+    # properly.  Well, it never really worked *properly*, but
+    # it was an attempt.  We might as well skip it.  We use
+    # the importfile/exportfile stuff now.
+    #
+    ##global tcl_platform
+    ##if {$tcl_platform(platform) == "unix"} {
+    ##    # this sync stuff works only for X windows
+    ##    blt::cutbuffer set ""
+    ##    syncCutBuffer ifneeded
+    ##}
 }
 

trunk/gui/scripts/moleculeViewer.tcl

@@ -31 +31 @@
     destructor { # defined below }
 
+    public method add {dataobj {settings ""}}
+    public method get {}
+    public method delete {args}
+
     public method emblems {option}
     public method download {option args}
@@ -44 +48 @@
 
     private variable _tool ""    ;# tool containing this viewer
+    private variable _dlist ""   ;# list of dataobj objects
+    private variable _dobj2raise ;# maps dataobj => raise flag
     private variable _actors ""  ;# list of actors in renderer
     private variable _label2atom ;# maps 2D text actor => underlying atom
@@ -201 +207 @@
 
     image delete $_download
+}
+
+# ----------------------------------------------------------------------
+# USAGE: add <dataobj> ?<settings>?
+#
+# Clients use this to add a data object to the plot.  The optional
+# <settings> are used to configure the plot.  Allowed settings are
+# -color, -brightness, -width, -linestyle, and -raise. Only
+# -brightness and -raise do anything.
+# ----------------------------------------------------------------------
+itcl::body Rappture::MoleculeViewer::add {dataobj {settings ""}} {
+    array set params {
+        -color auto
+        -brightness 0
+        -width 1
+        -raise 0
+        -linestyle solid
+        -description ""
+    }
+    foreach {opt val} $settings {
+        if {![info exists params($opt)]} {
+            error "bad settings \"$opt\": should be [join [lsort [array names params]] {, }]"
+        }
+        set params($opt) $val
+    }
+ 
+    set pos [lsearch -exact $dataobj $_dlist]
+
+    if {$pos < 0} {
+        if {![Rappture::library isvalid $dataobj]} {
+            error "bad value \"$dataobj\": should be Rappture::library object"
+        }
+    
+        set emblem [$dataobj get components.molecule.about.emblems]
+        if {$emblem == "" || ![string is boolean $emblem] || !$emblem} {
+            emblems off
+        } else {
+            emblems on
+        }
+
+        lappend _dlist $dataobj
+        set _dobj2raise($dataobj) $params(-raise)
+
+        $_dispatcher event -idle !redraw
+    }
+}
+
+# ----------------------------------------------------------------------
+# USAGE: get
+#
+# Clients use this to query the list of objects being plotted, in
+# order from bottom to top of this result.
+# ----------------------------------------------------------------------
+itcl::body Rappture::MoleculeViewer::get {} {
+    # put the dataobj list in order according to -raise options
+    set dlist $_dlist
+    foreach obj $dlist {
+        if {[info exists _dobj2raise($obj)] && $_dobj2raise($obj)} {
+            set i [lsearch -exact $dlist $obj]
+            if {$i >= 0} {
+                set dlist [lreplace $dlist $i $i]
+                lappend dlist $obj
+            }
+        }
+    }
+    return $dlist
+}
+
+# ----------------------------------------------------------------------
+# USAGE: delete ?<dataobj> <dataobj> ...?
+#
+# Clients use this to delete a dataobj from the plot. If no dataobjs
+# are specified, then all dataobjs are deleted.
+# ----------------------------------------------------------------------
+itcl::body Rappture::MoleculeViewer::delete {args} {
+    if {[llength $args] == 0} {
+        set args $_dlist
+    }
+
+    # delete all specified dataobjs
+    set changed 0
+    foreach dataobj $args {
+        set pos [lsearch -exact $_dlist $dataobj]
+        if {$pos >= 0} {
+            set _dlist [lreplace $_dlist $pos $pos]
+            catch {unset _dobj2raise($dataobj)}
+            set changed 1
+        }
+    }
+
+    # if anything changed, then rebuild the plot
+    if {$changed} {
+        $_dispatcher event -idle !redraw
+    }
 }
 
@@ -278 +378 @@
     _clear
 
-    if {$itk_option(-device) != ""} {
-        set dev $itk_option(-device)
+    set dev [lindex [get] end]
+    if {"" != $dev} {
         set lib [Rappture::library standard]
 
@@ -585 +685 @@
 # ----------------------------------------------------------------------
 itcl::configbody Rappture::MoleculeViewer::device {
-    if {$itk_option(-device) != ""
+    if {"" != $itk_option(-device)
           && ![Rappture::library isvalid $itk_option(-device)]} {
         error "bad value \"$itk_option(-device)\": should be Rappture::library object"
     }
-    _clear
-
-    if {$itk_option(-device) != ""} {
+    delete
+
+    if {"" != $itk_option(-device)} {
+        add $itk_option(-device)
         set state [$itk_option(-device) get components.molecule.about.emblems]
         if {$state == "" || ![string is boolean $state] || !$state} {