OSDN > Find Software > Scientific/Engineering > Information Analysis > Eos-Image Analysis Environment > SCM > git > base > Commit

Eos-Image Analysis Environment
Fork
others2
data
tutorial
optional
others
hostdependX86LINUX64
hostdependX86MAC64
hostdependX86LINUX64ICC
hostdependOTHERS
base
zephyr
hostdependARM64MAC64

R/O
HTTP
SSH
HTTPS

base: Commit

This repository is a base of Eos.

Commit MetaInfo

Revision	326598a567d43eb2d7275ba61c3357b77bc0eaca (tree)
Time	2015-11-21 12:21:47
Author	Takuo Yasunaga <yasunaga@bio....>
Commiter	Takuo Yasunaga

Log Message

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

Change Summary

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

Incremental Difference

--- a/bin/wish/ctfDisplay/ctfDisplay.wish

+++ b/bin/wish/ctfDisplay/ctfDisplay.wish

		@@ -372,26 +372,26 @@ proc InfoFrameCreate { f side } {
372	372	set ff [ frame $f.file2 ]
373	373	# FFT
374	374	set fff [ frame $ff.loadFFT ]
375		- button $fff.loadFFT -text "Load" -command "ScatteringCalc $ctfInfo(filename)"
376		- CommandEntry $fff.loadFFTEntry Data 5 "ScatteringCalc $ctfInfo(filename)" -textvar [subst $name]ctfInfo(filename)
	375	+ button $fff.loadFFT -text " Load " -command "ScatteringCalc $ctfInfo(filename)"
	376	+ CommandEntry $fff.loadFFTEntry Data 7 "ScatteringCalc $ctfInfo(filename)" -textvar [subst $name]ctfInfo(filename)
377	377	pack $fff.loadFFT $fff.loadFFTEntry -side left
378	378
379	379	#PS
380	380	set fff [ frame $ff.printPS ]
381		- button $fff.printPS -text "Save" -command "[subst $name]ctfInfoSaveAsPS"
382		- CommandEntry $fff.printPSEntry Graph 5 "[subst $name]ctfInfoSaveAsPS" -textvar [subst $name]ctfInfo(.ctfps)
	381	+ button $fff.printPS -text " Save " -command "[subst $name]ctfInfoSaveAsPS"
	382	+ CommandEntry $fff.printPSEntry GraphPS 7 "[subst $name]ctfInfoSaveAsPS" -textvar [subst $name]ctfInfo(.ctfps)
383	383	pack $fff.printPS $fff.printPSEntry -side left
384	384
385	385	#Def
386	386	set fff [ frame $ff.saveDefaultDir ]
387	387	button $fff.saveDefaultDir -text "SaveDefDir" -command "[subst $name]ctfInfoSaveDefaultDir"
388		- CommandEntry $fff.saveDefaultDirEntry Graph 5 "[subst $name]ctfInfoSaveDefaultDir" -textvar [subst $name]ctfInfo(.defdirctfinfo)
	388	+ CommandEntry $fff.saveDefaultDirEntry DefDir 7 "[subst $name]ctfInfoSaveDefaultDir" -textvar [subst $name]ctfInfo(.defdirctfinfo)
389	389	pack $fff.saveDefaultDir $fff.saveDefaultDirEntry -side left
390	390
391	391	#Def
392	392	set fff [ frame $ff.saveDefault ]
393		- button $fff.saveDefault -text "SaveDef" -command "[subst $name]ctfInfoSaveDefault"
394		- CommandEntry $fff.saveDefaultEntry Graph 5 "[subst $name]ctfInfoSaveDefault" -textvar [subst $name]ctfInfo(.defctfinfo)
	393	+ button $fff.saveDefault -text " SaveDef " -command "[subst $name]ctfInfoSaveDefault"
	394	+ CommandEntry $fff.saveDefaultEntry Def 7 "[subst $name]ctfInfoSaveDefault" -textvar [subst $name]ctfInfo(.defctfinfo)
395	395	pack $fff.saveDefault $fff.saveDefaultEntry -side left
396	396
397	397	#Exit

--- a/src/Objects/DataExpress/TclTk/src/CommandEntry.wish

+++ b/src/Objects/DataExpress/TclTk/src/CommandEntry.wish

		@@ -9,8 +9,8 @@
9	9	proc CommandEntry { name label width command args } {
10	10
11	11	set f [ frame $name ]
12		- label $name.label -text $label -anchor w
13		- #label $name.label -text $label -width [ expr $width*20 ] -anchor w
	12	+ #label $name.label -text $label -anchor w
	13	+ label $name.label -text $label -width [ expr $width * 7 ] -anchor w
14	14	#label $name.label -text $label -width 20 -anchor w
15	15	#labelframe $name -text $label -labelanchor w
16	16

		@@ -55,7 +55,9 @@ proc CommandEntryWithSelectionEntrySet { name var } {
55	55	#
56	56	proc CommandEntryWithUpDown { name label width command var delta args } {
57	57	frame $name
58		- label $name.label -text $label -width $width -anchor w
	58	+ #label $name.label -text $label -width $width -anchor w
	59	+ label $name.label -text $label -width [ expr $width * 6 ] -anchor w
	60	+ #label $name.label -text $label -anchor w
59	61	label $name.space -text " "
60	62	eval { entry $name.entry -relief sunken -textvar $var } $args
61	63

--- 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 } {
372	372	set ff [ frame $f.file2 ]
373	373	# FFT
374	374	set fff [ frame $ff.loadFFT ]
375		- button $fff.loadFFT -text "Load" -command "ScatteringCalc $ctfInfo(filename)"
376		- CommandEntry $fff.loadFFTEntry Data 5 "ScatteringCalc $ctfInfo(filename)" -textvar [subst $name]ctfInfo(filename)
	375	+ button $fff.loadFFT -text " Load " -command "ScatteringCalc $ctfInfo(filename)"
	376	+ CommandEntry $fff.loadFFTEntry Data 7 "ScatteringCalc $ctfInfo(filename)" -textvar [subst $name]ctfInfo(filename)
377	377	pack $fff.loadFFT $fff.loadFFTEntry -side left
378	378
379	379	#PS
380	380	set fff [ frame $ff.printPS ]
381		- button $fff.printPS -text "Save" -command "[subst $name]ctfInfoSaveAsPS"
382		- CommandEntry $fff.printPSEntry Graph 5 "[subst $name]ctfInfoSaveAsPS" -textvar [subst $name]ctfInfo(.ctfps)
	381	+ button $fff.printPS -text " Save " -command "[subst $name]ctfInfoSaveAsPS"
	382	+ CommandEntry $fff.printPSEntry GraphPS 7 "[subst $name]ctfInfoSaveAsPS" -textvar [subst $name]ctfInfo(.ctfps)
383	383	pack $fff.printPS $fff.printPSEntry -side left
384	384
385	385	#Def
386	386	set fff [ frame $ff.saveDefaultDir ]
387	387	button $fff.saveDefaultDir -text "SaveDefDir" -command "[subst $name]ctfInfoSaveDefaultDir"
388		- CommandEntry $fff.saveDefaultDirEntry Graph 5 "[subst $name]ctfInfoSaveDefaultDir" -textvar [subst $name]ctfInfo(.defdirctfinfo)
	388	+ CommandEntry $fff.saveDefaultDirEntry DefDir 7 "[subst $name]ctfInfoSaveDefaultDir" -textvar [subst $name]ctfInfo(.defdirctfinfo)
389	389	pack $fff.saveDefaultDir $fff.saveDefaultDirEntry -side left
390	390
391	391	#Def
392	392	set fff [ frame $ff.saveDefault ]
393		- button $fff.saveDefault -text "SaveDef" -command "[subst $name]ctfInfoSaveDefault"
394		- CommandEntry $fff.saveDefaultEntry Graph 5 "[subst $name]ctfInfoSaveDefault" -textvar [subst $name]ctfInfo(.defctfinfo)
	393	+ button $fff.saveDefault -text " SaveDef " -command "[subst $name]ctfInfoSaveDefault"
	394	+ CommandEntry $fff.saveDefaultEntry Def 7 "[subst $name]ctfInfoSaveDefault" -textvar [subst $name]ctfInfo(.defctfinfo)
395	395	pack $fff.saveDefault $fff.saveDefaultEntry -side left
396	396
397	397	#Exit

Show on old repository browser