Changeset 5315

Timestamp:

Apr 25, 2015 11:24:13 AM (9 years ago)

Author:

mmh

Message:

fix ScreenSize? bug and support multiple UQ runs with different UQ params

Location:

branches/uq

Files:

• gui/scripts/analyzer.tcl (modified) (3 diffs)
• gui/scripts/balloon.tcl (modified) (1 diff)
• gui/scripts/dropdown.tcl (modified) (1 diff)
• gui/scripts/editor.tcl (modified) (1 diff)
• gui/scripts/main.tcl (modified) (1 diff)
• gui/scripts/mainwin.tcl (modified) (2 diffs)
• gui/scripts/pager.tcl (modified) (1 diff)
• gui/scripts/tooltip.tcl (modified) (1 diff)
• lang/tcl/scripts/library.tcl (modified) (2 diffs)
• lang/tcl/src/RpScreenSize.c (modified) (3 diffs)

branches/uq/gui/scripts/analyzer.tcl

@@ -399 +399 @@
 itcl::body Rappture::Analyzer::simulate {args} {
     puts "simulate args='$args'"
-    if {$args == "-ifneeded"} {
+
+    set uq [$_tool get_uq -uq_type smolyak -uq_args 2]
+
+    # pop up UQ window
+    if {[$uq num_runs] > 1} {
+        set status [$uq run_dialog $itk_component(simulate)]
+        if {$status == 0} {
+            # cancelled
+            return
+        }
+        lappend args -uq_type [$uq type]
+        lappend args -uq_args [$uq args]
+        # Need to put these UQ values into the driver file
+        # so the call to resultset::contains will be correct.
+        set _xml [$_tool xml object]
+        $_xml put uq.type.current [$uq type]
+        $_xml put uq.args.current [$uq args]
+        $_xml put uq.args.about.label "level"
+        $_xml put uq.args.about.description "Polynomial Degree of Smolyak GPC method."
+    }
+    puts "simulate args=$args"
+
+    if {[lindex $args 0] == "-ifneeded"} {
         # check to see if simulation is really needed
         $_tool sync
@@ -408 +430 @@
             return
         }
-        set args ""
+        set args [lreplace $args 0 0]
     }
     puts "simulation needed"
-
-    set uq [$_tool get_uq -uq_type smolyak -uq_args 2]
-    # pop up UQ window
-    if {[$uq num_runs] > 1} {
-        set status [$uq run_dialog $itk_component(simulate)]
-        if {$status == 0} {
-            # cancelled
-            return
-        }
-        lappend args -uq_type [$uq type]
-        lappend args -uq_args [$uq args]
-    }
-
-    puts "simulate args=$args"
 
     # simulation is needed -- go to simulation page
@@ -1056 +1064 @@
         configure -simcontrolcolor $simcbg
 
-        $itk_component(simulate) configure -state disabled
+        #$itk_component(simulate) configure -state disabled
         $itk_component(abort) configure -state normal
 

branches/uq/gui/scripts/balloon.tcl

@@ -142 +142 @@
     # set screenw [winfo screenwidth $p]
     # set screenh [winfo screenheight $p]
-    foreach {screenw screenh} [Rappture::ScreenSize [winfo screen $p]] break
+    foreach {screenw screenh} [Rappture::ScreenSize] break
 
     if {[winfo exists $where]} {

branches/uq/gui/scripts/dropdown.tcl

@@ -86 +86 @@
     # set sw [winfo screenwidth $itk_component(hull)]
     # set sh [winfo screenheight $itk_component(hull)]
-    foreach {sw sh} [Rappture::ScreenSize [winfo screen $itk_component(hull)]] break
+    foreach {sw sh} [Rappture::ScreenSize] break
 
     if {[regexp {^@([0-9]+),([0-9]+)$} $where match x y]} {

branches/uq/gui/scripts/editor.tcl

@@ -276 +276 @@
     set fnt [$e cget -font]
 
-    foreach {screenw screenh} [Rappture::ScreenSize [winfo screen $e]] break
+    foreach {screenw screenh} [Rappture::ScreenSize] break
     set w [expr {[font measure $fnt $str]+20}]
     set w [expr {($w < $_loc(w)) ? $_loc(w) : $w}]

branches/uq/gui/scripts/main.tcl

@@ -356 +356 @@
 
     # set screenw [winfo screenwidth .]
-    foreach {screenw screenh} [Rappture::ScreenSize [winfo screen .]] break
+    foreach {screenw screenh} [Rappture::ScreenSize] break
 
     update idletasks

branches/uq/gui/scripts/mainwin.tcl

@@ -260 +260 @@
 itcl::body Rappture::MainWin::draw {option args} {
     set w $itk_component(hull)
-    foreach {screenw screenh} [Rappture::ScreenSize [winfo screen $w]] break
+    foreach {screenw screenh} [Rappture::ScreenSize] break
     regsub -all {<w>} $args $screenw args
     regsub -all {<h>} $args $screenh args
@@ -365 +365 @@
             component hull configure -menu ""
             pack forget $itk_component(app)
-            foreach {wx wy} [Rappture::ScreenSize [winfo screen $itk_component(hull)]] break
+            foreach {wx wy} [Rappture::ScreenSize] break
             wm geometry $itk_component(hull) ${wx}x${wy}+0+0
             _redraw

branches/uq/gui/scripts/pager.tcl

@@ -412 +412 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::Pager::_fixSize {} {
-    foreach {screenw screenh} [Rappture::ScreenSize [winfo screen $itk_component(hull)]] break
+    foreach {screenw screenh} [Rappture::ScreenSize] break
     set sw [expr {$screenw-200}]
     set sh [expr {$screenh-200}]

branches/uq/gui/scripts/tooltip.tcl

@@ -160 +160 @@
     #
     update idletasks
-    foreach {screenw screenh} [Rappture::ScreenSize [winfo screen $hull]] break
+    foreach {screenw screenh} [Rappture::ScreenSize] break
     if {$signx == "+"} {
         if {$xpos+[winfo reqwidth $hull] > $screenw} {

branches/uq/lang/tcl/scripts/library.tcl

@@ -696 +696 @@
     set otherv [Rappture::entities $libobj input]
 
+    # add UQ checking
+    lappend thisv uq.type uq.args
+    lappend otherv uq.type uq.args
+
     # scan through values for this object, and compare against other one
     foreach path $thisv {
@@ -717 +721 @@
         lappend rlist + $path "" $oraw
     }
+
     return $rlist
 }

branches/uq/lang/tcl/src/RpScreenSize.c

@@ -45 +45 @@
  *  RpScreenSizeCmd()
  *
- *  Gets the screen width and height.
+ *  Gets the screen width and height of the default DISPLAY
  *
  *  Returns TCL_OK on success, and TCL_ERROR (along with an error
@@ -59 +59 @@
 {
     Tcl_Obj *resultPtr;
-    char *display_name = "";
     int w, h, screen;
-
-    // parse through command line options
-    if (argc != 2) {
-        Tcl_AppendResult(interp,
-                "wrong # args: should be \"", argv[0],
-                " screen\"", (char*)NULL);
-        return TCL_ERROR;
-    }
-
-    display_name = (char *)argv[1];
 
     resultPtr = Tcl_GetObjResult(interp);
 
-    Display *dpy = XOpenDisplay(display_name);
+    Display *dpy = XOpenDisplay(NULL);
     if (dpy == NULL) {
         Tcl_AppendResult(interp,
-                "Could not find display for screen ",
-                display_name, (char*)NULL);
+                "Could not open the display.", (char*)NULL);
         return TCL_ERROR;
     }
@@ -89 +77 @@
     Tcl_ListObjAppendElement(interp, resultPtr, Tcl_NewIntObj(h));
 
+    XCloseDisplay(dpy);
     return TCL_OK;
 }