Changeset 4265 for trunk

Timestamp:

Mar 25, 2014, 3:15:03 PM (11 years ago)

Author:

ldelgass

Message:

Add elevation map layer type

Location:

trunk/gui/scripts

Files:

• geoviewer.tcl (modified) (6 diffs)
• map.tcl (modified) (1 diff)

trunk/gui/scripts/geoviewer.tcl

@@ -580 +580 @@
             set type [$dataobj type $layer]
             switch -- $type {
-                "terrain" {
+                "elevation" {
                     set _haveTerrain 1
                 }
@@ -869 +869 @@
                     continue
                 }
-                # Is is a "image", "model", or "terrain" layer?
+                # FIXME: wms, tms layers have additional options
                 switch -- $info(type) {
                     "raster" {
@@ -875 +875 @@
                     }
                     default {
-                        set type "model"
+                        set type "$info(type)"
                     }
                 }
@@ -1308 +1308 @@
         -icon [Rappture::icon mesh]]
     $inner configure -borderwidth 4
-
-    checkbutton $inner.mesh \
-        -text "Show Mesh" \
-        -variable [itcl::scope _settings(terrain-visible)] \
-        -command [itcl::code $this AdjustSetting terrain-visible] \
-        -font "Arial 9" -anchor w 
 
     checkbutton $inner.wireframe \
@@ -1359 +1353 @@
         [itcl::code $this AdjustSetting terrain-palette]
 
-    label $inner.opacity_l -text "Opacity" -font "Arial 9" -anchor w 
-    ::scale $inner.opacity -from 0 -to 100 -orient horizontal \
-        -variable [itcl::scope _settings(terrain-opacity)] \
+    label $inner.vscale_l -text "Vertical Scale" -font "Arial 9" -anchor w 
+    ::scale $inner.vscale -from 0 -to 100 -orient horizontal \
+        -variable [itcl::scope _settings(terrain-vertscale)] \
         -width 10 \
         -showvalue off \
-        -command [itcl::code $this AdjustSetting terrain-opacity]
-    $inner.opacity set $_settings(terrain-opacity)
+        -command [itcl::code $this AdjustSetting terrain-vertscale]
+    $inner.vscale set $_settings(terrain-vertscale)
 
     blt::table $inner \
-        0,0 $inner.mesh      -cspan 2  -anchor w -pady 2 \
-        1,0 $inner.wireframe -cspan 2  -anchor w -pady 2 \
-        2,0 $inner.lighting  -cspan 2  -anchor w -pady 2 \
-        3,0 $inner.edges     -cspan 2  -anchor w -pady 2 \
-        4,0 $inner.opacity_l -anchor w -pady 2 \
-        4,1 $inner.opacity   -fill x   -pady 2 \
+        0,0 $inner.wireframe -cspan 2  -anchor w -pady 2 \
+        1,0 $inner.lighting  -cspan 2  -anchor w -pady 2 \
+        2,0 $inner.edges     -cspan 2  -anchor w -pady 2 \
+        4,0 $inner.vscale_l  -anchor w -pady 2 \
+        4,1 $inner.vscale    -fill x   -pady 2 \
         5,0 $inner.palette_l -anchor w -pady 2 \
         5,1 $inner.palette   -fill x   -pady 2  
@@ -1524 +1517 @@
     }
     switch -- $type {
-        "terrain" {
+        "elevation" {
             array set settings {
                 -edgecolor black

trunk/gui/scripts/map.tcl

@@ -29 +29 @@
     private common _layerTypes {
         "raster"        0
-        "polygon"       1
-        "points"        2
-        "circle"        3
-        "line"          4
+        "elevation"     1
+        "polygon"       2
+        "points"        3
+        "circle"        4
+        "line"          5
     }
     protected method Parse { xmlobj path }