Changeset 6082 for trunk/gui/scripts

Timestamp:

Feb 28, 2016, 11:44:21 PM (9 years ago)

Author:

ldelgass

Message:

Fixes for layer visibility

File:

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

trunk/gui/scripts/mapviewer.tcl

@@ -139 +139 @@
 
     private variable _dlist "";         # list of data objects
+    private variable _hidden "";        # list of hidden data objects
     private variable _obj2ovride;       # maps dataobj => style override
     private variable _layers;           # Contains the names of all the
@@ -682 +683 @@
         lappend _dlist $dataobj
     }
+    # Remove from hidden list
+    set pos [lsearch -exact $_hidden $dataobj]
+    if {$pos >= 0} {
+        set _hidden [lreplace $_hidden $pos $pos]
+    }
     set _obj2ovride($dataobj-raise) $params(-raise)
     $_dispatcher event -idle !rebuild
@@ -707 +713 @@
         # Remove it from the dataobj list.
         set _dlist [lreplace $_dlist $pos $pos]
+        # Add to hidden list
+        set pos [lsearch -exact $_hidden $dataobj]
+        if {$pos < 0} {
+            lappend _hidden $dataobj
+        }
         array unset _obj2ovride $dataobj-*
         set changed 1
@@ -745 +756 @@
                     lappend dlist $dataobj
                 }
+            }
+            return $dlist
+        }
+        "-hidden" {
+            set dlist {}
+            foreach dataobj $_hidden {
+                if { [info commands $dataobj] != $dataobj } {
+                    # dataobj was deleted, remove from list
+                    set pos [lsearch -exact $_hidden $dataobj]
+                    if {$pos >= 0} {
+                        set _hidden [lreplace $_hidden $pos $pos]
+                    }
+                    continue
+                }
+                if { ![$dataobj isvalid] } {
+                    continue
+                }
+                if { [info exists _obj2ovride($dataobj-raise)] } {
+                    puts stderr "ERROR: object on hidden list is visible"
+                }
+                lappend dlist $dataobj
             }
             return $dlist
@@ -1285 +1317 @@
     set _first ""
     set haveTerrain 0
+    foreach dataobj [get -hidden] {
+        foreach layer [$dataobj layers] {
+            if { ![$dataobj getLayerProperty $layer shared] } {
+                set tag $dataobj-$layer
+                SendCmd "map layer visible 0 $tag"
+            }
+        }
+    }
     foreach dataobj [get -objects] {
         if { [info exists _obj2ovride($dataobj-raise)] &&  $_first == "" } {
@@ -1293 +1333 @@
             array set info [$dataobj layer $layer]
             set tag $layer
+            if { !$info(shared) } {
+                set tag $dataobj-$layer
+            }
             if { ![info exists _layers($tag)] } {
                 if { $_reportClientInfo }  {
@@ -1308 +1351 @@
                 SetLayerStyle $dataobj $layer
             }
-            # FIXME: This is overriding all layers' initial visibility setting
-            if { [info exists _obj2ovride($dataobj-raise)] &&
-                 $_obj2ovride($dataobj-raise)} {
-                SendCmd "map layer visible 1 $tag"
-                set _visibility($tag) 1
+            # Don't change visibility of shared/base layers
+            if { !$info(shared) } {
+                # FIXME: This is overriding data layers' initial visibility
+                if { [info exists _obj2ovride($dataobj-raise)] } {
+                    SendCmd "map layer visible 1 $tag"
+                    set _visibility($tag) 1
+                } else {
+                    SendCmd "map layer visible 0 $tag"
+                    set _visibility($tag) 0
+                }
             }
             if {$info(type) == "elevation"} {
                 set haveTerrain 1
+            }
+        }
+        # Search our layer list for data layers removed from map object
+        foreach tag [array names _layers -glob $dataobj-*] {
+            set layer [string range $tag [string length "$dataobj-"] end]
+            if {![$dataobj hasLayer $layer]} {
+                DebugTrace "Delete layer: tag: $tag layer: $layer"
+                SendCmd "map layer delete $tag"
+                array unset _layers $tag
+                array unset _opacity $tag
+                array unset _visibility $tag
             }
         }
@@ -2436 +2495 @@
     array set info [$dataobj layer $layer]
     set tag $layer
+    if { !$info(shared) } {
+        set tag $dataobj-$layer
+    }
     if { [info exists info(visible)] &&
          !$info(visible) } {
@@ -2469 +2531 @@
                 }
                 "colorramp" {
-                    set cmapName $tag
+                    set cmapName "[regsub -all {::} ${tag} {}]"
                     SendFiles $info(colorramp.url)
                     SendCmd [list colormap define $cmapName $info(colorramp.colormap)]
@@ -2861 +2923 @@
 itcl::body Rappture::MapViewer::SetLayerOpacity { dataobj layer {value 100}} {
     set tag $layer
+    if {![$dataobj getLayerProperty $layer shared]} {
+        set tag $dataobj-$layer
+    }
     set val $_opacity($tag)
     set sval [expr { 0.01 * double($val) }]
@@ -2868 +2933 @@
 itcl::body Rappture::MapViewer::SetLayerVisibility { dataobj layer } {
     set tag $layer
+    if {![$dataobj getLayerProperty $layer shared]} {
+        set tag $dataobj-$layer
+    }
     set bool $_visibility($tag)
     SendCmd "map layer visible $bool $tag"
@@ -2890 +2958 @@
             set tag $layer
             set ctlname $layer
+            if {!$info(shared)} {
+                set tag $dataobj-$layer
+                set ctlname "[regsub -all {::} ${tag} {}]"
+            }
             checkbutton $f.${ctlname}_visible \
                 -text $info(label) \
@@ -2906 +2978 @@
                     }
                     itk_component add legend-$colormap-min {
-                        label $f.${layer}_legend-$colormap-min -text 0
+                        label $f.legend-$colormap-min -text 0
                     }
                     itk_component add legend-$colormap-max {
-                        label $f.${layer}_legend-$colormap-max -text 1
+                        label $f.legend-$colormap-max -text 1
                     }
                     itk_component add legend-$colormap {
-                        label $f.${layer}_legend-$colormap -image $_image(legend-$colormap)
-                    }
-                    blt::table $f $row,0 $f.${layer}_legend-$colormap-min -anchor w -pady 0
-                    blt::table $f $row,1 $f.${layer}_legend-$colormap-max -anchor e -pady 0
+                        label $f.legend-$colormap -image $_image(legend-$colormap)
+                    }
+                    blt::table $f $row,0 $f.legend-$colormap-min -anchor w -pady 0
+                    blt::table $f $row,1 $f.legend-$colormap-max -anchor e -pady 0
                     incr row
-                    blt::table $f $row,0 $f.${layer}_legend-$colormap -anchor w -pady 2 -cspan 2
+                    blt::table $f $row,0 $f.legend-$colormap -anchor w -pady 2 -cspan 2
                     incr row
                     RequestLegend $colormap 256 16