Changeset 5994 for branches/blt4_geovis/gui/scripts/mapviewer.tcl

Timestamp:

Feb 9, 2016 10:23:21 PM (8 years ago)

Author:

dkearney

Message:

merging in placard configuration updates, placard example, feature select example, and add-remove layer example from geomap branch r5971,r5990,r5991,r5993

Location:

branches/blt4_geovis

Files:

• . (modified) (1 prop)
• gui/scripts/mapviewer.tcl (modified) (7 diffs, 1 prop)

branches/blt4_geovis/gui/scripts/mapviewer.tcl

@@ -1427 +1427 @@
 
 itcl::body Rappture::MapViewer::EnablePanningMouseBindings {} {
-    if {$_useServerManip} {
+    if {1 || $_useServerManip} {
         bind $itk_component(view) <ButtonPress-1> \
             [itcl::code $this MouseClick 1 %x %y]
@@ -1451 +1451 @@
 
 itcl::body Rappture::MapViewer::EnableRotationMouseBindings {} {
-    if {$_useServerManip} {
-        bind $itk_component(view) <ButtonPress-2> \
-            [itcl::code $this Rotate click %x %y]
-        bind $itk_component(view) <B2-Motion> \
-            [itcl::code $this Rotate drag %x %y]
-        bind $itk_component(view) <ButtonRelease-2> \
-            [itcl::code $this Rotate release %x %y]
-    } else {
+    if {1 || $_useServerManip} {
         # Bindings for rotation via mouse
         bind $itk_component(view) <ButtonPress-2> \
@@ -1466 +1459 @@
         bind $itk_component(view) <ButtonRelease-2> \
             [itcl::code $this MouseRelease 2 %x %y]
+    } else {
+        bind $itk_component(view) <ButtonPress-2> \
+            [itcl::code $this Rotate click %x %y]
+        bind $itk_component(view) <B2-Motion> \
+            [itcl::code $this Rotate drag %x %y]
+        bind $itk_component(view) <ButtonRelease-2> \
+            [itcl::code $this Rotate release %x %y]
     }
 }
@@ -1476 +1476 @@
 
 itcl::body Rappture::MapViewer::EnableZoomMouseBindings {} {
-    if {$_useServerManip} {
+    if {1 || $_useServerManip} {
         bind $itk_component(view) <ButtonPress-3> \
             [itcl::code $this MouseClick 3 %x %y]
@@ -1770 +1770 @@
 itcl::body Rappture::MapViewer::Pan {option x y} {
     switch -- $option {
-        "set" {
-            set w [winfo width $itk_component(view)]
-            set h [winfo height $itk_component(view)]
-            set x [expr $x / double($w)]
-            set y [expr $y / double($h)]
-            if {[expr (abs($x) > 0.0 || abs($y) > 0.0)]} {
-                SendCmd "camera pan $x $y"
-            }
-            return
-        }
         "click" {
             set _click(x) $x
@@ -1813 +1803 @@
             $itk_component(view) configure -cursor ""
             set _b1mode ""
+        }
+        "set" {
+            set w [winfo width $itk_component(view)]
+            set h [winfo height $itk_component(view)]
+            set x [expr $x / double($w)]
+            set y [expr $y / double($h)]
+            if {[expr (abs($x) > 0.0 || abs($y) > 0.0)]} {
+                SendCmd "camera pan $x $y"
+            }
+            return
         }
         default {
@@ -2884 +2884 @@
             SendCmd "map layer opacity $style(-opacity) $layer"
         }
+    }
+
+    if {[info exists info(placard)]} {
+        array set placard [$dataobj getPlacardConfig $layer]
+        SendCmd [list placard config $placard(attrlist) $placard(style) $placard(padding) $layer]
     }