Changeset 4280

Timestamp:

Mar 26, 2014 5:15:26 PM (10 years ago)

Author:

ldelgass

Message:

Fixes for map parser: layer/map type arrays weren't initialized properly. Add
method to get layer style (may want to revisit this format later), add back
convenience isGeocentric method. In map viewer, allow map specifying projection
and no extents, otherwise (neither) default to mercator.

Location:

trunk/gui/scripts

Files:

• map.tcl (modified) (5 diffs)
• mapviewer.tcl (modified) (4 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
                                        # layer names.
-    private common _layerTypes {
+    private common _layerTypes
+    private common _mapTypes
+
+    protected method Parse { xmlobj path }
+
+    constructor {xmlobj path} { 
+        # defined below 
+    }
+    destructor { 
+        # defined below 
+    }
+    public method isGeocentric {}
+    public method layers {}
+    public method layer { name }
+    public method hints { args }
+    public method isvalid {} {
+        return $_isValid;
+    }
+    public method type { name } {
+        set id [$_tree findchild root->"layers" $name]
+        if { $id < 0 } {
+            error "unknown layer \"$name\""
+        }
+        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" ""]
+    }
+}
+
+# ----------------------------------------------------------------------
+# CONSTRUCTOR
+# ----------------------------------------------------------------------
+itcl::body Rappture::Map::constructor {xmlobj path} {
+    if {![Rappture::library isvalid $xmlobj]} {
+        error "bad value \"$xmlobj\": should be LibraryObj"
+    }
+    array set _layerTypes {
         "raster"        0
         "elevation"     1
@@ -36 +78 @@
         "line"          5
     }
-    private common _mapTypes {
+    array set _mapTypes {
         "geocentric"    0
         "projected"     1
     }
-    protected method Parse { xmlobj path }
-
-    constructor {xmlobj path} { 
-        # defined below 
-    }
-    destructor { 
-        # defined below 
-    }
-    public method layers {}
-    public method layer { name }
-    public method hints { args }
-    public method isvalid {} {
-        return $_isValid;
-    }
-    public method type { name } {
-        set id [$_tree findchild root->"layers" $name]
-        if { $id < 0 } {
-            error "unknown layer \"$name\""
-        }
-        return [$_tree get $id "type" ""]
-    }
-}
-
-# ----------------------------------------------------------------------
-# CONSTRUCTOR
-# ----------------------------------------------------------------------
-itcl::body Rappture::Map::constructor {xmlobj path} {
-    if {![Rappture::library isvalid $xmlobj]} {
-        error "bad value \"$xmlobj\": should be LibraryObj"
-    }
+
     Parse $xmlobj $path
 }
@@ -121 +134 @@
         $_tree set $child "title" [$layers get $layer.label]
         set type [$layers get $layer.type] 
-        if { [info exists _layerTypes($type)] } {
-            error "invalid layer type \"$type\""
+        if { ![info exists _layerTypes($type)] } {
+            error "invalid layer type \"$type\": should be one of [array names _layerTypes]"
         }
         $_tree set $child "type" $type
@@ -138 +151 @@
     $_tree set root "projection"  [$map get "projection"]
 
-    set type [$map get "type"]
-    if { $type == "" } {
-        set type "projected"
+    set mapType [$map get "type"]
+    if { $mapType == "" } {
+        set mapType "projected"
     } 
-    if { [info exists _mapTypes($type)] } {
+    puts stderr "Map type: $mapType"
+    if { ![info exists _mapTypes($mapType)] } {
         error "unknown map type \"$mapType\": should be one of [array names _mapTypes]"
-    }
-    $_tree set root "type" $type
+    } elseif {$mapType == "geocentric"} {
+        set _isGeocentric 1
+    }
+    $_tree set root "type" $mapType
 
     foreach {key path} {
@@ -190 +206 @@
 }
 
+# ----------------------------------------------------------------------
+# Returns if the map is geocentric (1) or projected (0)
+# ----------------------------------------------------------------------
+itcl::body Rappture::Map::isGeocentric {} {
+    return $_isGeocentric
+}

trunk/gui/scripts/mapviewer.tcl

@@ -619 +619 @@
 
         foreach layer [$dataobj layers] {
-            set type [$dataobj layer $layer]
-            switch -- $type {
+            set layerType [$dataobj type $layer]
+            switch -- $layerType {
                 "elevation" {
                     set _haveTerrain 1
@@ -871 +871 @@
                 SendCmd "map reset geocentric"
             } else {
-                if { $_mapsettings(extents) == ""} {
-                    SendCmd "map reset projected global-mercator"
+                if { $_mapsettings(extents) == "" } {
+                    if { $_mapsettings(projection) == "" } {
+                        SendCmd "map reset projected global-mercator"
+                    } else {
+                        SendCmd "map reset projected $_mapsettings(projection)"
+                    }
                 } else {
-                    SendCmd \
-        "map reset projected $_mapsettings(projection) $_mapsettings(extents)"
+                    SendCmd "map reset projected $_mapsettings(projection) $_mapsettings(extents)"
                 }
             }
@@ -1567 +1570 @@
     set _visibility($tag) 1
 
-    return 
-
-    # The following code is a place holder for terrain styles.
-
     set type [$dataobj type $layer]
     set style [$dataobj style $layer]
-    if { $dataobj != $_first } {
-        set settings(-wireframe) 1
-    }
     switch -- $type {
         "elevation" {
@@ -1589 +1585 @@
             SendCmd "map terrain edges $settings(-edges) $tag"
             set _settings(terrain-edges) $settings(-edges)
-            SendCmd "map terrain color [Color2RGB $settings(-color)] $tag"
+            #SendCmd "map terrain color [Color2RGB $settings(-color)] $tag"
             #SendCmd "map terrain colormode constant {} $tag"
             SendCmd "map terrain lighting $settings(-lighting) $tag"
             set _settings(terrain-lighting) $settings(-lighting)
             SendCmd "map terrain linecolor [Color2RGB $settings(-edgecolor)] $tag"
-            SendCmd "map terrain linewidth $settings(-linewidth) $tag"
+            #SendCmd "map terrain linewidth $settings(-linewidth) $tag"
             SendCmd "map terrain wireframe $settings(-wireframe) $tag"
             set _settings(terrain-wireframe) $settings(-wireframe)