Changeset 5885

Timestamp:

Sep 24, 2015, 9:51:00 AM (9 years ago)

Author:

gah

Message:

fixes from martin for uq results

Location:

branches/1.4/gui/scripts

Files:

• analyzer.tcl (modified) (3 diffs)
• resultviewer.tcl (modified) (1 diff)

branches/1.4/gui/scripts/analyzer.tcl

@@ -95 +95 @@
     private variable _lastPlot
     private common job                 ;# array var used for blt::bgexec jobs
+    private variable _uq_active 0      ;# a UQ variables has been used
     private variable _wait_uq 0
 }
@@ -404 +405 @@
     # pop up UQ window
     if {[$uq num_runs] > 1} {
+        set _uq_active 1
         set status [$uq run_dialog $itk_component(simulate)]
         if {$status == 0} {
@@ -1075 +1077 @@
         configure -simcontrolcolor $simcbg
 
-        #$itk_component(simulate) configure -state disabled
+        if {$_uq_active == 0} {
+            $itk_component(simulate) configure -state disabled
+        }
         $itk_component(abort) configure -state normal
 

branches/1.4/gui/scripts/resultviewer.tcl

@@ -417 +417 @@
     }
 
-    if {$mode != $_mode && $_mode != ""} {
-        set nactive [llength [$_mode2widget($_mode) get]]
-        if {$nactive > 0} {
-            return  ;# mixing data that doesn't mix -- ignore it!
-        }
-    }
     # Are we plotting in a new mode? then change widgets
     if {$_mode2widget($mode) != [pack slaves $itk_interior]} {