Changeset 6263 for trunk/gui

Timestamp:

Apr 12, 2016, 7:12:53 PM (8 years ago)

Author:

ldelgass

Message:

Add "camera viewpoint go" to map viewer.

File:

• trunk/gui/scripts/mapviewer.tcl (modified) (4 diffs)

trunk/gui/scripts/mapviewer.tcl

@@ -106 +106 @@
     private method GetImage { args }
     private method GetNormalizedMouse { x y }
-    private method GoToViewpoint { dataobj viewpoint }
+    private method GoToViewpoint { dataobj viewpoint {duration 2.0} }
     private method InitSettings { args  }
     private method MapIsGeocentric {}
@@ -2368 +2368 @@
             Camera reset
         }
+        "viewpoint" {
+            if {[llength $args] < 1} {
+                error "wrong # args to camera viewpoint"
+            }
+            set vpopt [lindex $args 0]
+            switch -- $vpopt {
+                "go" {
+                    if {[llength $args] < 3} {
+                        error "wrong # of args to camera viewpoint go"
+                    }
+                    foreach {dataobj viewpoint} [lrange $args 1 end] break
+                    GoToViewpoint $dataobj $viewpoint
+                }
+                default {
+                    error "Unknown camera viewpoint option \"$vpopt\""
+                }
+            }
+        }
         "zoom" {
             if {[llength $args] < 1} {
@@ -2503 +2521 @@
 }
 
-itcl::body Rappture::MapViewer::GoToViewpoint { dataobj viewpoint } {
+itcl::body Rappture::MapViewer::GoToViewpoint { dataobj viewpoint {duration 2.0}} {
     array set view [subst {
         x 0
@@ -2524 +2542 @@
         set _view(pitch) -90
     }
-    set duration 2.0
     SendCmd [list camera set $_view(x) $_view(y) $_view(z) $_view(heading) $_view(pitch) $_view(distance) $duration $_view(srs) $_view(verticalDatum)]
 }