Changeset 5990 for branches/geomap

Timestamp:

Feb 9, 2016 9:35:12 PM (6 years ago)

Author:

dkearney

Message:

merging changes from trunk r5975, which include placard configuration, into geomap branch. not including merge info.

Location:

branches/geomap/gui/scripts

Files:

• map.tcl (modified) (6 diffs)
• mapviewer.tcl (modified) (7 diffs)

branches/geomap/gui/scripts/map.tcl

@@ -31 +31 @@
 
     public method addViewpoint { name props }
+    public method deleteViewpoint { viewpointName }
     public method earthfile {}
+    public method getPlacardConfig { layerName }
     public method hints { args }
     public method isGeocentric {}
@@ -45 +47 @@
     public method setExtents { xmin ymin xmax ymax {srs "wgs84"} }
     public method setLabel { label }
+    public method setPlacardConfig { layerName attrlist style padding }
     public method setProjection { projection }
     public method setStyle { style }
@@ -203 +206 @@
             }
             rename $styles ""
+        }
+        set placard [$layers element -as object $layer.placard]
+        if {$placard != ""} {
+            foreach key { attributes style padding } {
+                set $key [$placard get $key]
+            }
+            setPlacardConfig $name $attributes $style $padding
         }
         $_tree set $child "driver" "debug"
@@ -578 +588 @@
 #       layer names
 #       layer settings layerName
-#
+# ----------------------------------------------------------------------
 itcl::body Rappture::Map::layer {option args} {
     set result ""
@@ -601 +611 @@
 }
 
+
+itcl::body Rappture::Map::setPlacardConfig { layerName attrlist style padding } {
+    set id [$_tree findchild root->"layers" $layerName]
+    if { $id < 0 } {
+        error "unknown layer \"$layerName\""
+    }
+    array set placardConf {}
+    foreach key { padding } {
+        set placardConf($key) [set $key]
+    }
+    foreach key { attrlist style } {
+        # Normalize whitespace
+        set val [set $key]
+        regsub -all "\[ \t\r\n\]+" [string trim $val] " " val
+        set placardConf($key) $val
+    }
+    $_tree set $id "placard" [array get placardConf]
+}
+
+
+itcl::body Rappture::Map::getPlacardConfig { layerName } {
+    set id [$_tree findchild root->"layers" $layerName]
+    if { $id < 0 } {
+        error "unknown layer \"$layerName\""
+    }
+    return [$_tree get $id "placard" ""]
+}
 
 # ----------------------------------------------------------------------
@@ -686 +723 @@
 }
 
+itcl::body Rappture::Map::deleteViewpoint { viewopintName } {
+    set id [$_tree findchild root->"viewpoints" $viewpointName]
+    if { $id < 0 } {
+        error "unknown viewpoint \"$viewpointName\""
+    }
+    $_tree delete $id
+}
+
 # ----------------------------------------------------------------------
 # USAGE: type <layerName>

branches/geomap/gui/scripts/mapviewer.tcl

@@ -1427 +1427 @@
 
 itcl::body Rappture::MapViewer::EnablePanningMouseBindings {} {
-    if {$_useServerManip} {
+    if {1 || $_useServerManip} {
         bind $itk_component(view) <ButtonPress-1> \
             [itcl::code $this MouseClick 1 %x %y]
@@ -1451 +1451 @@
 
 itcl::body Rappture::MapViewer::EnableRotationMouseBindings {} {
-    if {$_useServerManip} {
-        bind $itk_component(view) <ButtonPress-2> \
-            [itcl::code $this Rotate click %x %y]
-        bind $itk_component(view) <B2-Motion> \
-            [itcl::code $this Rotate drag %x %y]
-        bind $itk_component(view) <ButtonRelease-2> \
-            [itcl::code $this Rotate release %x %y]
-    } else {
+    if {1 || $_useServerManip} {
         # Bindings for rotation via mouse
         bind $itk_component(view) <ButtonPress-2> \
@@ -1466 +1459 @@
         bind $itk_component(view) <ButtonRelease-2> \
             [itcl::code $this MouseRelease 2 %x %y]
+    } else {
+        bind $itk_component(view) <ButtonPress-2> \
+            [itcl::code $this Rotate click %x %y]
+        bind $itk_component(view) <B2-Motion> \
+            [itcl::code $this Rotate drag %x %y]
+        bind $itk_component(view) <ButtonRelease-2> \
+            [itcl::code $this Rotate release %x %y]
     }
 }
@@ -1476 +1476 @@
 
 itcl::body Rappture::MapViewer::EnableZoomMouseBindings {} {
-    if {$_useServerManip} {
+    if {1 || $_useServerManip} {
         bind $itk_component(view) <ButtonPress-3> \
             [itcl::code $this MouseClick 3 %x %y]
@@ -1770 +1770 @@
 itcl::body Rappture::MapViewer::Pan {option x y} {
     switch -- $option {
-        "set" {
-            set w [winfo width $itk_component(view)]
-            set h [winfo height $itk_component(view)]
-            set x [expr $x / double($w)]
-            set y [expr $y / double($h)]
-            if {[expr (abs($x) > 0.0 || abs($y) > 0.0)]} {
-                SendCmd "camera pan $x $y"
-            }
-            return
-        }
         "click" {
             set _click(x) $x
@@ -1813 +1803 @@
             $itk_component(view) configure -cursor ""
             set _b1mode ""
+        }
+        "set" {
+            set w [winfo width $itk_component(view)]
+            set h [winfo height $itk_component(view)]
+            set x [expr $x / double($w)]
+            set y [expr $y / double($h)]
+            if {[expr (abs($x) > 0.0 || abs($y) > 0.0)]} {
+                SendCmd "camera pan $x $y"
+            }
+            return
         }
         default {
@@ -2884 +2884 @@
             SendCmd "map layer opacity $style(-opacity) $layer"
         }
+    }
+
+    if {[info exists info(placard)]} {
+        array set placard [$dataobj getPlacardConfig $layer]
+        SendCmd [list placard config $placard(attrlist) $placard(style) $placard(padding) $layer]
     }