Changeset 5110 for branches/1.3/gui/scripts/field.tcl

Timestamp:

Mar 9, 2015 3:10:38 PM (9 years ago)

Author:

ldelgass

Message:

merge r5092:r5097 from trunk (includes fix for viewer initial canvas size)

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• gui/scripts/field.tcl (modified) (5 diffs)

branches/1.3/gui/scripts/field.tcl

@@ -924 +924 @@
             }
             if { [catch { Rappture::DxToVtk $contents } vtkdata] == 0 } {
+                unset contents
                 ReadVtkDataSet $cname $vtkdata
                 if 0 {
@@ -931 +932 @@
                 }
             } else {
-                puts stderr "Can't parse dx data: $vtkdata"
+                unset contents
+                puts stderr "Can't parse dx data"
             }
             if { $_alwaysConvertDX ||
@@ -941 +943 @@
                 set _comp2dx($cname) $data
             }
+            unset data
+            unset vtkdata
             set _comp2style($cname) [$_field get $cname.style]
             if {[$_field element $cname.flow] != ""} {
@@ -1402 +1406 @@
     if {[$_xmlobj element $path] == ""} {
         # Unknown mesh designated.
+        puts stderr "ERROR: Unknown mesh \"$path\""
         return 0
     }
@@ -1604 +1609 @@
         $v set [$_field get $cname.values]
         if { [$v length] == 0 } {
+            puts stderr "ERROR: No field values"
             return 0
         }