Changeset 4330 for trunk/gui

Timestamp:

Apr 7, 2014 4:30:15 AM (10 years ago)

Author:

ldelgass

Message:

Fix up camera reset. Since we still reset with a default base layer, force
a valid render while that layer exists before deleting the layer.

File:

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

trunk/gui/scripts/mapviewer.tcl

@@ -119 +119 @@
     private variable _reset 1;          # Indicates that server was reset and
                                         # needs to be reinitialized.
+    private variable _initCamera 1;
     private variable _haveTerrain 0
 
@@ -940 +941 @@
                     }
                 }
+                # XXX: Remove these after implementing batch load of layers with reset
+                # This is needed to force a valid render before deleting the base layer
+                # Don't want to flush since we don't need to see this image
+                SendCmd "render"
                 SendCmd "map layer delete base"
             }
@@ -956 +961 @@
             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"
     }
 
@@ -1002 +995 @@
                 #SetLayerOpacity $layer
             }
+        }
+    }
+
+    if {$_reset} {
+        if {$_initCamera} {
+            # If this is the first Rebuild, we need to
+            # set up the initial view settings if there
+            # are any
+            if { [info exists _mapsettings(camera)] } {
+                set location $_mapsettings(camera)
+                if { $location != "" } {
+                    array set _view $location
+                    camera set all
+                }
+            }
+            set _initCamera 0
+        } else {
+            # Restore view from before reconnect
+            camera set all
         }
     }