Changeset 6566 for branches

Timestamp:

Oct 26, 2016, 11:53:50 AM (8 years ago)

Author:

ldelgass

Message:

merge trunk to blt4_trunk

Location:

branches/blt4_trunk

Files:

• . (modified) (1 prop)
• gui/scripts/main.tcl (modified) (2 diffs)
• gui/scripts/map.tcl (modified) (2 diffs)
• gui/scripts/mapviewer.tcl (modified) (5 diffs)

branches/blt4_trunk/gui/scripts/main.tcl

@@ -335 +335 @@
 $f.analyze buildMenu $m $url $app
 
-
 # ----------------------------------------------------------------------
 # Finalize the arrangement
@@ -405 +404 @@
 
 # let components (loaders) settle after the newly loaded runs
-update
+#
+# This update was put in to allow the loader to wait for all the
+# widgets to get created before updating them with whatever is the
+# default for the loader.
+#
+# This update is a source of problems for tools that are 1) loading
+# previously saved/shared simulation results and 2) talk to a visualization
+# server.
+#
+# So we're commenting out the "update".  It may need to go back
+# if this breaks loaders with a default setting.
+#update
 
 foreach path [array names ::Rappture::parameters] {

branches/blt4_trunk/gui/scripts/map.tcl

@@ -463 +463 @@
                 $_tree set $child "wms.$key" $value
             }
+            # These are optional
+            foreach key { times frameSeconds } {
+                set value [$layers get $layer.wms.$key]
+                if { $value != "" } {
+                    if {$key == "times"} {
+                        # Normalize whitespace
+                        regsub -all "\[ \t\r\n\]+" [string trim $value] " " value
+                    }
+                    $_tree set $child "wms.$key" $value
+                }
+            }
             $_tree set $child "driver" "wms"
         }
@@ -845 +856 @@
         "wms" {
             array set params $driverParamArray
-            foreach key { url layers format transparent } {
+            foreach key { url layers format transparent times frameSeconds } {
                 if {[info exists params($key)]} {
                     set value $params($key)
+                    if {$key == "times"} {
+                        # Normalize whitespace
+                        regsub -all "\[ \t\r\n\]+" [string trim $value] " " value
+                    }
                     $_tree set $child "wms.$key" $value
                 }

branches/blt4_trunk/gui/scripts/mapviewer.tcl

@@ -2779 +2779 @@
                 }
                 "wms" {
-                    SendCmd [list map layer add $tag image wms \
-                                 $info(wms.url) $info(cache) $coverage \
-                                 $info(wms.layers) \
-                                 $info(wms.format) \
-                                 $info(wms.transparent)]
+                    if {[info exists info(wms.times)]} {
+                        SendCmd [list map layer add $tag image wms \
+                                     $info(wms.url) $info(cache) $coverage \
+                                     $info(wms.layers) \
+                                     $info(wms.format) \
+                                     $info(wms.transparent) \
+                                     $info(wms.times) \
+                                     $info(wms.frameSeconds)]
+                    } else {
+                        SendCmd [list map layer add $tag image wms \
+                                     $info(wms.url) $info(cache) $coverage \
+                                     $info(wms.layers) \
+                                     $info(wms.format) \
+                                     $info(wms.transparent)]
+                    }
                 }
                 "xyz" {
@@ -3187 +3197 @@
                 -minbias 1000
                 -opacity 1.0
-                -removedupes 1
                 -xoffset 0
                 -yoffset 0
@@ -3210 +3219 @@
                     SendFiles $info(ogr.url)
                     if {[info exists style(-minrange)] && [info exists style(-maxrange)]} {
-                        SendCmd [list map layer add $tag text ogr {} {} $info(ogr.url) $info(cache) $contentExpr $priorityExpr $fgR $fgG $fgB $bgR $bgG $bgB $style(-halowidth) $style(-fontsize) $style(-removedupes) $style(-declutter) $style(-align) $style(-xoffset) $style(-yoffset) $style(-minrange) $style(-maxrange)]
+                        SendCmd [list map layer add $tag text ogr {} {} $info(ogr.url) $info(cache) $contentExpr $priorityExpr $fgR $fgG $fgB $bgR $bgG $bgB $style(-halowidth) $style(-fontsize) $style(-declutter) $style(-align) $style(-xoffset) $style(-yoffset) $style(-minrange) $style(-maxrange)]
                     } else {
-                        SendCmd [list map layer add $tag text ogr {} {} $info(ogr.url) $info(cache) $contentExpr $priorityExpr $fgR $fgG $fgB $bgR $bgG $bgB $style(-halowidth) $style(-fontsize) $style(-removedupes) $style(-declutter) $style(-align) $style(-xoffset) $style(-yoffset)]
+                        SendCmd [list map layer add $tag text ogr {} {} $info(ogr.url) $info(cache) $contentExpr $priorityExpr $fgR $fgG $fgB $bgR $bgG $bgB $style(-halowidth) $style(-fontsize) $style(-declutter) $style(-align) $style(-xoffset) $style(-yoffset)]
                     }
                 }
@@ -3221 +3230 @@
                     }
                     if {[info exists style(-minrange)] && [info exists style(-maxrange)]} {
-                        SendCmd [list map layer add $tag text tfs $format {} $info(tfs.url) $info(cache) $contentExpr $priorityExpr $fgR $fgG $fgB $bgR $bgG $bgB $style(-halowidth) $style(-fontsize) $style(-removedupes) $style(-declutter) $style(-align) $style(-xoffset) $style(-yoffset) $style(-minrange) $style(-maxrange)]
+                        SendCmd [list map layer add $tag text tfs $format {} $info(tfs.url) $info(cache) $contentExpr $priorityExpr $fgR $fgG $fgB $bgR $bgG $bgB $style(-halowidth) $style(-fontsize) $style(-declutter) $style(-align) $style(-xoffset) $style(-yoffset) $style(-minrange) $style(-maxrange)]
                     } else {
-                        SendCmd [list map layer add $tag text tfs $format {} $info(tfs.url) $info(cache) $contentExpr $priorityExpr $fgR $fgG $fgB $bgR $bgG $bgB $style(-halowidth) $style(-fontsize) $style(-removedupes) $style(-declutter) $style(-align) $style(-xoffset) $style(-yoffset)]
+                        SendCmd [list map layer add $tag text tfs $format {} $info(tfs.url) $info(cache) $contentExpr $priorityExpr $fgR $fgG $fgB $bgR $bgG $bgB $style(-halowidth) $style(-fontsize) $style(-declutter) $style(-align) $style(-xoffset) $style(-yoffset)]
                     }
                 }
@@ -3232 +3241 @@
                     }
                     if {[info exists style(-minrange)] && [info exists style(-maxrange)]} {
-                        SendCmd [list map layer add $tag text wfs $format $info(wfs.typename) $info(wfs.url) $contentExpr $priorityExpr $fgR $fgG $fgB $bgR $bgG $bgB $style(-halowidth) $style(-fontsize) $style(-removedupes) $style(-declutter) $style(-align) $style(-xoffset) $style(-yoffset) $style(-minrange) $style(-maxrange)]
+                        SendCmd [list map layer add $tag text wfs $format $info(wfs.typename) $info(wfs.url) $contentExpr $priorityExpr $fgR $fgG $fgB $bgR $bgG $bgB $style(-halowidth) $style(-fontsize) $style(-declutter) $style(-align) $style(-xoffset) $style(-yoffset) $style(-minrange) $style(-maxrange)]
                     } else {
-                        SendCmd [list map layer add $tag text wfs $format $info(wfs.typename) $info(wfs.url) $contentExpr $priorityExpr $fgR $fgG $fgB $bgR $bgG $bgB $style(-halowidth) $style(-fontsize) $style(-removedupes) $style(-declutter) $style(-align) $style(-xoffset) $style(-yoffset)]
+                        SendCmd [list map layer add $tag text wfs $format $info(wfs.typename) $info(wfs.url) $contentExpr $priorityExpr $fgR $fgG $fgB $bgR $bgG $bgB $style(-halowidth) $style(-fontsize) $style(-declutter) $style(-align) $style(-xoffset) $style(-yoffset)]
                     }
                 }