Changeset 4321 for trunk

Timestamp:

Apr 6, 2014, 5:59:32 PM (11 years ago)

Author:

ldelgass

Message:

Renamed 'dataset coords' response to 'map coords', handle invalid coords,
response with/without screen/mouse coords

File:

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

trunk/gui/scripts/mapviewer.tcl

@@ -83 +83 @@
     protected method Pan {option x y}
     protected method Rebuild {}
-    protected method ReceiveDataset { args }
+    protected method ReceiveMapInfo { args }
     protected method ReceiveImage { args }
     protected method Rotate {option x y}
@@ -134 +134 @@
     private variable _motion 
     private variable _sendEarthFile 0
-    private variable _useServerManip 1
+    private variable _useServerManip 0
 }
 
@@ -170 +170 @@
     #
     $_parser alias image    [itcl::code $this ReceiveImage]
-    $_parser alias dataset  [itcl::code $this ReceiveDataset]
+    $_parser alias map      [itcl::code $this ReceiveMapInfo]
     $_parser alias camera   [itcl::code $this camera]
 
@@ -846 +846 @@
 
 #
-# ReceiveDataset --
-#
-itcl::body Rappture::MapViewer::ReceiveDataset { args } {
+# ReceiveMapInfo --
+#
+itcl::body Rappture::MapViewer::ReceiveMapInfo { args } {
     if { ![isconnected] } {
         return
@@ -855 +855 @@
     switch -- $option {
         "coords" {
-            foreach { x y z } [lrange $args 1 end] break
-            puts stderr "Coords: $x $y $z"
+            set len [llength $args]
+            if {$len < 4} {
+                puts stderr "Coords out of range"
+            } elseif {$len < 6} {
+                foreach { x y z } [lrange $args 1 end] break
+                puts stderr "Coords: $x $y $z"
+            } else {
+                foreach { x y z pxX pxY } [lrange $args 1 end] break
+                puts stderr "Coords($pxX,$pxY): $x $y $z"
+            }
         }
         "names" {
             foreach { name } [lindex $args 1] {
-                #puts stderr "layer: $name"
+                puts stderr "layer: $name"
             }
         }
         default {
-            error "unknown dataset option \"$option\" from server"
+            error "unknown map option \"$option\" from server"
         }
     }