Changeset 5994 for branches

Timestamp:

Feb 9, 2016, 10:23:21 PM (9 years ago)

Author:

dkearney

Message:

merging in placard configuration updates, placard example, feature select example, and add-remove layer example from geomap branch r5971,r5990,r5991,r5993

Location:

branches/blt4_geovis

Files:

• . (modified) (1 prop)
• examples/mapviewer/layers/remove_single_layer.tcl (copied) (copied from branches/geomap/examples/mapviewer/layers/remove_single_layer.tcl)
• examples/mapviewer/placard (copied) (copied from branches/geomap/examples/mapviewer/placard)
• examples/mapviewer/placard/placard_example.tcl (copied) (copied from branches/geomap/examples/mapviewer/placard/placard_example.tcl)
• examples/mapviewer/placard/station_clean.csv (copied) (copied from branches/geomap/examples/mapviewer/placard/station_clean.csv)
• examples/mapviewer/select (copied) (copied from branches/geomap/examples/mapviewer/select)
• examples/mapviewer/select/select_feature_example.tcl (copied) (copied from branches/geomap/examples/mapviewer/select/select_feature_example.tcl)
• examples/mapviewer/select/station_clean.csv (copied) (copied from branches/geomap/examples/mapviewer/select/station_clean.csv)
• gui/scripts/geomaplayer.tcl (modified) (9 diffs)
• gui/scripts/map.tcl (modified) (6 diffs, 1 prop)
• gui/scripts/mapviewer.tcl (modified) (7 diffs, 1 prop)
• gui/scripts/visviewer.tcl (modified) (1 prop)
• gui/test/geomaplayer.test (modified) (2 diffs)
• gui/test/geomaplayerimage.test (modified) (1 diff)
• lang/tcl/pkgIndex.tcl.in (modified) (1 prop)

branches/blt4_geovis/gui/scripts/geomaplayer.tcl

@@ -27 +27 @@
 
     private variable _provider ""
+    private variable _placardstyle_default {fill: #B6B6B688; text-fill: #000000; text-size: 12.0;}
 
     public variable label ""
@@ -33 +34 @@
     public variable visibility "true"
     public variable opacity "1.0"
+    public variable placardattributes ""
+    public variable placardstyle ""
+    public variable placardpadding 5
 
     private method Provider { provider }
@@ -51 +55 @@
     Provider $provider
 
+    set placardstyle ${_placardstyle_default}
+
     eval configure $args
 }
@@ -82 +88 @@
 
     if {[string compare "" $label] == 0} {
-        error "bad value: \"$label\": should be a non-empty string"
+        error "bad value: \"$label\": label should be a non-empty string"
     }
 }
@@ -93 +99 @@
 
     if {[string compare "" $description] == 0} {
-        error "bad value: \"$description\": should be a non-empty string"
+        error "bad value: \"$description\": description should be a non-empty string"
     }
 }
@@ -104 +110 @@
 
     if {[string compare "" $attribution] == 0} {
-        error "bad value: \"$attribution\": should be a non-empty string"
+        error "bad value: \"$attribution\": attribution should be a non-empty string"
     }
 }
@@ -115 +121 @@
 
     if {[string is bool $visibility] == 0} {
-        error "bad value: \"$visibility\": should be a boolean"
+        error "bad value: \"$visibility\": visibility should be a boolean"
     }
 }
@@ -126 +132 @@
 
     if {[string is double $opacity] == 0} {
-        error "bad value: \"$opacity\": should be a double"
+        error "bad value: \"$opacity\": opacity should be a double"
     }
 
     if {[expr {$opacity < 0.0}] == 1 || [expr {$opacity > 1.0}] == 1} {
-        error "bad value: \"$opacity\": should be in range \[0.0,1.0\]"
+        error "bad value: \"$opacity\": opacity should be in range \[0.0,1.0\]"
+    }
+}
+
+
+# ----------------------------------------------------------------------
+# placardattributes: key value list of attributes to show in the placard
+# ----------------------------------------------------------------------
+itcl::configbody Rappture::GeoMapLayer::placardattributes {
+
+    if { [expr {[llength $placardattributes] % 2}] != 0 } {
+        error "bad value \"$placardattributes\": uneven number of placard attributes"
+    }
+
+    regsub -all "\[ \t\r\n\]+" [string trim $placardattributes] " " placardattributes
+}
+
+
+# ----------------------------------------------------------------------
+# placardstyle: CSS formatted style definition for text and background
+# ----------------------------------------------------------------------
+itcl::configbody Rappture::GeoMapLayer::placardstyle {
+
+    if {[string equal $placardstyle ""]} {
+        # blank value sets style back to the default
+        set placardstyle ${_placardstyle_default}
+    }
+
+    regsub -all "\[ \t\r\n\]+" [string trim $placardstyle] " " placardstyle
+}
+
+
+# ----------------------------------------------------------------------
+# placardpadding: pixels between attribute labels and edge of the backing quad
+# ----------------------------------------------------------------------
+itcl::configbody Rappture::GeoMapLayer::placardpadding {
+
+    if {[string is integer $placardpadding] == 0} {
+        error "bad value \"$placardpadding\": placardpadding should be a positive integer"
+    }
+
+    if {$placardpadding < 0} {
+        error "bad value \"$placardpadding\": placardpadding should be a positive integer"
     }
 }
@@ -213 +261 @@
                 visible $visibility \
                 opacity $opacity \
-
+                placard [list \
+                    attrlist $placardattributes\
+                    style $placardstyle\
+                    padding $placardpadding\
+                ]
         }
         default {

branches/blt4_geovis/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/blt4_geovis/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]
     }
 

branches/blt4_geovis/gui/test/geomaplayer.test

@@ -45 +45 @@
 #   ?-attribution <attrib>? \
 #   ?-visibility <visibility>? \
-#   ?-opacity <opacity>?
+#   ?-opacity <opacity>? \
+#   ?-placardattributes <attributes>? \
+#   ?-placardstyle <style>? \
+#   ?-placardpadding <padding>?
 #----------------------------------------------------------
 test geomaplayer-1.1 {Rappture::GeoMapLayer, 0 arguments} {
@@ -56 +59 @@
 
 
+#----------------------------------------------------------
+# export command
+#----------------------------------------------------------
+
+set l1 [Rappture::GeoMapLayer #auto $provider]
+
 test geomaplayer-11.0 {Rappture::GeoMapLayer, export (default format)} {
-    set l [Rappture::GeoMapLayer #auto $provider]
-    set t [$l export]
+    set t [$l1 export]
     list [catch {lindex [$t dump 0] 3} msg] $msg
-} {0 {type image driver xyz cache true attribution {} xyz.url http://myurl.com/ label {} description {} visible true opacity 1.0}}
+} {0 {type image driver xyz cache true attribution {} xyz.url http://myurl.com/ label {} description {} visible true opacity 1.0 placard {attrlist {} style {fill: #B6B6B688; text-fill: #000000; text-size: 12.0;} padding 5}}}
 
 test geomaplayer-11.1 {Rappture::GeoMapLayer, export bad format} {
-    set l [Rappture::GeoMapLayer #auto $provider]
-    list [catch {$l export -format blahh} msg] $msg
+    list [catch {$l1 export -format blahh} msg] $msg
 } {1 {bad format "blahh": should be one of blt_tree}}
 
 test geomaplayer-11.2 {Rappture::GeoMapLayer, export -format blt_tree} {
-    set l [Rappture::GeoMapLayer #auto $provider]
-    set t [$l export -format blt_tree]
+    set t [$l1 export -format blt_tree]
     list [catch {lindex [$t dump 0] 3} msg] $msg
-} {0 {type image driver xyz cache true attribution {} xyz.url http://myurl.com/ label {} description {} visible true opacity 1.0}}
+} {0 {type image driver xyz cache true attribution {} xyz.url http://myurl.com/ label {} description {} visible true opacity 1.0 placard {attrlist {} style {fill: #B6B6B688; text-fill: #000000; text-size: 12.0;} padding 5}}}
+
+
+#----------------------------------------------------------
+# -placardattributes flag validation
+#----------------------------------------------------------
+
+set l2 [Rappture::GeoMapLayer #auto $provider]
+
+test geomaplayer-12.1 {-placardattributes string} {
+    set err [catch {$l2 configure -placardattributes {name Name aland "Land Area"}} msg]
+    catch {$l2 cget -placardattributes} stored
+    list $err $msg $stored
+} {0 {} {name Name aland "Land Area"}}
+
+test geomaplayer-12.2 {-placardattributes string with extra spaces} {
+    set err [catch {$l2 configure -placardattributes "name Name\naland LandArea"} msg]
+    catch {$l2 cget -placardattributes} stored
+    list $err $msg $stored
+} {0 {} {name Name aland LandArea}}
+
+
+
+#----------------------------------------------------------
+# -placardstyle flag validation
+#----------------------------------------------------------
+
+test geomaplayer-13.1 {-placardstyle string} {
+    set err [catch {$l2 configure -placardstyle {fill: #00FF0088;}} msg]
+    catch {$l2 cget -placardstyle} stored
+    list $err $msg $stored
+} {0 {} {fill: #00FF0088;}}
+
+test geomaplayer-13.2 {-placardstyle string with extra spaces} {
+    set err [catch {$l2 configure -placardstyle "fill:\t#00FF0088;"} msg]
+    catch {$l2 cget -placardstyle} stored
+    list $err $msg $stored
+} {0 {} {fill: #00FF0088;}}
+
+test geomaplayer-13.3 {-placardstyle empty string sets widget default} {
+    set err [catch {$l2 configure -placardstyle ""} msg]
+    catch {$l2 cget -placardstyle} stored
+    list $err $msg $stored
+} {0 {} {fill: #B6B6B688; text-fill: #000000; text-size: 12.0;}}
+
+
+#----------------------------------------------------------
+# -placardpadding flag validation
+#----------------------------------------------------------
+
+test geomaplayer-14.1 {-placardpadding integer} {
+    set err [catch {$l2 configure -placardpadding 7} msg]
+    catch {$l2 cget -placardpadding} stored
+    list $err $msg $stored
+} {0 {} 7}
+
+test geomaplayer-14.2 {-placardpadding double} {
+    list [catch {$l2 configure -placardpadding 8.0} msg] $msg
+} {1 {bad value "8.0": placardpadding should be a positive integer}}
+
+test geomaplayer-14.3 {-placardpadding negative integer} {
+    list [catch {$l2 configure -placardpadding -5} msg] $msg
+} {1 {bad value "-5": placardpadding should be a positive integer}}
+
 
 

branches/blt4_geovis/gui/test/geomaplayerimage.test

@@ -71 +71 @@
     set t [$l export -format blt_tree]
     list [catch {lindex [$t dump 0] 3} msg] $msg
-} {0 {type image driver xyz cache true attribution {} xyz.url http://myurl.com/ label {} description {} visible true opacity 1.0 coverage false}}
+} {0 {type image driver xyz cache true attribution {} xyz.url http://myurl.com/ label {} description {} visible true opacity 1.0 placard {attrlist {} style {fill: #B6B6B688; text-fill: #000000; text-size: 12.0;} padding 5} coverage false}}