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

Timestamp:

Oct 8, 2014, 10:27:06 AM (10 years ago)

Author:

ldelgass

Message:

Initial test of selection box

File:

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

trunk/gui/scripts/mapviewer.tcl

@@ -70 +70 @@
     protected method CurrentLayers {args}
     protected method Disconnect {}
+    protected method DoPan {}
     protected method DoResize {}
     protected method DoRotate {}
@@ -88 +89 @@
     protected method ReceiveImage { args }
     protected method Rotate {option x y}
+    protected method Select {option x y}
     protected method Zoom {option {x 0} {y 0}}
 
@@ -96 +98 @@
     private method BuildTerrainTab {}
     private method ChangeLayerVisibility { dataobj layer }
-    private method EventuallyHandleMotionEvent { x y } 
+    private method EventuallyHandleMotionEvent { x y }
+    private method EventuallyPan { dx dy }
     private method EventuallyResize { w h } 
     private method EventuallyRotate { dx dy } 
@@ -115 +118 @@
     private variable _click;            # info used for rotate operations
     private variable _view;             # view params for 3D view
+    private variable _pan;
+    private variable _rotate;
+    private variable _motion;
     private variable _settings
     private variable _visibility
@@ -122 +128 @@
                                         # needs to be reinitialized.
     private variable _initCamera 1;
-    private variable _haveTerrain 0
+    private variable _haveTerrain 0;
 
     private variable _first ""     ;# This is the topmost dataset.
@@ -133 +139 @@
     private variable _height 0
     private variable _resizePending 0
-    private variable _rotatePending 0
-    private variable _rotateDelay 150
-    private variable _motion 
     private variable _sendEarthFile 0
     private variable _useServerManip 0
     private variable _labelCount 0
+    private variable _b1mode "pan"
 }
 
@@ -161 +165 @@
     $_dispatcher register !resize
     $_dispatcher dispatch $this !resize "[itcl::code $this DoResize]; list"
+
+    # Pan event
+    $_dispatcher register !pan
+    $_dispatcher dispatch $this !pan "[itcl::code $this DoPan]; list"
 
     # Rotate event
@@ -187 +195 @@
         x               0
         y               0
+    }
+    array set _pan {
+        compress        1
+        delay           100
+        pending         0
+        x               0
+        y               0
+    }
+    array set _rotate {
+        azimuth         0
+        compress        1
+        delay           100
+        elevation       0
+        pending         0
     }
     # This array holds the Viewpoint parameters that the
@@ -366 +388 @@
             +[itcl::code $this Pin delete %x %y]
 
+        bind $itk_component(view) <Shift-ButtonPress-1> \
+            [itcl::code $this Select click %x %y]
+        bind $itk_component(view) <B1-Motion> \
+            +[itcl::code $this Select drag %x %y]
+        bind $itk_component(view) <Shift-ButtonRelease-1> \
+            +[itcl::code $this Select release %x %y]
+
+        if {1} {
         # Bindings for rotation via mouse
         bind $itk_component(view) <ButtonPress-2> \
@@ -373 +403 @@
         bind $itk_component(view) <ButtonRelease-2> \
             [itcl::code $this Rotate release %x %y]
+        }
 
         # Bindings for zoom via mouse
@@ -473 +504 @@
 
 itcl::body Rappture::MapViewer::DoRotate {} {
-    SendCmd "camera rotate $_view(azimuth) $_view(elevation)"
-    set _rotatePending 0
+    SendCmd "camera rotate $_rotate(azimuth) $_rotate(elevation)"
+    set _rotate(azimuth) 0
+    set _rotate(elevation) 0
+    set _rotate(pending) 0
 }
 
@@ -486 +519 @@
 }
 
+itcl::body Rappture::MapViewer::DoPan {} {
+    SendCmd "camera pan $_pan(x) $_pan(y)"
+    set _pan(x) 0
+    set _pan(y) 0
+    set _pan(pending) 0
+}
+
+itcl::body Rappture::MapViewer::EventuallyPan { dx dy } {
+    set _pan(x) [expr $_pan(x) + $dx]
+    set _pan(y) [expr $_pan(y) + $dy]
+    if { !$_pan(compress) } {
+        DoPan
+        return
+    }
+    if { !$_pan(pending) } {
+        set _pan(pending) 1
+        $_dispatcher event -after $_pan(delay) !pan
+    }
+}
+
 itcl::body Rappture::MapViewer::EventuallyRotate { dx dy } {
-    set _view(azimuth) $dx
-    set _view(elevation) $dy
-    if { !$_rotatePending } {
-        set _rotatePending 1
-        $_dispatcher event -after $_rotateDelay !rotate
+    set _rotate(azimuth) [expr $_rotate(azimuth) + $dx]
+    set _rotate(elevation) [expr $_rotate(elevation) + $dy]
+    if { !$_rotate(compress) } {
+        DoRotate
+        return
+    }
+    if { !$_rotate(pending) } {
+        set _rotate(pending) 1
+        $_dispatcher event -after $_rotate(delay) !rotate
     }
 }
@@ -845 +902 @@
     VisViewer::Disconnect
 
+    $_dispatcher cancel !pan
+    $_dispatcher cancel !motion
     $_dispatcher cancel !rebuild
     $_dispatcher cancel !resize
     $_dispatcher cancel !rotate
-    $_dispatcher cancel !motion
     # disconnected -- no more data sitting on server
     array unset _layers
@@ -1265 +1323 @@
             set _click(x) $x
             set _click(y) $y
+            set _rotate(azimuth) 0
+            set _rotate(elevation) 0
         }
         "drag" {
@@ -1280 +1340 @@
                 set _click(y) $y
                 if {[expr (abs($dx) > 0.0 || abs($dy) > 0.0)]} {
-                    SendCmd "camera rotate $dx $dy"
-                    #EventuallyRotate $dx $dy
+                    #SendCmd "camera rotate $dx $dy"
+                    EventuallyRotate $dx $dy
                 }
             }
@@ -1292 +1352 @@
         default {
             error "bad option \"$option\": should be click, drag, release"
+        }
+    }
+}
+
+itcl::body Rappture::MapViewer::Select {option x y} {
+    switch -- $option {
+        "click" {
+            set _click(x) $x
+            set _click(y) $y
+            set _b1mode "select"
+            SendCmd "map box init $x $y"
+        }
+        "drag" {
+            if {$_b1mode == "select"} {
+                SendCmd "map box update $x $y"
+            }
+        }
+        "release" {
+            set _b1mode ""
+            if {$_click(x) == $x &&
+                $_click(y) == $y} {
+                SendCmd "map box clear"
+            }
         }
     }
@@ -1335 +1418 @@
             set _click(x) $x
             set _click(y) $y
+            set _pan(x) 0
+            set _pan(y) 0
             $itk_component(view) configure -cursor hand1
+            set _b1mode "pan"
         }
         "drag" {
+            if {$_b1mode != "pan"} {
+                return
+            }
             if { ![info exists _click(x)] } {
                 set _click(x) $x
@@ -1351 +1440 @@
             set _click(y) $y
             if {[expr (abs($dx) > 0.0 || abs($dy) > 0.0)]} {
-                SendCmd "camera pan $dx $dy"
+                EventuallyPan $dx $dy
+                #SendCmd "camera pan $dx $dy"
             }
         }
@@ -1357 +1447 @@
             Pan drag $x $y
             $itk_component(view) configure -cursor ""
+            set _b1mode ""
         }
         default {