Changeset 5949 for branches/geomap

Timestamp:

Dec 18, 2015 1:19:46 AM (8 years ago)

Author:

dkearney

Message:

adding data provider and layer objects, updating mapviewer to remove layers from client and server.

Location:

branches/geomap/gui

Files:

• scripts/Makefile.in (modified) (1 diff)
• scripts/geomapdataprovider.tcl (added)
• scripts/geomapdataprovidercolorramp.tcl (added)
• scripts/geomapdataprovidergdal.tcl (added)
• scripts/geomapdataproviderogr.tcl (added)
• scripts/geomapdataprovidertfs.tcl (added)
• scripts/geomapdataprovidertms.tcl (added)
• scripts/geomapdataproviderwfs.tcl (added)
• scripts/geomapdataproviderwms.tcl (added)
• scripts/geomapdataproviderxyz.tcl (added)
• scripts/geomaplayer.tcl (added)
• scripts/geomaplayerimage.tcl (added)
• scripts/map.tcl (modified) (5 diffs)
• scripts/mapviewer.tcl (modified) (10 diffs)
• test/geomapdataprovider.test (added)
• test/geomapdataprovidercolorramp.test (added)
• test/geomapdataprovidergdal.test (added)
• test/geomapdataproviderogr.test (added)
• test/geomapdataprovidertfs.test (added)
• test/geomapdataprovidertms.test (added)
• test/geomapdataproviderwfs.test (added)
• test/geomapdataproviderwms.test (added)
• test/geomapdataproviderxyz.test (added)
• test/geomaplayer.test (added)
• test/geomaplayerimage.test (added)
• test/map.test (added)

branches/geomap/gui/scripts/Makefile.in

@@ -61 +61 @@
                 $(srcdir)/gauge.tcl \
                 $(srcdir)/getopts.tcl \
+                $(srcdir)/geomapdataprovider.tcl \
+                $(srcdir)/geomapdataprovidercolorramp.tcl \
+                $(srcdir)/geomapdataprovidergdal.tcl \
+                $(srcdir)/geomapdataproviderogr.tcl \
+                $(srcdir)/geomapdataprovidertfs.tcl \
+                $(srcdir)/geomapdataprovidertms.tcl \
+                $(srcdir)/geomapdataproviderwfs.tcl \
+                $(srcdir)/geomapdataproviderwms.tcl \
+                $(srcdir)/geomapdataproviderxyz.tcl \
+                $(srcdir)/geomaplayer.tcl \
+                $(srcdir)/geomaplayerimage.tcl \
                 $(srcdir)/grab.tcl \
                 $(srcdir)/groupentry.tcl \

branches/geomap/gui/scripts/map.tcl

@@ -37 +37 @@
         return $_isValid;
     }
-    public method layer { layerName }
+    public method layer { option args }
     public method layers {}
     public method selectors { layerName }
@@ -54 +54 @@
 
     protected method Parse { xmlobj path }
+
+    private method AddLayer { args }
+    private method DeleteLayer { layerName }
+    private method GetLayerNames {}
+    private method GetLayerSettings { layerName }
+
 
     private variable _tree "";         # Tree of information about the map.
@@ -446 +452 @@
 
 # ----------------------------------------------------------------------
-# USAGE: layers
-#
-# Returns a list of IDs for the layers in the map
-# ----------------------------------------------------------------------
-itcl::body Rappture::Map::layers {} {
-    set list {}
-    foreach node [$_tree children root->"layers"] {
-        lappend list [$_tree label $node]
-    }
-    return $list
-}
-
-# ----------------------------------------------------------------------
 # USAGE: viewpoints
 #
@@ -472 +465 @@
 
 # ----------------------------------------------------------------------
+# USAGE: AddLayer -format <format>
+#
+# Associate a new layer to the map
+# ----------------------------------------------------------------------
+itcl::body Rappture::Map::AddLayer { args } {
+    set layerName ""
+    set valids "-format"
+    set format "blt_tree"
+
+    set layerObj [lrange $args end end]
+    set args [lrange $args 0 end-1]
+
+    while {[llength $args] > 0} {
+        set flag [lindex $args 0]
+        switch -- $flag {
+            "-format" {
+                if {[llength $args] > 1} {
+                    set format [lindex $args 1]
+                    set args [lrange $args 2 end]
+                } else {
+                    error "wrong number args: should be ?-format <format>?"
+                }
+            }
+            default {
+                error "invalid option \"$flag\": should be one of $valids"
+            }
+        }
+    }
+
+    set valids "blt_tree"
+
+    switch -- $format {
+        "blt_tree" {
+            # check if a layer by the same name already exists
+            set layerName "layer[incr _nextLayer]"
+            if {[$_tree findchild root->"layers" $layerName] != -1} {
+                error "key error \"$layerName\": layer name exists"
+            }
+            # copy the incomming layer data into our map object
+            set id [$layerObj copy root $_tree root->"layers"]
+            # give the layer a searchable layer name
+            $_tree label $id $layerName
+        }
+        default {
+            error "bad format \"$format\": should be one of $valids"
+        }
+    }
+
+    return $layerName
+}
+
+# ----------------------------------------------------------------------
+# USAGE: DeleteLayer <layerName>
+#
+# Remove a layer from the map
+# ----------------------------------------------------------------------
+itcl::body Rappture::Map::DeleteLayer { layerName } {
+    set id [$_tree findchild root->"layers" $layerName]
+    if {$id <= 0} {
+        # layer not found
+        error "invalid layer \"$layerName\": should be one of [GetLayerNames]"
+    }
+    # delete the layer
+    $_tree delete $id
+}
+
+
+# ----------------------------------------------------------------------
+# USAGE: GetLayerNames
+# USAGE: layers
+#
+# Returns a list of IDs for the layers in the map
+# ----------------------------------------------------------------------
+itcl::body Rappture::Map::GetLayerNames {} {
+    set list {}
+    foreach node [$_tree children root->"layers"] {
+        lappend list [$_tree label $node]
+    }
+    return $list
+}
+
+# ----------------------------------------------------------------------
+# USAGE: GetLayerSettings <layerName>
 # USAGE: layer <layerName>
 #
-# Returns an array of settings for the named layer
-# ----------------------------------------------------------------------
-itcl::body Rappture::Map::layer { layerName } {
+# Returns a list of settings for the named layer
+# ----------------------------------------------------------------------
+itcl::body Rappture::Map::GetLayerSettings { layerName } {
     set id [$_tree findchild root->"layers" $layerName]
     if { $id < 0 } {
@@ -483 +559 @@
     return [$_tree get $id]
 }
+
+# ----------------------------------------------------------------------
+# USAGE: layer
+#
+#   This public method is called by clients using this widget to manage
+#   layers in the map.
+#
+#       layer add ?-type type? layerData
+#       layer delete layerName
+#       layer names
+#       layer settings layerName
+#
+itcl::body Rappture::Map::layer {option args} {
+    set result ""
+    switch -- $option {
+        "add" {
+            set result [eval AddLayer $args]
+        }
+        "delete" {
+            set result [eval DeleteLayer $args]
+        }
+        "names" {
+            set result [GetLayerNames]
+        }
+        "settings" {
+            set result [GetLayerSettings $args]
+        }
+        default {
+            error "unknown layer option \"$option\""
+        }
+    }
+    return $result
+}
+
 
 # ----------------------------------------------------------------------

branches/geomap/gui/scripts/mapviewer.tcl

@@ -53 +53 @@
     public method camera {option args}
     public method delete {args}
+    public method remove {args}
     public method disconnect {}
     public method download {option args}
@@ -62 +63 @@
     public method scale {args}
     public method select {option {args ""}}
+
+    public method send { cmd }
 
     private method KeyPress { key }
@@ -535 +538 @@
 }
 
+#
+# send --
+#
+#   Test method for dsk
+#
+#       send [list my command]
+#
+itcl::body Rappture::MapViewer::send {cmd} {
+    puts "sending: \"$cmd\""
+    SendCmd $cmd
+}
+
 itcl::body Rappture::MapViewer::DoResize {} {
     set sendResize 1
@@ -693 +708 @@
         }
         # When a map is marked deleted, we hide its layers.
-        foreach layer [$dataobj layers] {
+        foreach layer [$dataobj layer names] {
             SendCmd "map layer visible 0 $layer"
             set _visibility($layer) 0
+        }
+        # Remove it from the dataobj list.
+        set _dlist [lreplace $_dlist $pos $pos]
+        array unset _obj2ovride $dataobj-*
+        array unset _settings $dataobj-*
+        set changed 1
+    }
+    # If anything changed, then rebuild the plot
+    if { $changed } {
+        $_dispatcher event -idle !rebuild
+    }
+}
+
+# ----------------------------------------------------------------------
+# USAGE: remove ?<dataobj1> <dataobj2> ...?
+#
+# Clients use this to permanantly remove a dataobj from the client
+# and the server. If no dataobjs are specified, then all dataobjs
+# are removed. Unlike the delete method, dataobjects are permenantly
+# removed from both the client and the server and it is safe to add
+# them again without conflict in layer names.
+# ----------------------------------------------------------------------
+itcl::body Rappture::MapViewer::remove {args} {
+    DebugTrace "Enter"
+    if { [llength $args] == 0} {
+        set args $_dlist
+    }
+    # Remove all specified dataobjs
+    set changed 0
+    foreach dataobj $args {
+        set pos [lsearch -exact $_dlist $dataobj]
+        if { $pos < 0 } {
+            continue;                   # Don't know anything about it.
+        }
+        # Remove the layers from the client and server.
+        foreach layer [$dataobj layer names] {
+            SendCmd "map layer delete $layer"
+            if { [info exists _layers($layer)] } {
+                array unset _layers $layer
+            }
+            if { [info exists _opacity($layer)] } {
+                array unset _opacity $layer
+            }
+            if { [info exists _visibility($layer)] } {
+                array unset _visibility $layer
+            }
         }
         # Remove it from the dataobj list.
@@ -851 +912 @@
             }
         }
-        foreach layer [$dataobj layers] {
+        foreach layer [$dataobj layer names] {
             if { [$dataobj type $layer] == "elevation" } {
                 set _haveTerrain 1
@@ -1258 +1319 @@
             set _first $dataobj
         }
-        foreach layer [$dataobj layers] {
+        foreach layer [$dataobj layer names] {
             array unset info
-            array set info [$dataobj layer $layer]
+            array set info [$dataobj layer settings $layer]
             if { ![info exists _layers($layer)] } {
                 if { $_reportClientInfo }  {
@@ -1430 +1491 @@
     set rlist ""
     foreach dataobj $dlist {
-        foreach layer [$dataobj layers] {
+        foreach layer [$dataobj layer names] {
             if { [info exists _layers($layer)] && $_layers($layer) } {
                 lappend rlist $layer
@@ -2364 +2425 @@
 
 itcl::body Rappture::MapViewer::SetLayerStyle { dataobj layer } {
-    array set info [$dataobj layer $layer]
+    array set info [$dataobj layer settings $layer]
     if { [info exists info(visible)] &&
          !$info(visible) } {
@@ -2802 +2863 @@
     set imgIdx 0
     foreach dataobj [get -objects] {
-        foreach layer [$dataobj layers] {
+        foreach layer [$dataobj layer names] {
             array unset info
-            array set info [$dataobj layer $layer]
+            array set info [$dataobj layer settings $layer]
             checkbutton $f.${layer}_visible \
                 -text $info(label) \
@@ -2946 +3007 @@
 
     foreach dataobj [get -objects] {
-        foreach layer [$dataobj layers] {
+        foreach layer [$dataobj layer names] {
             set _layers($layer) 1
             array unset info
-            array set info [$dataobj layer $layer]
+            array set info [$dataobj layer settings $layer]
             switch -- $info(type) {
                 "image" {