Changeset 6545 for trunk

Timestamp:

Sep 15, 2016, 12:22:29 PM (8 years ago)

Author:

ldelgass

Message:

Layout fix for layer legend

File:

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

trunk/gui/scripts/mapviewer.tcl

@@ -2143 +2143 @@
         2,0 $inner.wireframe -cspan 2 -anchor w -pady 2 \
         3,0 $inner.lighting  -cspan 2 -anchor w -pady 2 \
-        4,0 $inner.time_l    -cspan 2 -anchor w -pady 2 \
-        4,1 $inner.time      -cspan 2 -fill x   -pady 2 \
-        5,0 $inner.ambient_l -cspan 2 -anchor w -pady 2 \
-        5,1 $inner.ambient   -cspan 2 -fill x   -pady 2
+        4,0 $inner.time_l             -anchor w -pady 2 \
+        4,1 $inner.time               -fill x   -pady 2 \
+        5,0 $inner.ambient_l          -anchor w -pady 2 \
+        5,1 $inner.ambient            -fill x   -pady 2
 #        4,0 $inner.edges     -cspan 2  -anchor w -pady 2
 
@@ -3315 +3315 @@
                     -text $info(label) \
                     -font "Arial 9" -anchor w
-                blt::table $f $row,1 $f.${ctlname}_lbl -anchor w -pady 2 -cspan 2
+                blt::table $f $row,1 $f.${ctlname}_lbl -anchor w -pady 2
                 Rappture::Tooltip::for $f.${ctlname}_lbl [join $tooltip \n]
             } else {
@@ -3324 +3324 @@
                     -command [itcl::code $this \
                                   SetLayerVisibility $dataobj $layer]
-                blt::table $f $row,1 $f.${ctlname}_visible -anchor w -pady 2 -cspan 2
+                blt::table $f $row,1 $f.${ctlname}_visible -anchor w -pady 2
                 Rappture::Tooltip::for $f.${ctlname}_visible [join $tooltip \n]
             }
@@ -3331 +3331 @@
                 incr imgIdx
                 if { $info(driver) == "colorramp" } {
+                    set f2 $f.cmap
+                    frame $f2
                     set colormap $ctlname
                     if { ![info exists _image(legend-$colormap)] } {
@@ -3336 +3338 @@
                     }
                     itk_component add legend-$colormap-min {
-                        label $f.legend-$colormap-min -text 0
+                        label $f2.legend-$colormap-min -text 0
                     }
                     itk_component add legend-$colormap-max {
-                        label $f.legend-$colormap-max -text 1
+                        label $f2.legend-$colormap-max -text 1
                     }
                     itk_component add legend-$colormap {
-                        label $f.legend-$colormap -image $_image(legend-$colormap)
-                    }
-                    blt::table $f $row,0 $f.legend-$colormap-min -anchor w -pady 0 -cspan 2
-                    blt::table $f $row,2 $f.legend-$colormap-max -anchor e -pady 0
-                    incr row
-                    blt::table $f $row,0 $f.legend-$colormap -anchor w -pady 2 -cspan 3
+                        label $f2.legend-$colormap -image $_image(legend-$colormap)
+                    }
+                    blt::table $f2 $row,0 $f2.legend-$colormap-min -anchor w -pady 0
+                    blt::table $f2 $row,1 $f2.legend-$colormap-max -anchor e -pady 0
+                    blt::table $f2 $row,0 $f2.legend-$colormap -anchor w -pady 2 -cspan 2
+
+                    blt::table $f $row,0 $f2 -anchor w -pady 0 -cspan 2
                     incr row
                     RequestLegend $colormap 256 16
@@ -3355 +3358 @@
                  $info(type) != "mask" &&
                 ($info(type) != "image" || $imgIdx > 1) } {
-                label $f.${ctlname}_opacity_l -text "Opacity" -font "Arial 9"
-                ::scale $f.${ctlname}_opacity -from 0 -to 100 \
+                set f2 $f.op
+                frame $f2
+                label $f2.${ctlname}_opacity_l -text "Opacity" -font "Arial 9"
+                ::scale $f2.${ctlname}_opacity -from 0 -to 100 \
                     -orient horizontal -showvalue off \
                     -variable [itcl::scope _opacity($tag)] \
@@ -3362 +3367 @@
                     -command [itcl::code $this \
                                   SetLayerOpacity $dataobj $layer]
-                Rappture::Tooltip::for $f.${ctlname}_opacity "Set opacity of $info(label) layer"
-                blt::table $f $row,0 $f.${ctlname}_opacity_l -anchor w -pady 2 -cspan 2
-                blt::table $f $row,2 $f.${ctlname}_opacity -anchor w -pady 2
+                Rappture::Tooltip::for $f2.${ctlname}_opacity "Set opacity of $info(label) layer"
+                blt::table $f2 $row,0 $f2.${ctlname}_opacity_l -anchor w -pady 2
+                blt::table $f2 $row,1 $f2.${ctlname}_opacity -anchor w -pady 2
+
+                blt::table $f $row,0 $f2 -anchor w -pady 0 -cspan 2
                 incr row
             }
@@ -3375 +3382 @@
     SendCmd "[list map attrib [encoding convertto utf-8 [join $attrib ,]]]"
     label $f.map_attrib -text [join $attrib \n] -font "Arial 9"
-    blt::table $f $row,0 $f.map_attrib -anchor sw -pady 2 -cspan 3
+    blt::table $f $row,0 $f.map_attrib -anchor sw -pady 2 -cspan 2
     #incr row
     if { $row > 0 } {
         blt::table configure $f r* c* -resize none
-        blt::table configure $f r$row c2 -resize expand
+        blt::table configure $f r$row c1 -resize expand
     }
 }