Changeset 3246

Timestamp:

Jan 9, 2013 11:23:36 AM (12 years ago)

Author:

gah

Message:

make clone of radiodial for sequences

Location:

branches/Rappture 1.2/gui/scripts

Files:

• Makefile.in (modified) (1 diff)
• field.tcl (modified) (1 diff)
• molvisviewer.tcl (modified) (3 diffs)
• sequencedial.tcl (added)
• sequenceresult.tcl (modified) (1 diff)
• vtkheightmapviewer.tcl (modified) (17 diffs)

branches/Rappture 1.2/gui/scripts/Makefile.in

@@ -102 +102 @@
                 $(srcdir)/scroller.tcl \
                 $(srcdir)/sequence.tcl \
+                $(srcdir)/sequencedial.tcl \
                 $(srcdir)/sequenceresult.tcl \
                 $(srcdir)/service.tcl \

branches/Rappture 1.2/gui/scripts/field.tcl

@@ -1269 +1269 @@
 
         set vector [blt::vector create \#auto]
-        set values [$_field get $cname.values]
-        foreach v $values {
-            if {"" != $_units} {
-                set v [Rappture::Units::convert $v \
-                           -context $_units -to $_units -units off]
-            }
-            $vector append $v
-        }
+        $vector set [$_field get $cname.values]
         set _comp2dims($cname) "[$mesh dimensions]D"
         set _comp2heightmap($cname) [list $mesh $vector]

branches/Rappture 1.2/gui/scripts/molvisviewer.tcl

@@ -81 +81 @@
     private variable _width
     private variable _height
-    private variable _reset 1;  # Restore camera settings
+    private variable _reset 1;          # Restore camera settings
     private variable _cell 0;           # Restore camera settings
-    private variable _flush 1
 
     constructor { hostlist args } {
@@ -501 +500 @@
     # delete all specified dataobjs
     set changed 0
-    set _flush 1
     foreach dataobj $args {
         set pos [lsearch -exact $_dlist $dataobj]
@@ -1134 +1132 @@
                                         # until we get an image.
         #SendCmd "ppm";                 # Flush the results.
-        set _flush 0
     }
     set _buffering 0;                   # Turn off buffering.

branches/Rappture 1.2/gui/scripts/sequenceresult.tcl

@@ -93 +93 @@
 
     itk_component add dial {
-        Rappture::Radiodial $itk_component(player).dial \
+        Rappture::SequenceDial $itk_component(player).dial \
             -length 10 -valuewidth 0 -valuepadding 0 -padding 6 \
             -linecolor "" -activelinecolor "" \

branches/Rappture 1.2/gui/scripts/vtkheightmapviewer.tcl

@@ -237 +237 @@
         axis-zgrid              0
         axis-zposition          0
+        axis-minticks           1
+        axis-flymode            "static"
         contour-edges           0
         contour-field           "Default"
@@ -242 +244 @@
         contour-lighting        1
         contour-opacity         100
-        contour-visible         1
+        colormap-visible         1
+        isolines-visible         1
         contour-wireframe       0
         heightmap-mode          0
@@ -716 +719 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::VtkHeightmapViewer::Connect {} {
+    global readyForNextFrame
+    set readyForNextFrame 1
     set _hosts [GetServerList "vtkvis"]
     if { "" == $_hosts } {
@@ -767 +772 @@
     array unset _dataset2style 
     array unset _obj2datasets 
+    global readyForNextFrame
+    set readyForNextFrame 1
 }
 
@@ -814 +821 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::VtkHeightmapViewer::ReceiveImage { args } {
+    global readyForNextFrame
+    set readyForNextFrame 1
     array set info {
         -token "???"
@@ -915 +924 @@
     if { $_reset } {
         InitSettings heightmap-mode 
+        #
+        # Reset the camera and other view parameters
+        #
+        SendCmd "axis color [Color2RGB $itk_option(-plotforeground)]"
+        SendCmd "axis lrot z 90"
+        SendCmd "dataset maprange all"
+        set q [list $_view(qw) $_view(qx) $_view(qy) $_view(qz)]
+        $_arcball quaternion $q 
+        if {$_settings(heightmap-mode) } {
+            SendCmd "camera reset all"
+            if { $_view(ortho)} {
+                SendCmd "camera mode ortho"
+            } else {
+                SendCmd "camera mode persp"
+            }
+        }           
+        DoRotate
+        PanCamera
+    }
+    set _first ""
+
+    #SendCmd "imgflush"
+
+    set _first ""
+    # Start off with no datasets are visible.
+    SendCmd "dataset visible 0"
+    set scale [GetHeightmapScale]
+    foreach dataobj [get -objects] {
+        if { [info exists _obj2ovride($dataobj-raise)] &&  $_first == "" } {
+            set _first $dataobj
+        }
+        scale $dataobj
+        set _obj2datasets($dataobj) ""
+        foreach comp [$dataobj components] {
+            set tag $dataobj-$comp
+            if { ![info exists _datasets($tag)] } {
+                set bytes [$dataobj vtkdata $comp]
+                set f [open /tmp/vtkheightmap.vtk "w"]
+                puts $f $bytes
+                close $f
+                set length [string length $bytes]
+                append _outbuf "dataset add $tag data follows $length\n"
+                append _outbuf $bytes
+                set _datasets($tag) 1
+                SetObjectStyle $dataobj $comp
+            }
+            lappend _obj2datasets($dataobj) $tag
+            if { [info exists _obj2ovride($dataobj-raise)] } {
+                SendCmd "heightmap visible 1 $tag"
+            }
+            if { ![info exists _comp2scale($tag)] || 
+                 $_comp2scale($tag) != $scale } {
+                SendCmd "heightmap heightscale $scale $tag"
+                set _comp2scale($tag) $scale
+            }
+        }
+    }
+    if {"" != $_first} {
+        set location [$_first hints camera]
+        if { $location != "" } {
+            array set view $location
+        }
+
+        if 0 {
+            # Tell the server the name of the tool, the version, and dataset
+            # that we are rendering.  Have to do it here because we don't know
+            # what data objects are using the renderer until be get here.
+            set args ""
+            lappend args tool [$_first hints toolId]
+            lappend args version [$_first hints toolRevision]
+            lappend args dataset [$_first hints label]
+            SendCmd "clientinfo $args"
+        }
+
+        array unset _scalarFields
+        array unset _vectorFields
+        set _currentField [$_first hints default]
+        if { $_currentField == "" } { 
+            set _currentField [$_first hints label]
+        }
+        if { $_currentField == "" } { 
+            puts stderr "no default name from field"
+            set _currentField "Default"
+        }
+        $itk_component(field) choices delete 0 end
+        $itk_component(fieldmenu) delete 0 end
+        array unset _fields
+        foreach { name title units } [$_first hints vectors] {
+            set _vectorFields($title) $name
+            $itk_component(field) choices insert end "$name" "$title"
+            $itk_component(fieldmenu) add radiobutton -label "$title" \
+                -value $title -variable [itcl::scope _currentField] \
+                -selectcolor red \
+                -activebackground $itk_option(-plotbackground) \
+                -activeforeground $itk_option(-plotforeground) \
+                -font "Arial 8" \
+                -command [itcl::code $this Combo invoke]
+            set _fields($name) [list $title $units]
+        }
+        foreach { name title units } [$_first hints scalars] {
+            set _scalarFields($title) $name
+            $itk_component(field) choices insert end "$name" "$title"
+            $itk_component(fieldmenu) add radiobutton -label "$title" \
+                -value $title -variable [itcl::scope _currentField] \
+                -selectcolor red \
+                -activebackground $itk_option(-plotbackground) \
+                -activeforeground $itk_option(-plotforeground) \
+                -font "Arial 8" \
+                -command [itcl::code $this Combo invoke]
+            set _fields($name) [list $title $units]
+        }
+        foreach { name title units } [list default $_currentField ""] {
+            set _scalarFields($title) $name
+            $itk_component(field) choices insert end "$name" "$title"
+            $itk_component(fieldmenu) add radiobutton -label "$title" \
+                -value $title -variable [itcl::scope _currentField] \
+                -selectcolor red \
+                -activebackground $itk_option(-plotbackground) \
+                -activeforeground $itk_option(-plotforeground) \
+                -font "Arial 8" \
+                -command [itcl::code $this Combo invoke]
+            set _fields($name) [list $title $units]
+        }
+        $itk_component(field) value $_currentField
+    }
+
+    InitSettings contour-palette 
+
+    if { $_reset } {
+        SendCmd "axis tickpos outside"
+        foreach axis { x y z } {
+            SendCmd "axis lformat $axis %g"
+            #SendCmd "axis range $axis $_limits(${axis}min) $_limits(${axis}max)"
+        }
+        SendCmd "axis range z $_limits(zmin) $_limits(zmax)"
+        foreach axis { x y z } {
+            set label [$_first hints ${axis}label]
+            if { $label != "" } {
+                # May be a space in the axis label.
+                SendCmd [list axis name $axis $label]
+            }
+            set units [$_first hints ${axis}units]
+            if { $units != "" } {
+                # May be a space in the axis units.
+                SendCmd [list axis units $axis $units]
+            }
+        }
+        SendCmd [list axis name z $_currentField]
         #
         # Reset the camera and other view parameters
@@ -932 +1089 @@
         DoRotate
         PanCamera
-    }
-    set _first ""
-
-    #SendCmd "imgflush"
-
-    set _first ""
-    # Start off with no datasets are visible.
-    SendCmd "dataset visible 0"
-    set scale [GetHeightmapScale]
-    foreach dataobj [get -objects] {
-        if { [info exists _obj2ovride($dataobj-raise)] &&  $_first == "" } {
-            set _first $dataobj
-        }
-        scale $dataobj
-        set _obj2datasets($dataobj) ""
-        foreach comp [$dataobj components] {
-            set tag $dataobj-$comp
-            if { ![info exists _datasets($tag)] } {
-                set bytes [$dataobj vtkdata $comp]
-                set f [open /tmp/vtkheightmap.vtk "w"]
-                puts $f $bytes
-                close $f
-                set length [string length $bytes]
-                append _outbuf "dataset add $tag data follows $length\n"
-                append _outbuf $bytes
-                set _datasets($tag) 1
-                SetObjectStyle $dataobj $comp
-            }
-            lappend _obj2datasets($dataobj) $tag
-            if { [info exists _obj2ovride($dataobj-raise)] } {
-                SendCmd "heightmap visible 1 $tag"
-            }
-            if { ![info exists _comp2scale($tag)] || 
-                 $_comp2scale($tag) != $scale } {
-                SendCmd "heightmap heightscale $scale $tag"
-                set _comp2scale($tag) $scale
-            }
-        }
-    }
-    if {"" != $_first} {
-        set location [$_first hints camera]
-        if { $location != "" } {
-            array set view $location
-        }
-
-        if 0 {
-            # Tell the server the name of the tool, the version, and dataset
-            # that we are rendering.  Have to do it here because we don't know
-            # what data objects are using the renderer until be get here.
-            set args ""
-            lappend args tool [$_first hints toolId]
-            lappend args version [$_first hints toolRevision]
-            lappend args dataset [$_first hints label]
-            SendCmd "clientinfo $args"
-        }
-
-        array unset _scalarFields
-        array unset _vectorFields
-        set _currentField [$_first hints default]
-        if { $_currentField == "" } { 
-            set _currentField "Default"
-        }
-        $itk_component(field) choices delete 0 end
-        $itk_component(fieldmenu) delete 0 end
-        array unset _fields
-        foreach { name title units } [$_first hints vectors] {
-            set _vectorFields($title) $name
-            $itk_component(field) choices insert end "$name" "$title"
-            $itk_component(fieldmenu) add radiobutton -label "$title" \
-                -value $title -variable [itcl::scope _currentField] \
-                -selectcolor red \
-                -activebackground $itk_option(-plotbackground) \
-                -activeforeground $itk_option(-plotforeground) \
-                -font "Arial 8" \
-                -command [itcl::code $this Combo invoke]
-            set _fields($name) [list $title $units]
-        }
-        foreach { name title units } [$_first hints scalars] {
-            set _scalarFields($title) $name
-            $itk_component(field) choices insert end "$name" "$title"
-            $itk_component(fieldmenu) add radiobutton -label "$title" \
-                -value $title -variable [itcl::scope _currentField] \
-                -selectcolor red \
-                -activebackground $itk_option(-plotbackground) \
-                -activeforeground $itk_option(-plotforeground) \
-                -font "Arial 8" \
-                -command [itcl::code $this Combo invoke]
-            set _fields($name) [list $title $units]
-        }
-        foreach { name title units } { default Default "" } {
-            set _scalarFields($title) $name
-            $itk_component(field) choices insert end "$name" "$title"
-            $itk_component(fieldmenu) add radiobutton -label "$title" \
-                -value $title -variable [itcl::scope _currentField] \
-                -selectcolor red \
-                -activebackground $itk_option(-plotbackground) \
-                -activeforeground $itk_option(-plotforeground) \
-                -font "Arial 8" \
-                -command [itcl::code $this Combo invoke]
-            set _fields($name) [list $title $units]
-        }
-        $itk_component(field) value $_currentField
-    }
-
-    InitSettings contour-palette 
-
-    if { $_reset } {
-        SendCmd "axis tickpos outside"
-        foreach axis { x y z } {
-            SendCmd "axis lformat $axis %g"
-            #SendCmd "axis range $axis $_limits(${axis}min) $_limits(${axis}max)"
-        }
-        SendCmd "axis range z $_limits(zmin) $_limits(zmax)"
-        foreach axis { x y } {
-            set label [$_first hints ${axis}label]
-            if { $label != "" } {
-                # May be a space in the axis label.
-                SendCmd [list axis name $axis $label]
-            }
-            set units [$_first hints ${axis}units]
-            if { $units != "" } {
-                # May be a space in the axis units.
-                SendCmd [list axis units $axis $units]
-            }
-        }
-        #
-        # Reset the camera and other view parameters
-        #
-        SendCmd "axis color [Color2RGB $itk_option(-plotforeground)]"
-        SendCmd "dataset maprange all"
-        set q [list $_view(qw) $_view(qx) $_view(qy) $_view(qz)]
-        $_arcball quaternion $q 
-        if {$_settings(heightmap-mode) } {
-            SendCmd "camera reset all"
-            if { $_view(ortho)} {
-                SendCmd "camera mode ortho"
-            } else {
-                SendCmd "camera mode persp"
-            }
-        }           
-        DoRotate
-        PanCamera
-        InitSettings axis-xgrid axis-ygrid axis-zgrid axis-mode \
+        InitSettings axis-xgrid axis-ygrid axis-zgrid \
             axis-visible axis-labels 
         InitSettings contour-opacity \
@@ -1082 +1097 @@
         set _reset 0
     }
-    set _buffering 0;                        # Turn off buffering.
+    global readyForNextFrame
+    set readyForNextFrame 0;            # Don't advance to the next frame
+    set _buffering 0;                   # Turn off buffering.
 
     # Actually write the commands to the server socket.  If it fails, we don't
@@ -1338 +1355 @@
             }
         }
-        "contour-visible" {
-            set bool $_settings(contour-visible)
+        "colormap-visible" {
+            set bool $_settings(colormap-visible)
             foreach dataset [CurrentDatasets -visible] {
-                SendCmd "heightmap visible $bool $dataset"
-            }
-            if { $bool } {
-                Rappture::Tooltip::for $itk_component(surface) \
-                    "Hide the surface"
-            } else {
-                Rappture::Tooltip::for $itk_component(surface) \
-                    "Show the surface"
+                SendCmd "heightmap surface $bool $dataset"
+            }
+        }
+        "isolines-visible" {
+            set bool $_settings(isolines-visible)
+            foreach dataset [CurrentDatasets -visible] {
+                SendCmd "heightmap isolines $bool $dataset"
             }
         }
@@ -1376 +1392 @@
             SendCmd "axis grid $axis $bool"
         }
-        "axis-mode" {
-            set mode [$itk_component(axismode) value]
-            set mode [$itk_component(axismode) translate $mode]
+        "axis-flymode" {
+            set mode [$itk_component(axis-flymode) value]
+            set mode [$itk_component(axis-flymmode) translate $mode]
             set _settings($what) $mode
             SendCmd "axis flymode $mode"
+        }
+        "axis-minticks" {
+            set bool $_settings(axis-minticks)
+            foreach axis { x y z } { 
+                SendCmd "axis minticks ${axis} $bool"
+            }
         }
         "contour-isolines" {
@@ -1386 +1408 @@
             EventuallyContour $n
         }
-        "contour-visible" {
+        "isolines-visible" {
             set bool $_settings($what)
             foreach dataset [CurrentDatasets -visible] {
-                SendCmd "surface visible $bool $dataset"
-            }
-            if { $bool } {
-                Rappture::Tooltip::for $itk_component(surface) \
-                    "Hide the surface"
-            } else {
-                Rappture::Tooltip::for $itk_component(surface) \
-                    "Show the surface"
+                SendCmd "heightmap isolines $bool $dataset"
+            }
+        }
+        "colormap-visible" {
+            set bool $_settings($what)
+            foreach dataset [CurrentDatasets -visible] {
+                SendCmd "heightmap surface $bool $dataset"
             }
         }
@@ -1871 +1892 @@
     $inner configure -borderwidth 4
 
-    checkbutton $inner.view \
-        -text "Contour/Surface" \
-        -variable [itcl::scope _settings(contour-visible)] \
-        -command [itcl::code $this AdjustSetting contour-visible] \
+    checkbutton $inner.colormap \
+        -text "Colormap" \
+        -variable [itcl::scope _settings(colormap-visible)] \
+        -command [itcl::code $this AdjustSetting colormap-visible] \
+        -font "Arial 9"
+
+    checkbutton $inner.isolines \
+        -text "Isolines" \
+        -variable [itcl::scope _settings(isolines-visible)] \
+        -command [itcl::code $this AdjustSetting isolines-visible] \
         -font "Arial 9"
 
@@ -1922 +1949 @@
 
     blt::table $inner \
-        0,0 $inner.view      -anchor w -pady 2 -cspan 2 \
-        1,0 $inner.legend    -anchor w -pady 2 -cspan 2 \
-        2,0 $inner.axes      -anchor w -pady 2 -cspan 2 \
+        0,0 $inner.colormap  -anchor w -pady 2 -cspan 2 \
+        1,0 $inner.isolines  -anchor w -pady 2 -cspan 2 \
+        2,0 $inner.legend    -anchor w -pady 2 -cspan 2 \
+        3,0 $inner.axes      -anchor w -pady 2 -cspan 2 \
         5,0 $inner.contour   -anchor w -pady 2 -cspan 2 \
         6,0 $inner.heightmap -anchor w -pady 2 -cspan 2 \
         7,0 $inner.background_l -anchor w -pady 2 \
         7,1 $inner.background -anchor w -pady 2 \
-        8,0 $inner.debug     -anchor w -pady 2 -cspan 2 \
+        9,0 $inner.debug     -anchor w -pady 2 -cspan 2 \
         
     blt::table configure $inner r* c* -resize none
     blt::table configure $inner r9 c1 -resize expand
-    blt::table configure $inner r4 r7 -height 0.25i
+    blt::table configure $inner r4 r8 -height 0.125i
 }
 
@@ -1946 +1974 @@
     $inner configure -borderwidth 4
 
-    checkbutton $inner.contour \
-        -text "Show Contour" \
-        -variable [itcl::scope _settings(contour-visible)] \
-        -command [itcl::code $this AdjustSetting contour-visible] \
+    checkbutton $inner.colormap \
+        -text "Show Colormap" \
+        -variable [itcl::scope _settings(colormap-visible)] \
+        -command [itcl::code $this AdjustSetting colormap-visible] \
+        -font "Arial 9"
+
+    checkbutton $inner.isolines \
+        -text "Show Isolines" \
+        -variable [itcl::scope _settings(isolines-visible)] \
+        -command [itcl::code $this AdjustSetting isolines-visible] \
         -font "Arial 9"
 
@@ -2037 +2071 @@
 
     blt::table $inner \
-        0,0 $inner.contour   -anchor w -pady 2 -cspan 2 \
-        1,0 $inner.wireframe -anchor w -pady 2 -cspan 2\
-        2,0 $inner.lighting  -anchor w -pady 2 -cspan 2 \
-        3,0 $inner.edges     -anchor w -pady 2 -cspan 2 \
-        4,0 $inner.field_l   -anchor w -pady 2 \
-        4,1 $inner.field     -anchor w -pady 2 -fill x \
-        5,0 $inner.palette_l -anchor w -pady 2  \
-        5,1 $inner.palette   -anchor w -pady 2 -fill x  \
-        6,0 $inner.isolinecolor_l  -anchor w -pady 2  \
-        6,1 $inner.isolinecolor    -anchor w -pady 2 -fill x  \
-        7,0 $inner.opacity_l -anchor w -pady 2 \
-        7,1 $inner.opacity   -fill x   -pady 2 \
-        8,0 $inner.scale_l   -anchor w -pady 2 -cspan 2 \
-        8,1 $inner.scale     -fill x   -pady 2 -cspan 2 \
+        0,0 $inner.colormap   -anchor w -pady 2 -cspan 2 \
+        1,0 $inner.isolines   -anchor w -pady 2 -cspan 2 \
+        2,0 $inner.wireframe -anchor w -pady 2 -cspan 2\
+        3,0 $inner.lighting  -anchor w -pady 2 -cspan 2 \
+        4,0 $inner.edges     -anchor w -pady 2 -cspan 2 \
+        5,0 $inner.field_l   -anchor w -pady 2 \
+        5,1 $inner.field     -anchor w -pady 2 -fill x \
+        6,0 $inner.palette_l -anchor w -pady 2  \
+        6,1 $inner.palette   -anchor w -pady 2 -fill x  \
+        7,0 $inner.isolinecolor_l  -anchor w -pady 2  \
+        7,1 $inner.isolinecolor    -anchor w -pady 2 -fill x  \
+        8,0 $inner.opacity_l -anchor w -pady 2 \
+        8,1 $inner.opacity   -fill x   -pady 2 \
+        9,0 $inner.scale_l   -anchor w -pady 2 -cspan 2 \
+        9,1 $inner.scale     -fill x   -pady 2 -cspan 2 \
 
     blt::table configure $inner r* c* -resize none
-    blt::table configure $inner r9 c1 -resize expand
+    blt::table configure $inner r10 c1 -resize expand
 }
 
@@ -2067 +2102 @@
 
     checkbutton $inner.visible \
-        -text "Show Axes" \
+        -text "Axes" \
         -variable [itcl::scope _settings(axis-visible)] \
         -command [itcl::code $this AdjustSetting axis-visible] \
         -font "Arial 9"
-
     checkbutton $inner.labels \
-        -text "Show Axis Labels" \
+        -text "Axis Labels" \
         -variable [itcl::scope _settings(axis-labels)] \
         -command [itcl::code $this AdjustSetting axis-labels] \
         -font "Arial 9"
-
+    label $inner.grid_l -text "Grid" -font "Arial 9" 
     checkbutton $inner.gridx \
-        -text "Show X Grid" \
+        -text "X" \
         -variable [itcl::scope _settings(axis-xgrid)] \
         -command [itcl::code $this AdjustSetting axis-xgrid] \
         -font "Arial 9"
     checkbutton $inner.gridy \
-        -text "Show Y Grid" \
+        -text "Y" \
         -variable [itcl::scope _settings(axis-ygrid)] \
         -command [itcl::code $this AdjustSetting axis-ygrid] \
         -font "Arial 9"
     checkbutton $inner.gridz \
-        -text "Show Z Grid" \
+        -text "Z" \
         -variable [itcl::scope _settings(axis-zgrid)] \
         -command [itcl::code $this AdjustSetting axis-zgrid] \
         -font "Arial 9"
+    checkbutton $inner.minorticks \
+        -text "Minor Ticks" \
+        -variable [itcl::scope _settings(axis-minticks)] \
+        -command [itcl::code $this AdjustSetting axis-minticks] \
+        -font "Arial 9"
+
 
     label $inner.mode_l -text "Mode" -font "Arial 9" 
 
-    itk_component add axismode {
+    itk_component add axis-flymode {
         Rappture::Combobox $inner.mode -width 10 -editable no
     }
@@ -2104 +2144 @@
         "furthest_triad"  "furthest" \
         "outer_edges"     "outer"         
-    $itk_component(axismode) value "static"
-    bind $inner.mode <<Value>> [itcl::code $this AdjustSetting axis-mode]
+    $itk_component(axis-flymode) value "static"
+    bind $inner.mode <<Value>> [itcl::code $this AdjustSetting axis-flymode]
 
     blt::table $inner \
-        0,0 $inner.visible -anchor w -cspan 2 \
-        1,0 $inner.labels  -anchor w -cspan 2 \
-        2,0 $inner.gridx   -anchor w -cspan 2 \
-        3,0 $inner.gridy   -anchor w -cspan 2 \
-        4,0 $inner.gridz   -anchor w -cspan 2 \
-        5,0 $inner.mode_l  -anchor w -cspan 2 -padx { 2 0 } \
-        6,0 $inner.mode    -fill x   -cspan 2 
+        0,0 $inner.visible -anchor w -cspan 4 \
+        1,0 $inner.labels  -anchor w -cspan 4 \
+        2,0 $inner.minorticks  -anchor w -cspan 4 \
+        4,0 $inner.grid_l  -anchor w \
+        4,1 $inner.gridx   -anchor w \
+        4,2 $inner.gridy   -anchor w \
+        4,3 $inner.gridz   -anchor w \
+        5,0 $inner.mode_l  -anchor w -padx { 2 0 } \
+        5,1 $inner.mode    -fill x -cspan 3 
 
     blt::table configure $inner r* c* -resize none
-    blt::table configure $inner r7 c1 -resize expand
+    blt::table configure $inner r7 c6 -resize expand
+    blt::table configure $inner r3 -height 0.125i
 }