ctfDisplay: modified

	modified:   bin/wish/ctfDisplay/ctfDisplay.wish
	modified:   src/Objects/DataExpress/TclTk/src/CommandEntry.wish
	modified:   src/Tools/Integration/ctfDisplay/src/wish/ctfDisplay.wish

diff --git a/bin/wish/ctfDisplay/ctfDisplay.wish b/bin/wish/ctfDisplay/ctfDisplay.wish
index c2d6bdf..195d712 100755 (executable)
--- a/bin/wish/ctfDisplay/ctfDisplay.wish
+++ b/bin/wish/ctfDisplay/ctfDisplay.wish
@@ -372,26 +372,26 @@ proc InfoFrameCreate  { f side } {
     set ff  [ frame $f.file2 ]
        # FFT
     set fff [ frame $ff.loadFFT ]
-    button $fff.loadFFT -text "Load" -command "ScatteringCalc $ctfInfo(filename)" 
-    CommandEntry $fff.loadFFTEntry Data 5     "ScatteringCalc $ctfInfo(filename)" -textvar [subst $name]ctfInfo(filename)
+    button $fff.loadFFT -text "   Load   " -command "ScatteringCalc $ctfInfo(filename)" 
+    CommandEntry $fff.loadFFTEntry Data 7     "ScatteringCalc $ctfInfo(filename)" -textvar [subst $name]ctfInfo(filename)
     pack $fff.loadFFT $fff.loadFFTEntry  -side left
 
     #PS
     set fff [ frame $ff.printPS ]
-    button $fff.printPS -text "Save" -command "[subst $name]ctfInfoSaveAsPS"
-    CommandEntry $fff.printPSEntry  Graph 5   "[subst $name]ctfInfoSaveAsPS" -textvar [subst $name]ctfInfo(.ctfps)
+    button $fff.printPS -text "   Save   " -command "[subst $name]ctfInfoSaveAsPS"
+    CommandEntry $fff.printPSEntry  GraphPS 7   "[subst $name]ctfInfoSaveAsPS" -textvar [subst $name]ctfInfo(.ctfps)
     pack $fff.printPS $fff.printPSEntry  -side left
 
     #Def
     set fff [ frame $ff.saveDefaultDir ]
     button $fff.saveDefaultDir -text "SaveDefDir" -command "[subst $name]ctfInfoSaveDefaultDir"
-    CommandEntry $fff.saveDefaultDirEntry  Graph 5   "[subst $name]ctfInfoSaveDefaultDir" -textvar [subst $name]ctfInfo(.defdirctfinfo)
+    CommandEntry $fff.saveDefaultDirEntry  DefDir 7   "[subst $name]ctfInfoSaveDefaultDir" -textvar [subst $name]ctfInfo(.defdirctfinfo)
     pack $fff.saveDefaultDir $fff.saveDefaultDirEntry -side left
 
     #Def
     set fff [ frame $ff.saveDefault ]
-    button $fff.saveDefault -text "SaveDef" -command "[subst $name]ctfInfoSaveDefault"
-    CommandEntry $fff.saveDefaultEntry  Graph 5   "[subst $name]ctfInfoSaveDefault" -textvar [subst $name]ctfInfo(.defctfinfo)
+    button $fff.saveDefault -text " SaveDef  " -command "[subst $name]ctfInfoSaveDefault"
+    CommandEntry $fff.saveDefaultEntry  Def 7   "[subst $name]ctfInfoSaveDefault" -textvar [subst $name]ctfInfo(.defctfinfo)
     pack $fff.saveDefault $fff.saveDefaultEntry -side left
 
     #Exit

diff --git a/src/Objects/DataExpress/TclTk/src/CommandEntry.wish b/src/Objects/DataExpress/TclTk/src/CommandEntry.wish
index 9fcca27..94d0d11 100755 (executable)
--- a/src/Objects/DataExpress/TclTk/src/CommandEntry.wish
+++ b/src/Objects/DataExpress/TclTk/src/CommandEntry.wish
@@ -9,8 +9,8 @@
 proc CommandEntry { name label width command args } {
 
        set f [ frame $name ]
-       label $name.label -text $label -anchor w 
-       #label $name.label -text $label -width [ expr $width*20 ] -anchor w 
+       #label $name.label -text $label -anchor w 
+       label $name.label -text $label -width [ expr $width * 7 ] -anchor w 
        #label $name.label -text $label -width 20 -anchor w
        #labelframe $name -text $label -labelanchor w
 
@@ -55,7 +55,9 @@ proc CommandEntryWithSelectionEntrySet { name var } {
 #
 proc CommandEntryWithUpDown { name label width command var delta args } {
        frame $name
-       label $name.label -text $label -width $width -anchor w
+       #label $name.label -text $label -width $width -anchor w
+       label $name.label -text $label -width [ expr $width * 6 ] -anchor w
+       #label $name.label -text $label -anchor w
        label $name.space -text " "
        eval { entry $name.entry -relief sunken -textvar $var } $args 
 

diff --git a/src/Tools/Integration/ctfDisplay/src/wish/ctfDisplay.wish b/src/Tools/Integration/ctfDisplay/src/wish/ctfDisplay.wish
index c2d6bdf..195d712 100755 (executable)
--- a/src/Tools/Integration/ctfDisplay/src/wish/ctfDisplay.wish
+++ b/src/Tools/Integration/ctfDisplay/src/wish/ctfDisplay.wish
@@ -372,26 +372,26 @@ proc InfoFrameCreate  { f side } {
     set ff  [ frame $f.file2 ]
        # FFT
     set fff [ frame $ff.loadFFT ]
-    button $fff.loadFFT -text "Load" -command "ScatteringCalc $ctfInfo(filename)" 
-    CommandEntry $fff.loadFFTEntry Data 5     "ScatteringCalc $ctfInfo(filename)" -textvar [subst $name]ctfInfo(filename)
+    button $fff.loadFFT -text "   Load   " -command "ScatteringCalc $ctfInfo(filename)" 
+    CommandEntry $fff.loadFFTEntry Data 7     "ScatteringCalc $ctfInfo(filename)" -textvar [subst $name]ctfInfo(filename)
     pack $fff.loadFFT $fff.loadFFTEntry  -side left
 
     #PS
     set fff [ frame $ff.printPS ]
-    button $fff.printPS -text "Save" -command "[subst $name]ctfInfoSaveAsPS"
-    CommandEntry $fff.printPSEntry  Graph 5   "[subst $name]ctfInfoSaveAsPS" -textvar [subst $name]ctfInfo(.ctfps)
+    button $fff.printPS -text "   Save   " -command "[subst $name]ctfInfoSaveAsPS"
+    CommandEntry $fff.printPSEntry  GraphPS 7   "[subst $name]ctfInfoSaveAsPS" -textvar [subst $name]ctfInfo(.ctfps)
     pack $fff.printPS $fff.printPSEntry  -side left
 
     #Def
     set fff [ frame $ff.saveDefaultDir ]
     button $fff.saveDefaultDir -text "SaveDefDir" -command "[subst $name]ctfInfoSaveDefaultDir"
-    CommandEntry $fff.saveDefaultDirEntry  Graph 5   "[subst $name]ctfInfoSaveDefaultDir" -textvar [subst $name]ctfInfo(.defdirctfinfo)
+    CommandEntry $fff.saveDefaultDirEntry  DefDir 7   "[subst $name]ctfInfoSaveDefaultDir" -textvar [subst $name]ctfInfo(.defdirctfinfo)
     pack $fff.saveDefaultDir $fff.saveDefaultDirEntry -side left
 
     #Def
     set fff [ frame $ff.saveDefault ]
-    button $fff.saveDefault -text "SaveDef" -command "[subst $name]ctfInfoSaveDefault"
-    CommandEntry $fff.saveDefaultEntry  Graph 5   "[subst $name]ctfInfoSaveDefault" -textvar [subst $name]ctfInfo(.defctfinfo)
+    button $fff.saveDefault -text " SaveDef  " -command "[subst $name]ctfInfoSaveDefault"
+    CommandEntry $fff.saveDefaultEntry  Def 7   "[subst $name]ctfInfoSaveDefault" -textvar [subst $name]ctfInfo(.defctfinfo)
     pack $fff.saveDefault $fff.saveDefaultEntry -side left
 
     #Exit