Changeset 822 for trunk

Timestamp:

Dec 4, 2009 5:12:38 PM (12 years ago)

Author:

toby

Message:

# on 2004/10/04 16:11:47, toby did:
BWidget is now required

File:

• trunk/odf.tcl (modified) (2 diffs, 3 props)

trunk/odf.tcl

@@ -120 +120 @@
 proc MakeODFPane {} {
     global expgui entryvar entrycmd entrybox
-    if $expgui(haveBW) {
-        pack [TitleFrame $expgui(odfFrame).f1 -bd 4 \
-                -text "Spherical Harmonic (ODF) Preferential Orientation" \
-                -relief groove] -side top -expand yes -fill x -anchor n
-        set expgui(odfFrameTop) [$expgui(odfFrame).f1 getframe]
-    } else {
-        pack [label $expgui(odfFrame).f0 \
-                -text "Spherical Harmonic (ODF) Preferential Orientation"] \
-                -side top -expand yes -fill x -anchor n
-        set expgui(odfFrameTop) [frame $expgui(odfFrame).top]
-        grid $expgui(odfFrameTop) -side top -expand yes -fill x -anchor n
-    }
+    pack [TitleFrame $expgui(odfFrame).f1 -bd 4 \
+              -text "Spherical Harmonic (ODF) Preferential Orientation" \
+              -relief groove] -side top -expand yes -fill x -anchor n
+    set expgui(odfFrameTop) [$expgui(odfFrame).f1 getframe]
 
     grid [frame  $expgui(odfFrameTop).ps] -column 0 -row 0 -sticky w
@@ -203 +195 @@
     tk_optionMenu $ordframe.om entryvar(ODFdampC) 0 1 2 3 4 5 6 7 8 9
     grid $ordframe.om -column [incr col] -row $row
-    if $expgui(haveBW) {
-        pack [TitleFrame $expgui(odfFrame).f2 -bd 4 \
-                -text "Spherical Harmonic Terms: (l,m,n) & coeff's" \
-                -relief groove] -side top -fill both -expand yes -anchor n
-        set canvasfr [$expgui(odfFrame).f2 getframe]
-    } else {
-        set canvasfr [frame $expgui(odfFrame).f3 -bd 4 -relief groove]
-        pack $canvasfr -side top -expand yes -fill both -anchor n
-        grid [label $canvasfr.l \
-                -text "Spherical Harmonic Terms: (l,m,n) & coeff's"] \
-                -sticky news -row 0 -column 0 
-    }
+    pack [TitleFrame $expgui(odfFrame).f2 -bd 4 \
+              -text "Spherical Harmonic Terms: (l,m,n) & coeff's" \
+              -relief groove] -side top -fill both -expand yes -anchor n
+    set canvasfr [$expgui(odfFrame).f2 getframe]
 
     set expgui(odfFrameCanvas) $canvasfr.canvas