Changeset 5991 for branches/geomap/gui

Timestamp:

Feb 9, 2016, 9:50:20 PM (9 years ago)

Author:

dkearney

Message:

allow users to set placard configuration for layer from layer class
updating generic layer and image layer tests with placard configuration

Location:

branches/geomap/gui

Files:

• scripts/geomaplayer.tcl (modified) (9 diffs)
• test/geomaplayer.test (modified) (2 diffs)
• test/geomaplayerimage.test (modified) (1 diff)

branches/geomap/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/geomap/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/geomap/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}}