Changeset 4288 for trunk/gui

Timestamp:

Mar 28, 2014 9:56:19 AM (10 years ago)

Author:

gah

Message:

merge changes in map.tcl mapviewer.tcl for elevation, extents, etc.

Location:

trunk/gui/scripts

Files:

• map.tcl (modified) (7 diffs)
• mapviewer.tcl (modified) (5 diffs)

trunk/gui/scripts/map.tcl

@@ -25 +25 @@
 itcl::class Rappture::Map {
     private variable _tree "";         # Tree of information about the map.
-    private variable _isGeocentric 0;
     private variable _isValid 0;
     private variable _nextLayer 0;     # Counter used to generate unique
@@ -31 +30 @@
     private common _layerTypes
     private common _mapTypes
-
+    array set _layerTypes {
+        "raster"        0
+        "elevation"     1
+        "polygon"       2
+        "points"        3
+        "circle"        4
+        "line"          5
+    }
+    array set _mapTypes {
+        "geocentric"    0
+        "projected"     1
+    }
     protected method Parse { xmlobj path }
 
@@ -40 +50 @@
         # defined below 
     }
-    public method isGeocentric {}
     public method layers {}
     public method layer { name }
@@ -54 +63 @@
         return [$_tree get $id "type" ""]
     }
-    public method style { name } {
-        set id [$_tree findchild root->"layers" $name]
-        if { $id < 0 } {
-            error "unknown layer \"$name\""
-        }
-        return [$_tree get $id "style" ""]
-    }
 }
 
@@ -70 +72 @@
         error "bad value \"$xmlobj\": should be LibraryObj"
     }
-    array set _layerTypes {
-        "raster"        0
-        "elevation"     1
-        "polygon"       2
-        "points"        3
-        "circle"        4
-        "line"          5
-    }
-    array set _mapTypes {
-        "geocentric"    0
-        "projected"     1
-    }
-
     Parse $xmlobj $path
 }
@@ -149 +138 @@
     $_tree set root "label"       [$map get "about.label"]
     $_tree set root "extents"     [$map get "extents"]
-    $_tree set root "projection"  [$map get "projection"]
 
-    set mapType [$map get "type"]
-    if { $mapType == "" } {
-        set mapType "projected"
+    set projection [$map get "projection"]
+    if { $projection  == "" } {
+        set projection "global-mercator"; # Default projection.
+    }
+    # FIXME: Verify projection is valid.
+    $_tree set root "projection" $projection
+
+    set type [$map get "type"]
+    if { $type == "" } {
+        set type "projected";           # Default type is "projected".
     } 
-
-    if { ![info exists _mapTypes($mapType)] } {
+    if { ![info exists _mapTypes($type)] } {
         error "unknown map type \"$mapType\": should be one of [array names _mapTypes]"
-    } elseif {$mapType == "geocentric"} {
-        set _isGeocentric 1
     }
-    $_tree set root "type" $mapType
+    $_tree set root "type" $type
 
     foreach {key path} {
@@ -206 +198 @@
 }
 
-# ----------------------------------------------------------------------
-# Returns if the map is geocentric (1) or projected (0)
-# ----------------------------------------------------------------------
-itcl::body Rappture::Map::isGeocentric {} {
-    return $_isGeocentric
-}

trunk/gui/scripts/mapviewer.tcl

@@ -613 +613 @@
 
         foreach layer [$dataobj layers] {
-            set layerType [$dataobj type $layer]
-            switch -- $layerType {
-                "elevation" {
-                    set _haveTerrain 1
-                }
-            }
+            if { [$dataobj type $layer] == "elevation" } {
+                set _haveTerrain 1
+                break
+            } 
         }
     }
@@ -863 +861 @@
 
             if { $_mapsettings(type) == "geocentric" } {
-                SendCmd "map reset geocentric"
-            } else {
+                SendCmd [list map reset "geocentric"]
+            }  else {
+                set proj $_mapsettings(projection)
                 if { $_mapsettings(extents) == "" } {
-                    if { $_mapsettings(projection) == "" } {
-                        SendCmd "map reset projected global-mercator"
-                    } else {
-                        SendCmd "map reset projected {$_mapsettings(projection)}"
-                    }
+                    SendCmd [list map reset "projected" $proj]
                 } else {
-                    SendCmd "map reset projected {$_mapsettings(projection)} $_mapsettings(extents)"
+                    foreach {x1 y1 x2 y2} $_mapsettings(extents) break
+                    SendCmd [list map reset "projected" $proj $x1 $y1 $x2 $y2]
                 }
             }
@@ -879 +875 @@
                     terrain-wireframe
             }
+            # FIXME: need to specify initial layer in one command
+            SendCmd "map layer delete base"
             SendCmd "imgflush"
         }
@@ -1579 +1577 @@
     set _visibility($tag) 1
 
-    set type [$dataobj type $layer]
-    set style [$dataobj style $layer]
-    switch -- $type {
+    array set info [$dataobj layer $layer]
+    switch -- $info(type) {
         "elevation" {
             array set settings {
@@ -1591 +1588 @@
                 -wireframe 0
             }
-            array set settings $style
+            if { [info exists info(style)] } {
+                array set settings $info(style)
+            }
             SendCmd "map terrain edges $settings(-edges)"
             set _settings(terrain-edges) $settings(-edges)