Changeset 5991 for branches/geomap/gui/scripts/geomaplayer.tcl

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

File:

• branches/geomap/gui/scripts/geomaplayer.tcl (modified) (9 diffs)

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 {