Changeset 11 for trunk/gui/scripts/moleculeViewer.tcl

Timestamp:

May 30, 2005 9:33:49 PM (19 years ago)

Author:

mmc

Message:

Major reorganization of the entire package. The config.xml file
is now irrelevant. All the action is in the tool.xml file. The
main program now organizes all input into 1) side-by-side pages,
2) input/result (wizard-style) pages, or 3) a series of wizard-
style pages. The <input> can have <phase> parts representing
the various pages.

Added a new ContourResult? widget based on Swaroop's vtk plotting
code.

Also, added easymesh and showmesh to the "tools" directory.
We need these for Eric Polizzi's code.

File:

• trunk/gui/scripts/moleculeViewer.tcl (modified) (7 diffs)

trunk/gui/scripts/moleculeViewer.tcl

@@ -7 +7 @@
 # ======================================================================
 #  AUTHOR:  Michael McLennan, Purdue University
-#  Copyright (c) 2004  Purdue Research Foundation, West Lafayette, IN
+#  Copyright (c) 2004-2005
+#  Purdue Research Foundation, West Lafayette, IN
 # ======================================================================
 package require Itk
@@ -22 +23 @@
     itk_option define -backdrop backdrop Backdrop "black"
     itk_option define -device device Device ""
-    itk_option define -library library Library ""
-
-    constructor {args} { # defined below }
+
+    constructor {tool args} { # defined below }
     destructor { # defined below }
 
@@ -30 +30 @@
     protected method _color2rgb {color}
 
+    private variable _tool ""    ;# tool containing this viewer
     private variable _actors ""  ;# list of actors in renderer
 }
@@ -39 +40 @@
 # CONSTRUCTOR
 # ----------------------------------------------------------------------
-itcl::body Rappture::MoleculeViewer::constructor {args} {
+itcl::body Rappture::MoleculeViewer::constructor {tool args} {
+    set _tool $tool
+
     itk_option add hull.width hull.height
     pack propagate $itk_component(hull) no
@@ -93 +96 @@
     if {$itk_option(-device) != ""} {
         set dev $itk_option(-device)
+        set lib [Rappture::library standard]
+
         set counter 0
         foreach atom [$dev children -type atom components.molecule] {
@@ -105 +110 @@
             $this-ren AddActor $aname
 
-            if {$itk_option(-library) != ""} {
-                set sfac 0.7
-                set scale [$itk_option(-library) get elements.($symbol).scale]
-                if {$scale != ""} {
-                    $aname SetScale [expr {$sfac*$scale}]
-                }
-                set color [$itk_option(-library) get elements.($symbol).color]
-                if {$color != ""} {
-                    eval [$aname GetProperty] SetColor [_color2rgb $color]
-                }
+            set sfac 0.7
+            set scale [$lib get elements.($symbol).scale]
+            if {$scale != ""} {
+                $aname SetScale [expr {$sfac*$scale}]
+            }
+            set color [$lib get elements.($symbol).color]
+            if {$color != ""} {
+                eval [$aname GetProperty] SetColor [_color2rgb $color]
             }
 
@@ -157 +160 @@
 }
 
-# ----------------------------------------------------------------------
-# OPTION: -library
-# ----------------------------------------------------------------------
-itcl::configbody Rappture::MoleculeViewer::library {
-    _render
-}
-
 #package require Rappture
-#Rappture::MoleculeViewer .e -library [Rappture::library -std library.xml]
+#Rappture::MoleculeViewer .e
 #pack .e -expand yes -fill both
 #