Changeset 4329

Timestamp:

Apr 7, 2014 3:54:07 AM (10 years ago)

Author:

ldelgass

Message:

Partial fix for resets: need to set _reset in Connect, otherwise Rebuild was
being called without _reset set after connection was reopened -- not sure why.
Also, clear _layers array on reset. As camera is now set (via 'camera get') by
the server automatically, we need to reset the camera before any image is
returned, so reset the camera before image flush. Need to fix the server to
honor this on first render.

File:

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

trunk/gui/scripts/mapviewer.tcl

@@ -756 +756 @@
     global readyForNextFrame
     set readyForNextFrame 1
+    set _reset 1
     set _hosts [GetServerList "geovis"]
     if { "" == $_hosts } {
@@ -816 +817 @@
     VisViewer::Disconnect
 
+    $_dispatcher cancel !rebuild
+    $_dispatcher cancel !resize
+    $_dispatcher cancel !rotate
+    $_dispatcher cancel !motion
     # disconnected -- no more data sitting on server
+    array unset _layers
     array unset _layersFrame 
     global readyForNextFrame
@@ -947 +953 @@
                     terrain-vertscale terrain-wireframe
             }
-            SendCmd "imgflush"
-        }
+        } else {
+            error "No map settings on reset"
+        }
+
+        # FIXME: How to tell if this is the first reset?
+        # If we reset the connection, we shouldn't use
+        # the map settings
+        if { [info exists _mapsettings(camera)] } {
+            set location $_mapsettings(camera)
+            if { $location != "" } {
+                array set _view $location
+            }
+        }
+        camera set all
+        SendCmd "imgflush"
     }
 
@@ -985 +1004 @@
         }
     }
-    if { [info exists _mapsettings(camera)] } {
-        set location $_mapsettings(camera)
-        if { $location != "" } {
-            array set _view $location
-            camera set all
-        }
-    }
-    if { $_reset } {
-        camera reset
-    }
+
     UpdateLayerControls
     set _reset 0
@@ -1494 +1504 @@
     }
 
+    if {0} {
     button $inner.get \
         -text "Get Camera Settings" \
@@ -1511 +1522 @@
     blt::table configure $inner r$row -resize none
     incr row
+    }
 
     if {$_useServerManip} {
@@ -1545 +1557 @@
                 set _view($name) $value
             }
-puts stderr "view: $_view(x), $_view(y), $_view(z), $_view(heading), $_view(pitch), $_view(distance), $_view(srs), $_view(verticalDatum)"
+            puts stderr "view: $_view(x), $_view(y), $_view(z), $_view(heading), $_view(pitch), $_view(distance), $_view(srs), $_view(verticalDatum)"
         }
         "go" {
@@ -1571 +1583 @@
                     SendCmd "camera reset"
                     # Retrieve the settings
-                    SendCmd "camera get"
+                    #SendCmd "camera get"
                 }
             } else {
                 SendCmd "camera reset"
                 # Retrieve the settings
-                SendCmd "camera get"
+               # SendCmd "camera get"
             }
         }