Changeset 5027

Timestamp:

Feb 16, 2015, 2:25:28 AM (9 years ago)

Author:

ldelgass

Message:

Add viewpoints, attributions to maps

Location:

trunk/gui/scripts

Files:

• images/placemark16.png (added)
• images/terrain.png (added)
• map.tcl (modified) (4 diffs)
• mapviewer.tcl (modified) (22 diffs)

trunk/gui/scripts/map.tcl

@@ -86 +86 @@
 }
 
-#
-# hints --
-#
 itcl::body Rappture::Map::hints { args } {
     switch -- [llength $args] {
@@ -107 +104 @@
 # Parse --
 #
-#       Parses the map description in the XML object.
+#   Parses the map description in the XML object.
 #
 itcl::body Rappture::Map::Parse { xmlobj path } {
@@ -129 +126 @@
         $_tree set $child "name" $layer
         $_tree set $child "type" $layerType
-        foreach key { label description } {
+        foreach key { label description attribution } {
             $_tree set $child $key [$layers get $layer.$key]
         }
@@ -218 +215 @@
     }
     $_tree set root "label"       [$map get "about.label"]
+    $_tree set root "attribution" [$map get "about.attribution"]
     $_tree set root "style"       [$map get "style"]
     $_tree set root "camera"      [$map get "camera"]

trunk/gui/scripts/mapviewer.tcl

@@ -39 +39 @@
     itk_option define -plotbackground plotBackground Background ""
 
-    private variable _layersFrame "";   # Name of layers frame widget
-    private variable _mapsettings;      # Global map settings
+    private variable _layersFrame "";     # Name of layers frame widget
+    private variable _viewpointsFrame ""; # Name of viewpoints frame widget
+    private variable _mapsettings;        # Global map settings
 
     constructor { hostlist args } {
@@ -81 +82 @@
     private method BuildMapTab {}
     private method BuildTerrainTab {}
+    private method BuildViewpointsTab {}
     private method Connect {}
     private method CurrentLayers {args}
@@ -94 +96 @@
     private method GetImage { args }
     private method GetNormalizedMouse { x y }
+    private method GoToViewpoint { dataobj viewpoint }
     private method InitSettings { args  }
     private method MapIsGeocentric {}
@@ -114 +117 @@
     private method ToggleWireframe {}
     private method UpdateLayerControls {}
+    private method UpdateViewpointControls {}
     private method Zoom {option {x 0} {y 0}}
 
@@ -312 +316 @@
 
     BuildLayerTab
+    BuildViewpointsTab
     BuildMapTab
     BuildTerrainTab
@@ -392 +397 @@
         bind $itk_component(view) <Double-1> \
             [itcl::code $this camera go %x %y 0.4]
+        bind $itk_component(view) <Shift-Double-1> \
+            [itcl::code $this camera go %x %y 1.0]
 
         # Pin placemark annotations
@@ -641 +648 @@
 # USAGE: delete ?<dataobj1> <dataobj2> ...?
 #
-#       Clients use this to delete a dataobj from the plot.  If no dataobjs
-#       are specified, then all dataobjs are deleted.  No data objects are
-#       deleted.  They are only removed from the display list.
-#
+# Clients use this to delete a dataobj from the plot.  If no dataobjs
+# are specified, then all dataobjs are deleted.  No data objects are
+# deleted.  They are only removed from the display list.
 # ----------------------------------------------------------------------
 itcl::body Rappture::MapViewer::delete {args} {
@@ -823 +829 @@
             set _viewpoints($viewpoint) [$dataobj viewpoint $viewpoint]
             array set vp $_viewpoints($viewpoint)
-            foreach key { x y z distance heading pitch srs verticalDatum } {
+            foreach key { label description x y z distance heading pitch srs verticalDatum } {
                 if { [info exists vp($key)] } {
                     puts stderr "$viewpoint $key $vp($key)"
@@ -943 +949 @@
 # isconnected --
 #
-#       Indicates if we are currently connected to the visualization server.
+#   Indicates if we are currently connected to the visualization server.
 #
 itcl::body Rappture::MapViewer::isconnected {} {
@@ -960 +966 @@
 # Disconnect --
 #
-#       Clients use this method to disconnect from the current rendering
-#       server.
+#   Clients use this method to disconnect from the current rendering
+#   server.
 #
 itcl::body Rappture::MapViewer::Disconnect {} {
@@ -1214 +1220 @@
 
     UpdateLayerControls
+    UpdateViewpointControls
     set _reset 0
     global readyForNextFrame
@@ -1322 +1329 @@
 # EventuallyHandleMotionEvent --
 #
-#       This routine compresses (no button press) motion events.  It
-#       delivers a server mouse command once every 100 milliseconds (if a
-#       motion event is pending).
+#   This routine compresses (no button press) motion events.  It
+#   delivers a server mouse command once every 100 milliseconds (if a
+#   motion event is pending).
 #
 itcl::body Rappture::MapViewer::EventuallyHandleMotionEvent {x y} {
@@ -1574 +1581 @@
 # AdjustSetting --
 #
-#       Changes/updates a specific setting in the widget.  There are
-#       usually user-setable option.  Commands are sent to the render
-#       server.
+#   Changes/updates a specific setting in the widget.  There are
+#   usually user-setable option.  Commands are sent to the render
+#   server.
 #
 itcl::body Rappture::MapViewer::AdjustSetting {what {value ""}} {
@@ -1673 +1680 @@
         ignore -font
     }
+    Rappture::Tooltip::for $inner.grid "Toggle graticule (grid) display <g>"
 
     checkbutton $inner.wireframe \
@@ -1679 +1687 @@
         -command [itcl::code $this AdjustSetting terrain-wireframe] \
         -font "Arial 9" -anchor w
+    Rappture::Tooltip::for $inner.wireframe "Toggle wireframe rendering of terrain geometry <w>"
 
     checkbutton $inner.lighting \
@@ -1685 +1694 @@
         -command [itcl::code $this AdjustSetting terrain-lighting] \
         -font "Arial 9" -anchor w
+    Rappture::Tooltip::for $inner.lighting "Toggle sky lighting of terrain <l>"
 
     checkbutton $inner.edges \
@@ -1725 +1735 @@
     set inner [$itk_component(main) insert end \
         -title "Terrain Settings" \
-        -icon [Rappture::icon surface]]
+        -icon [Rappture::icon terrain]]
     $inner configure -borderwidth 4
 
@@ -1762 +1772 @@
 
 itcl::body Rappture::MapViewer::BuildLayerTab {} {
-
     set fg [option get $itk_component(hull) font Font]
     #set bfg [option get $itk_component(hull) boldFont Font]
@@ -1774 +1783 @@
         0,0 $f -fill both
     set _layersFrame $inner
+}
+
+itcl::body Rappture::MapViewer::BuildViewpointsTab {} {
+    set fg [option get $itk_component(hull) font Font]
+    #set bfg [option get $itk_component(hull) boldFont Font]
+
+    set inner [$itk_component(main) insert end \
+        -title "Places" \
+        -icon [Rappture::icon placemark16]]
+    $inner configure -borderwidth 4
+    set f [frame $inner.viewpoints]
+    blt::table $inner \
+        0,0 $f -fill both
+    set _viewpointsFrame $inner
 }
 
@@ -1950 +1973 @@
         }
     }
+}
+
+itcl::body Rappture::MapViewer::GoToViewpoint { dataobj viewpoint } {
+    if 0 {
+    array set view {
+        x 0
+        y 0
+        z 0
+        heading 0
+        pitch -89.999
+        distance 0
+        srs ""
+        verticalDatum ""
+    }
+    }
+    array set view [$dataobj viewpoint $viewpoint]
+    foreach key {x y z heading pitch distance srs verticalDatum} {
+        if { [info exists view($key)] } {
+            set _view($key) $view($key)
+        }
+    }
+    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)]
 }
 
@@ -2202 +2248 @@
     }
     set f $inner.layers
+    set attrib [list]
     foreach dataobj [get -objects] {
         foreach layer [$dataobj layers] {
             array unset info
             array set info [$dataobj layer $layer]
-            checkbutton $f.${layer}-visible \
+            checkbutton $f.${layer}_visible \
                 -text $info(label) \
                 -font "Arial 9" -anchor w \
@@ -2212 +2259 @@
                 -command [itcl::code $this \
                               SetLayerVisibility $dataobj $layer]
-            blt::table $f $row,0 $f.${layer}-visible -anchor w -pady 2 -cspan 2
-            Rappture::Tooltip::for $f.${layer}-visible $info(description)
+            blt::table $f $row,0 $f.${layer}_visible -anchor w -pady 2 -cspan 2
             incr row
             if { $info(type) != "elevation" } {
-                label $f.${layer}-opacity_l -text "Opacity" -font "Arial 9"
-                ::scale $f.${layer}-opacity -from 0 -to 100 \
+                label $f.${layer}_opacity_l -text "Opacity" -font "Arial 9"
+                ::scale $f.${layer}_opacity -from 0 -to 100 \
                     -orient horizontal -showvalue off \
                     -variable [itcl::scope _opacity($layer)] \
                     -command [itcl::code $this \
                                   SetLayerOpacity $dataobj $layer]
-                blt::table $f $row,0 $f.${layer}-opacity_l -anchor w -pady 2
-                blt::table $f $row,1 $f.${layer}-opacity -anchor w -pady 2
+                Rappture::Tooltip::for $f.${layer}_opacity "Set opacity of $info(label) layer"
+                blt::table $f $row,0 $f.${layer}_opacity_l -anchor w -pady 2
+                blt::table $f $row,1 $f.${layer}_opacity -anchor w -pady 2
                 incr row
             }
+            set tooltip [list $info(description)]
+            if { [info exists info(attribution)] &&
+                 $info(attribution) != ""} {
+                lappend tooltip $info(attribution)
+            }
+            Rappture::Tooltip::for $f.${layer}_visible [join $tooltip \n]
+        }
+        set mapAttrib [$dataobj hints "attribution"]
+        if { $mapAttrib != "" } {
+            lappend attrib $mapAttrib
+        }
+    }
+    SendCmd "[list map attrib [join $attrib ,]]"
+    label $f.map_attrib -text [join $attrib \n] -font "Arial 9"
+    blt::table $f $row,0 $f.map_attrib -anchor sw -pady 2 -cspan 2
+    #incr row
+    if { $row > 0 } {
+        blt::table configure $f r* c* -resize none
+        blt::table configure $f r$row c1 -resize expand
+    }
+}
+
+itcl::body Rappture::MapViewer::UpdateViewpointControls {} {
+    set row 0
+    set inner $_viewpointsFrame
+    if { [winfo exists $inner.viewpoints] } {
+        foreach w [winfo children $inner.viewpoints] {
+            destroy $w
+        }
+    }
+    set f $inner.viewpoints
+    foreach dataobj [get -objects] {
+        foreach viewpoint [$dataobj viewpoints] {
+            array unset info
+            array set info [$dataobj viewpoint $viewpoint]
+            button $f.${viewpoint}_go \
+                -relief flat -compound left \
+                -image [Rappture::icon placemark16] \
+                -text $info(label) \
+                -font "Arial 9" -anchor w \
+                -command [itcl::code $this \
+                              GoToViewpoint $dataobj $viewpoint]
+            label $f.${viewpoint}_label \
+                -text $info(label) \
+                -font "Arial 9" -anchor w
+            blt::table $f $row,0 $f.${viewpoint}_go -anchor w -pady 2 -cspan 2
+            #blt::table $f $row,1 $f.${viewpoint}_label -anchor w -pady 2
+            Rappture::Tooltip::for $f.${viewpoint}_go $info(description)
+            incr row
         }
     }