Changeset 4294 for trunk/gui

Timestamp:

Mar 28, 2014 8:23:09 PM (10 years ago)

Author:

ldelgass

Message:

Some work on map and layer styles (not complete)

Location:

trunk/gui/scripts

Files:

• map.tcl (modified) (1 diff)
• mapviewer.tcl (modified) (8 diffs)

trunk/gui/scripts/map.tcl

@@ -123 +123 @@
         }
         $_tree set $child "type" $layerType
-        foreach key { label description url } {
+        foreach key { label description opacity status style url } {
             $_tree set $child $key [$layers get $layer.$key] 
         }

trunk/gui/scripts/mapviewer.tcl

@@ -101 +101 @@
     private method GetImage { args } 
     private method PanCamera {}
-    private method SetObjectStyle { dataobj layer } 
+    private method SetLayerStyle { dataobj layer }
+    private method SetMapStyle { style }
     private method SetOpacity { dataset }
     private method SetOrientation { side }
@@ -268 +269 @@
 
     BuildLayerTab
+    BuildTerrainTab
     BuildCameraTab
 
@@ -596 +598 @@
         array unset hints 
         array set hints [$dataobj hints]
-        if { ![info exists overall(type)] } {
+        if { ![info exists _mapsettings(style)] } {
+            set _mapsettings(style) $hints(style)
+        }
+        if { ![info exists _mapsettings(type)] } {
             set _mapsettings(type) $hints(type)
         } elseif { $hints(type) != $_mapsettings(type) } {
@@ -620 +625 @@
     }
     if { $_haveTerrain } {
-        if { ![$itk_component(main) exists "Terrain Settings"] } {
-            if { [catch { BuildTerrainTab } errs ]  != 0 } {
-                puts stderr "errs=$errs"
-            }
+        if { [$itk_component(main) exists "Terrain Settings"] } {
+            # TODO: Enable controls like vertical scale that only have
+            # an effect when terrain is present
         }
     }
@@ -861 +865 @@
 
             if { $_mapsettings(type) == "geocentric" } {
-                SendCmd [list map reset "geocentric"]
+                SendCmd "map reset geocentric"
             }  else {
                 set proj $_mapsettings(projection)
-                if { $_mapsettings(extents) == "" } {
+                if { $proj == "" } {
+                    SendCmd "map reset projected global-mercator"
+                } elseif { $_mapsettings(extents) == "" } {
                     SendCmd [list map reset "projected" $proj]
                 } else {
@@ -871 +877 @@
                 }
             }
-            if { $_haveTerrain } {
+            # FIXME: need to specify initial layer in one command
+            SendCmd "map layer delete base"
+            if { [info exists _mapsettings(style)] } {
+                SetMapStyle $_mapsettings(style)
+            } else {
                 FixSettings terrain-edges terrain-lighting terrain-vertscale \
                     terrain-wireframe
             }
-            # FIXME: need to specify initial layer in one command
-            SendCmd "map layer delete base"
             SendCmd "imgflush"
         }
@@ -917 +925 @@
                 SendCmd [list map layer add $type $info(url) $tag]
                 set _datasets($tag) 1
-                SetObjectStyle $dataobj $layer
+                SetLayerStyle $dataobj $layer
             }
             lappend _obj2datasets($dataobj) $tag
@@ -1573 +1581 @@
 }
 
-itcl::body Rappture::MapViewer::SetObjectStyle { dataobj layer } {
+itcl::body Rappture::MapViewer::SetMapStyle { style } {
+    array set settings {
+        -color white
+        -edgecolor black
+        -edges 0
+        -lighting 0
+        -linewidth 1.0
+        -vertscale 1.0
+        -wireframe 0
+    }
+    array set settings $style
+
+    SendCmd "map terrain edges $settings(-edges)"
+    set _settings(terrain-edges) $settings(-edges)
+    #SendCmd "map terrain color [Color2RGB $settings(-color)]"
+    #SendCmd "map terrain colormode constant"
+    SendCmd "map terrain lighting $settings(-lighting)"
+    set _settings(terrain-lighting) $settings(-lighting)
+    SendCmd "map terrain linecolor [Color2RGB $settings(-edgecolor)]"
+    #SendCmd "map terrain linewidth $settings(-linewidth)"
+    SendCmd "map terrain vertscale $settings(-vertscale)"
+    set _settings(terrain-vertscale) $settings(-vertscale)
+    SendCmd "map terrain wireframe $settings(-wireframe)"
+    set _settings(terrain-wireframe) $settings(-wireframe)
+}
+
+itcl::body Rappture::MapViewer::SetLayerStyle { dataobj layer } {
     set tag $dataobj-$layer
+    array set info [$dataobj layer $layer]
     set _visibility($tag) 1
-
-    array set info [$dataobj layer $layer]
+    if { [info exists info(status)] } {
+        if { $info(status) == "hidden" } {
+            set _visibility($tag) 0
+            SendCmd "map layer visible 0 $tag"
+        }
+    }
+
     switch -- $info(type) {
+        "raster" {
+            array set settings {
+                -min_level 0
+                -max_level 23
+                -opacity 1.0
+            }
+            if { [info exists info(style)] } {
+                array set settings $info(style)
+            }
+            if { [info exists info(opacity)] } {
+                set $_settings(-opacity) $info(opacity)
+            }
+            SendCmd "map layer opacity $_settings(-opacity) $tag"
+        }
         "elevation" {
             array set settings {
-                -edgecolor black
-                -edges 0
-                -lighting 1
-                -linewidth 1.0
-                -vertscale 1.0
-                -wireframe 0
+                -min_level 0
+                -max_level 23
             }
             if { [info exists info(style)] } {
                 array set settings $info(style)
             }
-            SendCmd "map terrain edges $settings(-edges)"
-            set _settings(terrain-edges) $settings(-edges)
-            #SendCmd "map terrain color [Color2RGB $settings(-color)]"
-            #SendCmd "map terrain colormode constant {}"
-            SendCmd "map terrain lighting $settings(-lighting)"
-            set _settings(terrain-lighting) $settings(-lighting)
-            SendCmd "map terrain linecolor [Color2RGB $settings(-edgecolor)]"
-            #SendCmd "map terrain linewidth $settings(-linewidth)"
-            SendCmd "map terrain wireframe $settings(-wireframe)"
-            set _settings(terrain-wireframe) $settings(-wireframe)
-        }
-    }
-    #SetColormap $dataobj $layer
+        }
+        "line" {
+            array set settings {
+                -color black
+                -minbias 1000
+                -opacity 1.0
+                -width 1
+            }
+            if { [info exists info(style)] } {
+                array set settings $info(style)
+            }
+            if { [info exists info(opacity)] } {
+                set $_settings(-opacity) $info(opacity)
+            }
+            SendCmd "map layer opacity $_settings(-opacity) $tag"
+        }
+        "polygon" {
+            array set settings {
+                -color black
+                -minbias 1000
+                -opacity 1.0
+            }
+            if { [info exists info(style)] } {
+                array set settings $info(style)
+            }
+            if { [info exists info(opacity)] } {
+                set $_settings(-opacity) $info(opacity)
+            }
+            SendCmd "map layer opacity $_settings(-opacity) $tag"
+        }
+    }
 }