Changeset 4995

Timestamp:

Feb 11, 2015, 2:46:21 AM (10 years ago)

Author:

ldelgass

Message:

Add camera/viewpoint settings to map object

Location:

trunk/gui/scripts

Files:

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

trunk/gui/scripts/map.tcl

@@ -26 +26 @@
     private variable _tree "";         # Tree of information about the map.
     private variable _isValid 0;
-    private common _nextLayer 0;        # Counter used to generate unique
+    private common _nextLayer 0;       # Counter used to generate unique
                                        # layer names.
+    private common _nextViewpoint 0;   # Counter used to generate unique
+                                       # viewpoint names.
     private common _layerTypes
     private common _mapTypes
@@ -52 +54 @@
     }
 
-    public method isGeocentric {} 
-    public method layers {}
-    public method layer { layerName }
+    public method earthfile {}
     public method hints { args }
+    public method isGeocentric {}
     public method isvalid {} {
         return $_isValid;
     }
+    public method layer { layerName }
+    public method layers {}
     public method type { layerName }
-    public method earthfile {}
+    public method viewpoint { viewpointName }
+    public method viewpoints {}
 }
 
@@ -215 +219 @@
     $_tree set root "label"       [$map get "about.label"]
     $_tree set root "style"       [$map get "style"]
- 
+    $_tree set root "camera"      [$map get "camera"]
+    set parent [$_tree insert root -label "viewpoints"]
+    set viewpoints [$map element -as object "viewpoints"]
+    if { $viewpoints != "" } {
+        foreach viewpoint [$viewpoints children -type viewpoint] {
+            set name "viewpoint[incr _nextViewpoint]"
+            set child [$_tree insert $parent -label $name]
+            $_tree set $child "name" $viewpoint
+            foreach key { label description x y z distance heading pitch srs verticalDatum } {
+                set val [$viewpoints get $viewpoint.$key]
+                $_tree set $child $key $val
+            }
+        }
+    }
+
     set projection [$map get "projection"]
     set extents    [$map get "extents"]
     if { $projection  == "" } {
-        if {$extents != ""} {
+        if { $extents != "" } {
             error "cannot specify extents without a projection"
         }
@@ -268 +286 @@
 
 # ----------------------------------------------------------------------
+# USAGE: viewpoints
+#
+# Returns a list of IDs for the viewpoints in the map
+# ----------------------------------------------------------------------
+itcl::body Rappture::Map::viewpoints {} {
+    set list {}
+    foreach node [$_tree children root->"viewpoints"] {
+        lappend list [$_tree label $node] 
+    }
+    return $list
+}
+
+# ----------------------------------------------------------------------
 # USAGE: layer <layerName>
 #
@@ -276 +307 @@
     if { $id < 0 } {
         error "unknown layer \"$layerName\""
+    }
+    return [$_tree get $id]
+}
+
+# ----------------------------------------------------------------------
+# USAGE: viewopint <viewopintName>
+#
+# Returns an array of settings for the named viewpoint
+# ----------------------------------------------------------------------
+itcl::body Rappture::Map::viewpoint { viewopintName } {
+    set id [$_tree findchild root->"viewpoints" $viewopintName]
+    if { $id < 0 } {
+        error "unknown viewpoint \"$viewpointName\""
     }
     return [$_tree get $id]

trunk/gui/scripts/mapviewer.tcl

@@ -116 +116 @@
     private variable _layers;           # Contains the names of all the 
                                         # layer in the server.
+    private variable _viewpoints;
     private variable _click;            # info used for rotate operations
     private variable _view;             # view params for 3D view
@@ -772 +773 @@
             }
         }
+        if { [info exists hints(camera)] } {
+            if { ![info exists _mapsettings(camera)] } {
+                set _mapsettings(camera) $hints(camera)
+            }
+        }
         foreach layer [$dataobj layers] {
             if { [$dataobj type $layer] == "elevation" } {
@@ -777 +783 @@
                 break
             } 
+        }
+        foreach viewpoint [$dataobj viewpoints] {
+            set _viewpoints($viewpoint) [$dataobj viewpoint $viewpoint]
+            array set vp $_viewpoints($viewpoint)
+            foreach key { x y z distance heading pitch srs verticalDatum } {
+                puts stderr "$viewpoint $key $vp($key)"
+            }
         }
     }