Changeset 5950 for trunk/gui/scripts/mapviewer.tcl

Timestamp:

Jan 6, 2016, 4:43:18 PM (9 years ago)

Author:

ldelgass

Message:

Add selection callback to map viewer, make public select method notify server
of selections originating from outside the map viewer widget.

File:

• trunk/gui/scripts/mapviewer.tcl (modified) (9 diffs)

trunk/gui/scripts/mapviewer.tcl

@@ -62 +62 @@
     public method scale {args}
     public method select {option {args ""}}
+    public method setSelectCallback {cmd}
 
     private method KeyPress { key }
@@ -91 +92 @@
     private method DoRotate {}
     private method DoSelect {}
+    private method DoSelectCallback {option {args ""}}
     private method DrawLegend { colormap min max }
     private method EarthFile {}
@@ -113 +115 @@
     private method ReceiveMapInfo { args }
     private method ReceiveScreenInfo { args }
+    private method ReceiveSelect { option {args ""} }
     private method RequestLegend { colormap w h }
     private method Rotate {option x y}
@@ -139 +142 @@
                                         # layer in the server.
     private variable _viewpoints;
+    private variable _selectCallback "";
     private variable _click;            # info used for rotate operations
     private variable _view;             # view params for 3D view
@@ -215 +219 @@
     $_parser alias camera   [itcl::code $this camera]
     $_parser alias screen   [itcl::code $this ReceiveScreenInfo]
-    $_parser alias select   [itcl::code $this select]
+    $_parser alias select   [itcl::code $this ReceiveSelect]
 
     # Millisecond delay before animated wait dialog appears
@@ -877 +881 @@
 }
 
-# ----------------------------------------------------------------------
-# USAGE: select clear
-# USAGE: select feature
-# USAGE: select annotation
-# ----------------------------------------------------------------------
-itcl::body Rappture::MapViewer::select {option {args ""}} {
+itcl::body Rappture::MapViewer::setSelectCallback {cmd} {
+    set _selectCallback $cmd
+}
+
+itcl::body Rappture::MapViewer::DoSelectCallback {option {args ""}} {
+    if { $_selectCallback != "" } {
+        set cmd [concat $_selectCallback $option $args]
+        uplevel #0 $cmd
+    }
+}
+
+# ----------------------------------------------------------------------
+# USAGE: ReceiveSelect clear
+# USAGE: ReceiveSelect feature <args...>
+# USAGE: ReceiveSelect annotation <args...>
+# ----------------------------------------------------------------------
+itcl::body Rappture::MapViewer::ReceiveSelect {option {args ""}} {
     DebugTrace "Enter"
     switch $option {
@@ -889 +904 @@
         }
         "clear" {
-             puts stderr "select clear"
+            puts stderr "select clear"
         }
         "feature" {
-             puts stderr "select feature $args"
+            puts stderr "select feature $args"
+        }
+    }
+    eval DoSelectCallback $option $args
+}
+
+# ----------------------------------------------------------------------
+# USAGE: select clear
+# USAGE: select feature <args...>
+# USAGE: select annotation <args...>
+#
+# Clients use this method to notify the map widget of a selection event
+# originating from outside the map
+# ----------------------------------------------------------------------
+itcl::body Rappture::MapViewer::select {option {args ""}} {
+    switch $option {
+        "annotation" {
+            SendCmd "select annotation $args"
+        }
+        "clear" {
+            SendCmd "select clear"
+        }
+        "feature" {
+            SendCmd "select feature $args"
+        }
+        default {
+            puts stderr "Unknown select option \"$option\""
         }
     }
@@ -1254 +1295 @@
     set _first ""
     set haveTerrain 0
+    #SendCmd "map layer visible 0"
     foreach dataobj [get -objects] {
         if { [info exists _obj2ovride($dataobj-raise)] &&  $_first == "" } {
@@ -2479 +2521 @@
             set selectors [list]
             foreach selector [$dataobj selectors $layer] {
-               array set sinfo [$dataobj selector $layer $selector]
+                array set sinfo [$dataobj selector $layer $selector]
                 DebugTrace "$selector: [array get sinfo]"
                 lappend selectors [array get sinfo]