Changeset 3879 for branches/1.3

Timestamp:

Aug 21, 2013, 11:03:04 AM (11 years ago)

Author:

ldelgass

Message:

merge from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• gui/scripts/drawing.tcl (modified) (2 diffs)
• gui/scripts/vtkisosurfaceviewer.tcl (modified) (2 diffs)

branches/1.3/gui/scripts/drawing.tcl

@@ -109 +109 @@
                 set pdbdata [$_xmlobj get $path.$elem.pdb]
                 if { $pdbdata != "" } {
-                    if 1 {
+                    if 0 {
                         global count
                         set f [open /tmp/file$count.pdb "w"]
@@ -117 +117 @@
                     }
                     set contents [Rappture::PdbToVtk $pdbdata]
-                    if 1 {
+                    if 0 {
                         set f [open /tmp/convertedpdb.vtk "w"]
                         puts $f $contents

branches/1.3/gui/scripts/vtkisosurfaceviewer.tcl

@@ -87 +87 @@
     private method BuildDownloadPopup { widget command } 
     private method BuildIsosurfaceTab {}
+    private method Combo { option }
     private method DrawLegend {}
-    private method Combo { option }
     private method EnterLegend { x y } 
     private method EventuallyResize { w h } 
@@ -1525 +1525 @@
         }
     }
-    # If there's a title too, substract one more line
+    # If there's a title too, subtract one more line
     if { $title != "" } {
         incr h -$lineht