Changeset 4977

Timestamp:

Feb 2, 2015 2:05:20 AM (9 years ago)

Author:

ldelgass

Message:

Layer opacity sliders, disable some controls based on map/layer types.

File:

• trunk/gui/scripts/mapviewer.tcl (modified) (15 diffs)

trunk/gui/scripts/mapviewer.tcl

@@ -81 +81 @@
     private method BuildMapTab {}
     private method BuildTerrainTab {}
-    private method ChangeLayerVisibility { dataobj layer }
     private method Connect {}
     private method CurrentLayers {args}
@@ -105 +104 @@
     private method Rotate {option x y}
     private method Select {option x y}
+    private method SetLayerOpacity { dataobj layer {value 100}}
     private method SetLayerStyle { dataobj layer }
+    private method SetLayerVisibility { dataobj layer }
     private method SetTerrainStyle { style }
-    private method SetOpacity { dataset }
     private method UpdateLayerControls {}
     private method Zoom {option {x 0} {y 0}}
@@ -122 +122 @@
     private variable _motion;
     private variable _settings
+    private variable _opacity
     private variable _visibility
     private variable _style;            # Array of current component styles.
@@ -1057 +1058 @@
                 if { $_mapsettings(type) == "geocentric" } {
                     $itk_component(grid) configure -state normal
+                    $itk_component(time_l) configure -state normal
+                    $itk_component(time) configure -state normal
                     SendCmd "map reset geocentric"
                 }  else {
                     $itk_component(grid) configure -state disabled
+                    $itk_component(time_l) configure -state disabled
+                    $itk_component(time) configure -state disabled
                     set proj $_mapsettings(projection)
                     if { $proj == "" } { 
@@ -1096 +1101 @@
     set count 0
 
+    set haveTerrain 0
     foreach dataobj [get -objects] {
         set _obj2datasets($dataobj) ""
@@ -1116 +1122 @@
                 SetLayerStyle $dataobj $layer
             }
+            if {$info(type) == "elevation"} {
+                set haveTerrain 1
+            }
             lappend _obj2datasets($dataobj) $layer
             # FIXME: This is overriding all layers' initial visibility setting
@@ -1121 +1130 @@
                 SendCmd "map layer visible 1 $layer"
                 set _visibility($layer) 1
-                #SetLayerOpacity $layer
-            }
-        }
+                #SetLayerOpacity $dataobj $layer
+            }
+        }
+    }
+
+    if ($haveTerrain) {
+        $itk_component(vscale_l) configure -state normal
+        $itk_component(vscale) configure -state normal
+    } else {
+        $itk_component(vscale_l) configure -state disabled
+        $itk_component(vscale) configure -state disabled
     }
 
@@ -1641 +1658 @@
     $inner configure -borderwidth 4
 
-    label $inner.palette_l -text "Palette" -font "Arial 9" -anchor w 
+    label $inner.palette_l -text "Palette" -font "Arial 9" -anchor w
     itk_component add terrainpalette {
         Rappture::Combobox $inner.palette -width 10 -editable no
@@ -1651 +1668 @@
         [itcl::code $this AdjustSetting terrain-palette]
 
-    label $inner.vscale_l -text "Vertical Scale" -font "Arial 9" -anchor w 
-    ::scale $inner.vscale -from 0 -to 10 -orient horizontal \
-        -variable [itcl::scope _settings(terrain-vertscale)] \
-        -width 10 \
-        -resolution 0.1 \
-        -showvalue on \
-        -command [itcl::code $this AdjustSetting terrain-vertscale]
+    itk_component add vscale_l {
+        label $inner.vscale_l -text "Vertical Scale" -font "Arial 9" -anchor w
+    }
+    itk_component add vscale {
+        ::scale $inner.vscale -from 0 -to 10 -orient horizontal \
+            -variable [itcl::scope _settings(terrain-vertscale)] \
+            -width 10 \
+            -resolution 0.1 \
+            -showvalue on \
+            -command [itcl::code $this AdjustSetting terrain-vertscale]
+    }
     $inner.vscale set $_settings(terrain-vertscale)
 
     blt::table $inner \
         0,0 $inner.vscale_l  -anchor w -pady 2 \
-        0,1 $inner.vscale    -fill x   -pady 2 \
-        1,0 $inner.palette_l -anchor w -pady 2 \
-        1,1 $inner.palette   -fill x   -pady 2  
+        0,1 $inner.vscale    -fill x   -pady 2
+#        1,0 $inner.palette_l -anchor w -pady 2 \
+#        1,1 $inner.palette   -fill x   -pady 2  
 
     blt::table configure $inner r* c* -resize none
@@ -1921 +1942 @@
             if { [info exists info(opacity)] } {
                 set settings(-opacity) $info(opacity)
-            }
+                set _opacity($layer) $info(opacity)
+            }
+            set _opacity($layer) [expr $settings(-opacity) * 100]
             if {!$_sendEarthFile} {
                 switch -- $info(driver)  {
@@ -1986 +2009 @@
                 set settings(-opacity) $info(opacity)
             }
+            set _opacity($layer) [expr $settings(-opacity) * 100]
             SendCmd [list map layer add line $info(ogr.url) $layer]
             SendCmd "map layer opacity $settings(-opacity) $layer"
@@ -2001 +2025 @@
                 set settings(-opacity) $info(opacity)
             }
+            set _opacity($layer) [expr $settings(-opacity) * 100]
             SendCmd [list map layer add polygon $info(ogr.url) $layer]
             SendCmd "map layer opacity $settings(-opacity) $layer"
@@ -2024 +2049 @@
                 set settings(-opacity) $info(opacity)
             }
+            set _opacity($layer) [expr $settings(-opacity) * 100]
             set contentExpr $info(content)
             if {[info exists info(priority)]} {
@@ -2043 +2069 @@
 }
 
-itcl::body Rappture::MapViewer::SetOpacity { dataset } { 
-    foreach {dataobj layer} [split $dataset -] break
-    set type [$dataobj type $layer]
-    set val $_settings(-opacity)
+itcl::body Rappture::MapViewer::SetLayerOpacity { dataobj layer {value 100}} {
+    set val $_opacity($layer)
     set sval [expr { 0.01 * double($val) }]
-    if { !$_obj2ovride($dataobj-raise) } {
-        # This is wrong.  Need to figure out why raise isn't set with 1
-        #set sval [expr $sval * .6]
-    }
-    SendCmd "$type opacity $sval $dataset"
-}
-
-itcl::body Rappture::MapViewer::ChangeLayerVisibility { dataobj layer } { 
+    SendCmd "map layer opacity $sval $layer"
+}
+
+itcl::body Rappture::MapViewer::SetLayerVisibility { dataobj layer } {
     set bool $_visibility($layer)
     SendCmd "map layer visible $bool $layer"
@@ -2073 +2093 @@
             array unset info
             array set info [$dataobj layer $layer]
-            checkbutton $f.$layer \
+            checkbutton $f.${layer}-visible \
                 -text $info(label) \
+                -font "Arial 9" -anchor w \
                 -variable [itcl::scope _visibility($layer)] \
                 -command [itcl::code $this \
-                              ChangeLayerVisibility $dataobj $layer] \
-                    -font "Arial 9" -anchor w 
-            blt::table $f $row,0 $f.$layer -anchor w -pady 2 
-            Rappture::Tooltip::for $f.$layer $info(description)
+                              SetLayerVisibility $dataobj $layer]
+            blt::table $f $row,0 $f.${layer}-visible -anchor w -pady 2 -cspan 2
+            Rappture::Tooltip::for $f.${layer}-visible $info(description)
             incr row
+            if { $info(type) != "elevation" } {
+                label $f.${layer}-opacity_l -text "Opacity" -font "Arial 9"
+                ::scale $f.${layer}-opacity -from 0 -to 100 \
+                    -orient horizontal -showvalue off \
+                    -variable [itcl::scope _opacity($layer)] \
+                    -command [itcl::code $this \
+                                  SetLayerOpacity $dataobj $layer]
+                blt::table $f $row,0 $f.${layer}-opacity_l -anchor w -pady 2
+                blt::table $f $row,1 $f.${layer}-opacity -anchor w -pady 2
+                incr row
+            }
         }
     }