Changeset 4271 for trunk

Timestamp:

Mar 25, 2014, 11:23:30 PM (11 years ago)

Author:

ldelgass

Message:

Add method to get map projection, initialize map type on first map dataobj.

Location:

trunk/gui/scripts

Files:

• map.tcl (modified) (2 diffs)
• mapviewer.tcl (modified) (10 diffs)

trunk/gui/scripts/map.tcl

@@ -48 +48 @@
     public method layers {}
     public method extents {}
+    public method projection {}
     public method layer { name }
     public method hints { args }
@@ -97 +98 @@
         }
     }
+}
+
+#
+# projection --
+#
+itcl::body Rappture::Map::projection {} {
+    return [$_tree get root "projection" ""]
 }
 

trunk/gui/scripts/mapviewer.tcl

@@ -169 +169 @@
     # Initialize the view to some default parameters.
     array set _view {
-        qw              0.853553
-        qx              -0.353553
-        qy              0.353553
-        qz              0.146447
-        zoom            1.0 
-        xpan            0
-        ypan            0
+        qw              1.0
+        qx              0.0
+        qy              0.0
+        qz              0.0
+        zoom            1.0
+        xpan            0.0
+        ypan            0.0
     }
     set _arcball [blt::arcball create 100 100]
@@ -187 +187 @@
         legend                 1
         terrain-edges          0
-        terrain-lighting       1
+        terrain-lighting       0
         terrain-vertscale      1.0
         terrain-wireframe      0
@@ -450 +450 @@
     set pos [lsearch -exact $_dlist $dataobj]
     if {$pos < 0} {
+        #if {[llength $_dlist] > 0} {
+        #    error "Can't add more than 1 map to mapviewer"
+        #}
         lappend _dlist $dataobj
     }
@@ -844 +847 @@
         $_arcball resize $w $h
         DoResize
-        #FixSettings ?
-
-        if { $_haveTerrain } {
-            FixSettings terrain-edges terrain-lighting terrain-wireframe terrain-vertscale
-        }
-        StopBufferingCommands
-        SendCmd "imgflush"
-        StartBufferingCommands
+
+        #if { $_haveTerrain } {
+        #    FixSettings terrain-edges terrain-lighting terrain-vertscale \
+        #        terrain-wireframe
+        #}
+        #StopBufferingCommands
+        #SendCmd "imgflush"
+        #StartBufferingCommands
     }
 
@@ -861 +864 @@
     foreach dataobj [get -objects] {
         set _obj2datasets($dataobj) ""
+        if {$_first == ""} {
+            # The map must be reset once before any layers are added
+            # This should not be done more than once as it is very 
+            # expensive
+            set _first $dataobj
+            set profile [$dataobj projection]
+            set extents [$dataobj extents]
+            if {[$dataobj isGeocentric]} {
+                SendCmd "map reset geocentric"
+            } elseif {$extents == ""} {
+                set profile "global-mercator"
+                SendCmd "map reset projected $profile"
+            } else {
+                SendCmd "map reset projected $profile [list $extents]"
+            }
+            if { $_haveTerrain } {
+                FixSettings terrain-edges terrain-lighting terrain-vertscale \
+                    terrain-wireframe
+            }
+            SendCmd "imgflush"
+        }
         foreach layer [$dataobj layers] {
             array unset info
@@ -1065 +1089 @@
         "reset" {
             array set _view {
-                qw      0.853553
-                qx      -0.353553
-                qy      0.353553
-                qz      0.146447
+                qw      1.0
+                qx      0.0
+                qy      0.0
+                qz      0.0
                 zoom    1.0
-                xpan    0
-                ypan    0
+                xpan    0.0
+                ypan    0.0
             }
             if { $_first != "" } {
@@ -1236 +1260 @@
             SendCmd "map terrain lighting $bool"
         }
+        "terrain-palette" {
+            set cmap [$itk_component(terrainpalette) value]
+            #SendCmd "map terrain colormap $cmap"
+        }
         "terrain-vertscale" {
             set val $_settings(terrain-vertscale)
@@ -1328 +1356 @@
 
     label $inner.palette_l -text "Palette" -font "Arial 9" -anchor w 
-    itk_component add meshpalette {
+    itk_component add terrainpalette {
         Rappture::Combobox $inner.palette -width 10 -editable no
     }
@@ -1349 +1377 @@
         "orange-to-blue"     "orange-to-blue"   
 
-    $itk_component(meshpalette) value "BCGYR"
+    $itk_component(terrainpalette) value "BCGYR"
     bind $inner.palette <<Value>> \
         [itcl::code $this AdjustSetting terrain-palette]
@@ -1521 +1549 @@
                 -edgecolor black
                 -edges 0
-                -lighting 1
+                -lighting 0
                 -linewidth 1.0
                 -vertscale 1.0