Changeset 6016 for trunk/gui/scripts

Timestamp:

Feb 15, 2016, 1:01:02 PM (9 years ago)

Author:

ldelgass

Message:

Check for existence of controls before configuring them in Rebuild

File:

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

trunk/gui/scripts/mapviewer.tcl

@@ -1214 +1214 @@
             set bgcolor [Color2RGB $settings(-color)]
             if { $_mapsettings(type) == "geocentric" } {
-                $itk_component(grid) configure -state normal
-                $itk_component(time_l) configure -state normal
-                $itk_component(time) configure -state normal
-                $itk_component(pitch_slider_l) configure -state normal
-                $itk_component(pitch_slider) configure -state normal
+                if { [info exists itk_component(grid)] } {
+                    $itk_component(grid) configure -state normal
+                }
+                if { [info exists itk_component(time)] } {
+                    $itk_component(time_l) configure -state normal
+                    $itk_component(time) configure -state normal
+                }
+                if { [info exists tk_component(pitch_slider)] } {
+                    $itk_component(pitch_slider_l) configure -state normal
+                    $itk_component(pitch_slider) configure -state normal
+                }
                 EnableRotationMouseBindings
                 SendCmd "map reset geocentric $bgcolor"
             }  else {
-                $itk_component(grid) configure -state disabled
-                $itk_component(time_l) configure -state disabled
-                $itk_component(time) configure -state disabled
-                $itk_component(pitch_slider_l) configure -state disabled
-                $itk_component(pitch_slider) configure -state disabled
+                if { [info exists itk_component(grid)] } {
+                    $itk_component(grid) configure -state disabled
+                }
+                if { [info exists itk_component(time)] } {
+                    $itk_component(time_l) configure -state disabled
+                    $itk_component(time) configure -state disabled
+                }
+                if { [info exists tk_component(pitch_slider)] } {
+                    $itk_component(pitch_slider_l) configure -state disabled
+                    $itk_component(pitch_slider) configure -state disabled
+                }
                 DisableRotationMouseBindings
                 set proj $_mapsettings(projection)
@@ -1263 +1275 @@
     set _first ""
     set haveTerrain 0
-    #SendCmd "map layer visible 0"
     foreach dataobj [get -objects] {
         if { [info exists _obj2ovride($dataobj-raise)] &&  $_first == "" } {
@@ -1286 +1297 @@
                 SetLayerStyle $dataobj $layer
             }
-            if {$info(type) == "elevation"} {
-                set haveTerrain 1
-            }
             # FIXME: This is overriding all layers' initial visibility setting
             if { [info exists _obj2ovride($dataobj-raise)] &&
@@ -1295 +1303 @@
                 set _visibility($layer) 1
             }
+            if {$info(type) == "elevation"} {
+                set haveTerrain 1
+            }
         }
     }
 
     if ($haveTerrain) {
-        $itk_component(vscale_l) configure -state normal
-        $itk_component(vscale) configure -state normal
+        if { [info exists itk_component(vscale)] } {
+            $itk_component(vscale_l) configure -state normal
+            $itk_component(vscale) configure -state normal
+        }
     } else {
-        $itk_component(vscale_l) configure -state disabled
-        $itk_component(vscale) configure -state disabled
+        if { [info exists itk_component(vscale)] } {
+            $itk_component(vscale_l) configure -state disabled
+            $itk_component(vscale) configure -state disabled
+        }
     }
 
@@ -2171 +2186 @@
                 set _view($name) $value
             }
-#            puts stderr "view: $_view(x), $_view(y), $_view(z), $_view(heading), $_view(pitch), $_view(distance), {$_view(srs)}, {$_view(verticalDatum)}"
+            DebugTrace "view: $_view(x), $_view(y), $_view(z), $_view(heading), $_view(pitch), $_view(distance), {$_view(srs)}, {$_view(verticalDatum)}"
         }
         "go" {
@@ -2212 +2227 @@
                 SendCmd "camera reset"
                 # Retrieve the settings
-               # SendCmd "camera get"
+                #SendCmd "camera get"
             }
         }