Changeset 172 for trunk

Timestamp:

Feb 14, 2006 12:52:18 PM (18 years ago)

Author:

mmc

Message:

Fixed the download button so that it doesn't force the
analyzer screen to be too big, and so that it disappears
gracefully when squeezed out.

Fixed the molecule viewer so that it handles the case
where one molecule is empty and another is not, and
they're being compared with the comparison dial. Was
chocking on the empty molecule with no xmin/xmax set.

Location:

trunk/gui/scripts

Files:

• analyzer.tcl (modified) (2 diffs)
• moleculeViewer.tcl (modified) (1 diff)

trunk/gui/scripts/analyzer.tcl

@@ -186 +186 @@
     pack $w.top.l -side left
 
-    if {[Rappture::filexfer::enabled]} {
-        itk_component add download {
-            button $w.top.dl -text "Download..." \
-                -command [itcl::code $this download]
-        }
-        pack $itk_component(download) -side right -padx {4 0}
-        Rappture::Tooltip::for $itk_component(download) "Downloads the current result to a new web browser window on your desktop.  From there, you can easily print or save results.
-
-NOTE:  Your web browser must allow pop-ups from this site.  If your output does not appear, look for a 'pop-up blocked' message and enable pop-ups."
-    }
-
     itk_component add resultselector {
-        Rappture::Combobox $w.top.sel -width 50 -editable no
+        Rappture::Combobox $w.top.sel -width 10 -editable no
     } {
         usual
@@ -205 +194 @@
     pack $itk_component(resultselector) -side left -expand yes -fill x
     bind $itk_component(resultselector) <<Value>> [itcl::code $this _fixResult]
+
+    if {[Rappture::filexfer::enabled]} {
+        itk_component add download {
+            button $w.top.dl -text "Download..." -anchor w \
+                -command [itcl::code $this download]
+        }
+        pack $itk_component(download) -side right -padx {4 0}
+        Rappture::Tooltip::for $itk_component(download) "Downloads the current result to a new web browser window on your desktop.  From there, you can easily print or save results.
+
+NOTE:  Your web browser must allow pop-ups from this site.  If your output does not appear, look for a 'pop-up blocked' message and enable pop-ups."
+    }
 
     itk_component add results {

trunk/gui/scripts/moleculeViewer.tcl

@@ -448 +448 @@
     set zp [expr {cos($theta*$deg2rad)}]
 
-    set xm [expr {0.5*($_limits(xmax)+$_limits(xmin))}]
-    set ym [expr {0.5*($_limits(ymax)+$_limits(ymin))}]
-    set zm [expr {0.5*($_limits(zmax)+$_limits(zmin))}]
+    set blank 0
+    foreach lim {xmin xmax ymin ymax zmin zmax} {
+        if {"" == $_limits($lim)} {
+            set blank 1
+            break
+        }
+    }
+    if {$blank} {
+        set xm 0
+        set ym 0
+        set zm 0
+    } else {
+        set xm [expr {0.5*($_limits(xmax)+$_limits(xmin))}]
+        set ym [expr {0.5*($_limits(ymax)+$_limits(ymin))}]
+        set zm [expr {0.5*($_limits(zmax)+$_limits(zmin))}]
+    }
 
     set cam [$this-ren GetActiveCamera]