Changeset 6497 for branches/blt4_trunk/gui/scripts/mapviewer.tcl

Timestamp:

Aug 25, 2016 1:53:07 PM (8 years ago)

Author:

dkearney

Message:

merging r6420 - r6496 from trunk to blt4-trunk branch

Location:

branches/blt4_trunk

Files:

• . (modified) (1 prop)
• gui/scripts/mapviewer.tcl (modified) (21 diffs)

branches/blt4_trunk/gui/scripts/mapviewer.tcl

@@ -879 +879 @@
                         set colormap $dataobj-$layer
                         set colormap "[regsub -all {::} ${colormap} {}]"
+                        set colormap "[regsub -all {\-} ${colormap} {_}]"
                     }
                     return $_image(legend-$colormap)
@@ -1370 +1371 @@
 
         if { [info exists _mapsettings(type)] } {
-            # The map must be reset once before any layers are added This
-            # should not be done more than once as it is very expensive.
+            # The map must be reset once before any layers are added.
+            # This should not be done more than once as it is very expensive.
             if { [info exists _mapsettings(style)] } {
                 array set settings {
@@ -1854 +1855 @@
         }
         "drag" {
-            if {$_b1mode == "select"} {
-                EventuallySelect $x $y
-            }
+            if {$_b1mode != "select"} {
+                return
+            }
+            if { ![info exists _click(x)] } {
+                set _click(x) $x
+            }
+            if { ![info exists _click(y)] } {
+                set _click(y) $y
+            }
+            EventuallySelect $x $y
         }
         "release" {
             set _b1mode ""
-            if {$_click(x) == $x &&
-                $_click(y) == $y} {
+            if {![info exists _click(x)] ||
+                ![info exists _click(y)] ||
+                ($_click(x) == $x &&
+                 $_click(y) == $y)} {
                 SendCmd "map box clear"
             } else {
@@ -2109 +2119 @@
             -command [itcl::code $this AdjustSetting time]
     }
+    Rappture::Tooltip::for $inner.time \
+        "Set ephemeris time for sky lighting"
 
     itk_component add ambient_l {
@@ -2123 +2135 @@
             -command [itcl::code $this AdjustSetting terrain-ambient]
     }
+    Rappture::Tooltip::for $inner.ambient \
+        "Set minimum global ambient light level"
 
     blt::table $inner \
@@ -2170 +2184 @@
     }
     $inner.vscale set $_settings(terrain-vertscale)
+    Rappture::Tooltip::for $inner.vscale \
+        "Set terrain vertical scale factor"
 
     blt::table $inner \
@@ -2493 +2509 @@
                     array set cam $view
                     set duration 0.0
-                    if {[info exists cam(xmin)] && [info exists cam(ymin)] &&
-                        [info exists cam(xmax)] && [info exists cam(ymax)]} {
+                    if {[info exists cam(layer)]} {
+                        set tag $cam(layer)
+                        if {$_first != "" &&
+                            ![$_first layer $cam(layer) shared]} {
+                            set tag $_first-$cam(layer)
+                        }
+                        SendCmd [list camera lextent $tag]
+                    } elseif {[info exists cam(xmin)] &&
+                              [info exists cam(ymin)] &&
+                              [info exists cam(xmax)] &&
+                              [info exists cam(ymax)]} {
                         set srs ""
                         if {[info exists cam(srs)]} {
@@ -2500 +2525 @@
                         }
                         SendCmd [list camera extent $cam(xmin) $cam(ymin) $cam(xmax) $cam(ymax) $duration $srs]
+                    } elseif {[info exists cam(latitude)] &&
+                              [info exists cam(longitude)]} {
+                        array set _view $view
+                        set _view(x) $cam(longitude)
+                        set _view(y) $cam(latitude)
+                        set _view(srs) wgs84
+                        SendCmd [list camera set $_view(x) $_view(y) $_view(z) $_view(heading) $_view(pitch) $_view(distance) $duration $_view(srs) $_view(verticalDatum)]
                     } else {
                         array set _view $view
@@ -2727 +2759 @@
                 "colorramp" {
                     set cmapName "[regsub -all {::} ${tag} {}]"
+                    set cmapName "[regsub -all {\-} ${cmapName} {_}]"
                     SendFiles $info(colorramp.url)
                     SendCmd [list colormap define $cmapName $info(colorramp.colormap)]
@@ -2767 +2800 @@
                 array set style $info(style)
             }
-            switch -- $info(driver)  {
+            set verticalDatum ""
+            if {[info exists info(verticalDatum)]} {
+                set verticalDatum $info(verticalDatum)
+            }
+            switch -- $info(driver) {
                 "gdal" {
                     SendFiles $info(gdal.url)
                     SendCmd [list map layer add $tag elevation gdal \
-                                 $info(gdal.url) $info(cache)]
+                                 $info(gdal.url) $info(cache) $verticalDatum]
                 }
                 "tms" {
                     SendCmd [list map layer add $tag elevation tms \
-                                 $info(tms.url) $info(cache)]
+                                 $info(tms.url) $info(cache) $verticalDatum]
                 }
                 "wcs" {
                     SendCmd [list map layer add $tag elevation wcs \
-                                 $info(wcs.url) $info(cache) $info(wcs.identifier)]
+                                 $info(wcs.url) $info(cache) $verticalDatum $info(wcs.identifier)]
                 }
             }
@@ -2865 +2902 @@
             SendCmd "map layer opacity $style(-opacity) $tag"
         }
+        "model" {
+            switch -- $info(driver) {
+                "osg" {
+                    SendFiles $info(osg.url)
+                    SendCmd [list map layer add $tag model simple $info(osg.url) $info(osg.x) $info(osg.y) $info(osg.z)]
+                }
+            }
+        }
         "line" {
             array set style {
@@ -2886 +2931 @@
             set _opacity($tag) [expr $style(-opacity) * 100]
             foreach {r g b} [Color2RGB $style(-color)] {}
-            switch -- $info(driver)  {
+            switch -- $info(driver) {
                 "ogr" {
                     SendFiles $info(ogr.url)
@@ -2935 +2980 @@
             set _opacity($tag) [expr $style(-opacity) * 100]
             foreach {r g b} [Color2RGB $style(-color)] {}
-            switch -- $info(driver)  {
+            switch -- $info(driver) {
                 "ogr" {
                     SendFiles $info(ogr.url)
@@ -2987 +3032 @@
             }
             set _opacity($tag) [expr $style(-opacity) * 100]
-            switch -- $info(driver)  {
+            switch -- $info(driver) {
                 "ogr" {
                     SendFiles $info(ogr.url)
@@ -3040 +3085 @@
             foreach {r g b} [Color2RGB $style(-color)] {}
             foreach {strokeR strokeG strokeB} [Color2RGB $style(-strokecolor)] {}
-            switch -- $info(driver)  {
+            switch -- $info(driver) {
                 "ogr" {
                     SendFiles $info(ogr.url)
@@ -3105 +3150 @@
             foreach {fgR fgG fgB} [Color2RGB $style(-color)] {}
             foreach {bgR bgG bgB} [Color2RGB $style(-halocolor)] {}
-            switch -- $info(driver)  {
+            switch -- $info(driver) {
                 "ogr" {
                     SendFiles $info(ogr.url)
@@ -3192 +3237 @@
                 set tag $dataobj-$layer
                 set ctlname "[regsub -all {::} ${tag} {}]"
-            }
+                set ctlname "[regsub -all {\-} ${ctlname} {_}]"
+            }
+            button $f.${ctlname}_zoom \
+                -borderwidth 1 -padx 1 -pady 1 \
+                -highlightthickness 0 \
+                -image [Rappture::icon zoom-extent] \
+                -command [itcl::code $this camera zoom layer $dataobj $layer 1.0]
+            Rappture::Tooltip::for $f.${ctlname}_zoom \
+                "Zoom to extent for $info(label)"
+
             checkbutton $f.${ctlname}_visible \
                 -text $info(label) \
@@ -3199 +3253 @@
                 -command [itcl::code $this \
                               SetLayerVisibility $dataobj $layer]
-            blt::table $f $row,0 $f.${ctlname}_visible -anchor w -pady 2 -cspan 2
+            blt::table $f $row,0 $f.${ctlname}_zoom -anchor w -pady 2
+            blt::table $f $row,1 $f.${ctlname}_visible -anchor w -pady 2 -cspan 2
             incr row
             if { $info(type) == "image" } {
@@ -3217 +3272 @@
                         label $f.legend-$colormap -image $_image(legend-$colormap)
                     }
-                    blt::table $f $row,0 $f.legend-$colormap-min -anchor w -pady 0
-                    blt::table $f $row,1 $f.legend-$colormap-max -anchor e -pady 0
+                    blt::table $f $row,0 $f.legend-$colormap-min -anchor w -pady 0 -cspan 2
+                    blt::table $f $row,2 $f.legend-$colormap-max -anchor e -pady 0
                     incr row
-                    blt::table $f $row,0 $f.legend-$colormap -anchor w -pady 2 -cspan 2
+                    blt::table $f $row,0 $f.legend-$colormap -anchor w -pady 2 -cspan 3
                     incr row
                     RequestLegend $colormap 256 16
@@ -3235 +3290 @@
                                   SetLayerOpacity $dataobj $layer]
                 Rappture::Tooltip::for $f.${ctlname}_opacity "Set opacity of $info(label) layer"
-                blt::table $f $row,0 $f.${ctlname}_opacity_l -anchor w -pady 2
-                blt::table $f $row,1 $f.${ctlname}_opacity -anchor w -pady 2
+                blt::table $f $row,0 $f.${ctlname}_opacity_l -anchor w -pady 2 -cspan 2
+                blt::table $f $row,2 $f.${ctlname}_opacity -anchor w -pady 2
                 incr row
             }
@@ -3253 +3308 @@
     SendCmd "[list map attrib [encoding convertto utf-8 [join $attrib ,]]]"
     label $f.map_attrib -text [join $attrib \n] -font "Arial 9"
-    blt::table $f $row,0 $f.map_attrib -anchor sw -pady 2 -cspan 2
+    blt::table $f $row,0 $f.map_attrib -anchor sw -pady 2 -cspan 3
     #incr row
     if { $row > 0 } {
         blt::table configure $f r* c* -resize none
-        blt::table configure $f r$row c1 -resize expand
+        blt::table configure $f r$row c2 -resize expand
     }
 }