Changeset 6318 for trunk

Timestamp:

May 6, 2016, 7:05:00 AM (9 years ago)

Author:

ldelgass

Message:

Add dirty flag to map object to track changes to (immutable) layer properties.
When one of these properties is changed, the layer must be re-created. Bugs
still remain: the layer cache can hang around after the delete/add (need to
determine if the server can invalidate that layer's cache), and the layer order
is not retained when re-creating the layer.

Location:

trunk/gui/scripts

Files:

• map.tcl (modified) (10 diffs)
• mapviewer.tcl (modified) (1 diff)

trunk/gui/scripts/map.tcl

@@ -31 +31 @@
 
     public method addLayer { type name paramArray driver driverParamArray {stylesheet {}} {script {}} {selectors {}} }
+    public method addSelector { layerName selectorName paramArray }
     public method addViewpoint { name props }
     public method clearExtents {}
     public method deleteLayer { layerName }
+    public method deleteSelector { layerName selectorName }
     public method deleteViewpoint { viewpointName }
+    public method dirty { key args } {
+        if {[llength $args] == 0} {
+            if { [info exists _dirty($key)] } {
+                return $_dirty($key)
+            } else {
+                return 0
+            }
+        } else {
+            set _dirty($key) [lindex $args 0]
+        }
+    }
     public method getPlacardConfig { layerName }
     public method hasLayer { layerName }
@@ -50 +63 @@
     public method setAttribution { attribution }
     public method setCamera { camera }
+    public method setColormap { layerName colormap }
     public method setDescription { description }
     public method setExtents { xmin ymin xmax ymax {srs "wgs84"} }
@@ -55 +69 @@
     public method setPlacardConfig { layerName attrlist style padding }
     public method setProjection { projection }
+    public method setScript { layerName script }
     public method setStyle { style }
+    public method setStylesheet { layerName stylesheet }
     public method setToolInfo { id name command title revision }
     public method setType { type }
@@ -70 +86 @@
     private variable _tree "";         # Tree of information about the map.
     private variable _isValid 0;
+    private variable _dirty;
+    array set _dirty {
+        viewpoints 0
+    }
     private common _nextSelector 0;
     private common _layerTypes
@@ -765 +785 @@
         }
     }
+    set _dirty($id) 1
     return $id
 }
@@ -804 +825 @@
     }
     $_tree delete $id
+    array unset _dirty $layerName
 }
 
@@ -868 +890 @@
 }
 
+itcl::body Rappture::Map::setScript { layerName script } {
+    set id [$_tree findchild root->"layers" $layerName]
+    if { $id < 0 } {
+        error "unknown layer \"$layerName\""
+    }
+    $_tree set $id "script" $script
+    set _dirty($layerName) 1
+}
+
+itcl::body Rappture::Map::setStylesheet { layerName stylesheet } {
+    set id [$_tree findchild root->"layers" $layerName]
+    if { $id < 0 } {
+        error "unknown layer \"$layerName\""
+    }
+    $_tree set $id "stylesheet" $stylesheet
+    set _dirty($layerName) 1
+}
+
+itcl::body Rappture::Map::setColormap { layerName colormap } {
+    set id [$_tree findchild root->"layers" $layerName]
+    if { $id < 0 } {
+        error "unknown layer \"$layerName\""
+    }
+    $_tree set $id "colorramp.colormap" $colormap
+    set _dirty($layerName) 1
+}
+
 # ----------------------------------------------------------------------
 # USAGE: selectors
@@ -904 +953 @@
         return 1
     }
+}
+
+itcl::body Rappture::Map::addSelector { layerName name params } {
+    set nodeid $name
+    set layerid [$_tree findchild root->"layers" $layerName]
+    if { $layerid < 0 } {
+        error "unknown layer \"$layerName\""
+    }
+    if {[hasSelector $layerName $nodeid]} {
+        error "Selector '$nodeid' already exists"
+    }
+    set parent [$_tree findchild root->"layers"->"$layerName" "selectors"]
+    if { $parent == "" } {
+        set parent [$_tree insert $layerid -label "selectors"]
+    }
+    set child [$_tree insert $parent -label $nodeid]
+    array set info $params
+    foreach key { name style styleExpression query queryBounds queryOrderBy } {
+        if { [info exists info($key)] &&
+             $info($key) != ""} {
+            $_tree set $child $key $info($key)
+        }
+    }
+    set _dirty($layerName) 1
+}
+
+itcl::body Rappture::Map::deleteSelector { layerName selectorName } {
+    set id [$_tree findchild root->"layers"->"$layerName"->"selectors" $selectorName]
+    if { $id < 0 } {
+        error "unknown selector \"$selectorName\""
+    }
+    $_tree delete $id
+    set _dirty($layerName) 1
 }
 
@@ -971 +1053 @@
         $_tree set $child z $info(altitude)
     }
+    set _dirty(viewpoints) 1
 }
 
@@ -979 +1062 @@
     }
     $_tree delete $id
+    set _dirty(viewpoints) 1
 }
 

trunk/gui/scripts/mapviewer.tcl

@@ -1467 +1467 @@
                 set _layers($tag) 1
                 SetLayerStyle $dataobj $layer
-            }
+            } elseif { [$dataobj dirty $layer] } {
+                # Recreate layer
+                # FIXME: retain layer order
+                SendCmd "map layer delete $tag"
+                SetLayerStyle $dataobj $layer
+            }
+            $dataobj dirty $layer 0
             # Don't change visibility of shared/base layers
             if { !$info(shared) } {