OSDN > Buscar 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

Revisión	25962f0a06262c1cce667427126126da431340a6 (tree)
Tiempo	2021-10-26 22:17:44
Autor	Takuo Yasunaga <yasunaga@bio....>
Commiter	Takuo Yasunaga

Log Message

Please enter the commit message for your changes. Lines starting
with '#' will be ignored, and an empty message aborts the commit.

On branch master
Your branch is up to date with 'origin/master'.

Changes to be committed:

modified: .DS_Store
modified: bin/wish/Display2/tclIndex
modified: src/.DS_Store
modified: src/Tools/.DS_Store
modified: src/Tools/.Source
modified: src/Tools/Config/Define.inc
modified: src/Tools/filter/tiff2mrc/src/tiff2mrc.c

Cambiar Resumen

modified: .DS_Store (diff)
modified: bin/wish/Display2/tclIndex (diff)
modified: src/.DS_Store (diff)
modified: src/Tools/.DS_Store (diff)
modified: src/Tools/.Source (diff)
modified: src/Tools/Config/Define.inc (diff)
modified: src/Tools/filter/tiff2mrc/src/tiff2mrc.c (diff)

Diferencia incremental

Binary files a/.DS_Store and b/.DS_Store differ

--- a/bin/wish/Display2/tclIndex

+++ b/bin/wish/Display2/tclIndex

		@@ -6,17 +6,43 @@
6	6	# element name is the name of a command and the value is
7	7	# a script that loads the command.
8	8
9		-set auto_index(display2BindingSet) [list source [file join $dir Display2Binding.wish]]
10		-set auto_index(colormapChange) [list source [file join $dir Display2Colormap.wish]]
11		-set auto_index(display2DesktopSet) [list source [file join $dir Display2Desktop.wish]]
12		-set auto_index(display2ETCSet) [list source [file join $dir Display2ETCSet.wish]]
13		-set auto_index(fileOpenWinCreate) [list source [file join $dir Display2File.wish]]
14		-set auto_index(fileNewWinCreate) [list source [file join $dir Display2File.wish]]
15		-set auto_index(seqFileOpenWinCreate) [list source [file join $dir Display2File.wish]]
16		-set auto_index(seqFileNewWinCreate) [list source [file join $dir Display2File.wish]]
	9	+set auto_index(roiAreaSelectStart) [list source [file join $dir RoiAreaSelect.wish]]
	10	+set auto_index(roiAreaSelectMotion) [list source [file join $dir RoiAreaSelect.wish]]
	11	+set auto_index(roiAreaSelectEnd) [list source [file join $dir RoiAreaSelect.wish]]
	12	+set auto_index(roiAreaSelectOK) [list source [file join $dir RoiAreaSelect.wish]]
	13	+set auto_index(projectionRecreate) [list source [file join $dir ProjectionUtil.wish]]
	14	+set auto_index(projectionCreate) [list source [file join $dir ProjectionUtil.wish]]
	15	+set auto_index(projectionClear) [list source [file join $dir ProjectionUtil.wish]]
	16	+set auto_index(projectionChange) [list source [file join $dir ProjectionUtil.wish]]
17	17	set auto_index(fileOpen) [list source [file join $dir Display2Image.wish]]
18	18	set auto_index(mainImagePut) [list source [file join $dir Display2Image.wish]]
19	19	set auto_index(overviewImagePut) [list source [file join $dir Display2Image.wish]]
	20	+set auto_index(roiAreaFFT) [list source [file join $dir RoiAreaUtil.wish]]
	21	+set auto_index(splineNearPoint) [list source [file join $dir RoiAreaUtil.wish]]
	22	+set auto_index(rectangleNearPoint) [list source [file join $dir RoiAreaUtil.wish]]
	23	+set auto_index(lineNearPoint) [list source [file join $dir RoiAreaUtil.wish]]
	24	+set auto_index(pointDistance) [list source [file join $dir RoiAreaUtil.wish]]
	25	+set auto_index(pointDistance2) [list source [file join $dir RoiAreaUtil.wish]]
	26	+set auto_index(vectorAngle) [list source [file join $dir RoiAreaUtil.wish]]
	27	+set auto_index(coordGetInMainImageToReal) [list source [file join $dir RoiAreaUtil.wish]]
	28	+set auto_index(coordGetInMainImageToCanvas) [list source [file join $dir RoiAreaUtil.wish]]
	29	+set auto_index(dataGetInMainImageToReal) [list source [file join $dir RoiAreaUtil.wish]]
	30	+set auto_index(dataGetInMainImageToCanvas) [list source [file join $dir RoiAreaUtil.wish]]
	31	+set auto_index(pointSet) [list source [file join $dir RoiAreaUtil.wish]]
	32	+set auto_index(roiAreaZoomIn) [list source [file join $dir RoiAreaZoom.wish]]
	33	+set auto_index(roiAreaZoomOut) [list source [file join $dir RoiAreaZoom.wish]]
	34	+set auto_index(roiAreaZoom) [list source [file join $dir RoiAreaZoom.wish]]
	35	+set auto_index(colormapChange) [list source [file join $dir Display2Colormap.wish]]
	36	+set auto_index(display2SetVar) [list source [file join $dir Display2Init.wish]]
	37	+set auto_index(display2InitVar) [list source [file join $dir Display2Init.wish]]
	38	+set auto_index(display2InitVarSet) [list source [file join $dir Display2Init.wish]]
	39	+set auto_index(diplay2CanvasInit) [list source [file join $dir Display2Init.wish]]
	40	+set auto_index(display2Init) [list source [file join $dir Display2Init.wish]]
	41	+set auto_index(roiInformationWinCreate) [list source [file join $dir Display2InfoROI.wish]]
	42	+set auto_index(roiLineInfoFrameCreate) [list source [file join $dir Display2InfoROI.wish]]
	43	+set auto_index(roiSplineInfoFrameCreate) [list source [file join $dir Display2InfoROI.wish]]
	44	+set auto_index(roiRectangleInfoFrameCreate) [list source [file join $dir Display2InfoROI.wish]]
	45	+set auto_index(roiAnalysisFrameCreate) [list source [file join $dir Display2InfoROI.wish]]
20	46	set auto_index(histgramGraphCreate) [list source [file join $dir Display2Info.wish]]
21	47	set auto_index(display2InformationWinCreate) [list source [file join $dir Display2Info.wish]]
22	48	set auto_index(fileReopen) [list source [file join $dir Display2Info.wish]]

		@@ -28,40 +54,7 @@ set auto_index(sectionInformationWinCreate) [list source [file join $dir Display
28	54	set auto_index(ctfInformationWinCreate) [list source [file join $dir Display2Info.wish]]
29	55	set auto_index(unitCellInformationWinCreate) [list source [file join $dir Display2Info.wish]]
30	56	set auto_index(scaleInfoWinCreate) [list source [file join $dir Display2Info.wish]]
31		-set auto_index(roiInformationWinCreate) [list source [file join $dir Display2InfoROI.wish]]
32		-set auto_index(roiLineInfoFrameCreate) [list source [file join $dir Display2InfoROI.wish]]
33		-set auto_index(roiSplineInfoFrameCreate) [list source [file join $dir Display2InfoROI.wish]]
34		-set auto_index(roiRectangleInfoFrameCreate) [list source [file join $dir Display2InfoROI.wish]]
35		-set auto_index(roiAnalysisFrameCreate) [list source [file join $dir Display2InfoROI.wish]]
36		-set auto_index(display2SetVar) [list source [file join $dir Display2Init.wish]]
37		-set auto_index(display2InitVar) [list source [file join $dir Display2Init.wish]]
38		-set auto_index(display2InitVarSet) [list source [file join $dir Display2Init.wish]]
39		-set auto_index(diplay2CanvasInit) [list source [file join $dir Display2Init.wish]]
40		-set auto_index(display2Init) [list source [file join $dir Display2Init.wish]]
41		-set auto_index(display2MenuSet) [list source [file join $dir Display2Menu.wish]]
42		-set auto_index(menuFileCreate) [list source [file join $dir Display2Menu.wish]]
43		-set auto_index(menuSeqFileCreate) [list source [file join $dir Display2Menu.wish]]
44		-set auto_index(menuWindowCreate) [list source [file join $dir Display2Menu.wish]]
45		-set auto_index(menuInfoCreate) [list source [file join $dir Display2Menu.wish]]
46		-set auto_index(menuHelpCreate) [list source [file join $dir Display2Menu.wish]]
47		-set auto_index(menuExitCreate) [list source [file join $dir Display2Menu.wish]]
48		-set auto_index(display2MenuSet2) [list source [file join $dir Display2Menu2.wish]]
49		-set auto_index(roiRelatedObjectRecreate) [list source [file join $dir Display2MenuROI.wish]]
50		-set auto_index(menuRoiCreate) [list source [file join $dir Display2MenuROI.wish]]
51		-set auto_index(menuRoiCancelCommand) [list source [file join $dir Display2MenuROI.wish]]
52		-set auto_index(menuRoiSingleMultiTransform) [list source [file join $dir Display2MenuROI.wish]]
53		-set auto_index(menuMultiRoiOKCommand) [list source [file join $dir Display2MenuROI.wish]]
54		-set auto_index(menuMultiRoiAllDeleteCommand) [list source [file join $dir Display2MenuROI.wish]]
55		-set auto_index(menuMultiRoiDeleteCommand) [list source [file join $dir Display2MenuROI.wish]]
56		-set auto_index(menuEditCreate) [list source [file join $dir Display2MenuROI.wish]]
57		-set auto_index(layerLineRecreate) [list source [file join $dir LayerLineUtil.wish]]
58		-set auto_index(layerLineCreate) [list source [file join $dir LayerLineUtil.wish]]
59		-set auto_index(layerLineClear) [list source [file join $dir LayerLineUtil.wish]]
60		-set auto_index(layerLineChange) [list source [file join $dir LayerLineUtil.wish]]
61		-set auto_index(projectionRecreate) [list source [file join $dir ProjectionUtil.wish]]
62		-set auto_index(projectionCreate) [list source [file join $dir ProjectionUtil.wish]]
63		-set auto_index(projectionClear) [list source [file join $dir ProjectionUtil.wish]]
64		-set auto_index(projectionChange) [list source [file join $dir ProjectionUtil.wish]]
	57	+set auto_index(fft2dCmd) [list source [file join $dir fft2dCmd.wish]]
65	58	set auto_index(roiAreaCreateStart) [list source [file join $dir RoiAreaCreate.wish]]
66	59	set auto_index(roiAreaCreateMotion) [list source [file join $dir RoiAreaCreate.wish]]
67	60	set auto_index(roiAreaCreateEnd) [list source [file join $dir RoiAreaCreate.wish]]

		@@ -79,15 +72,22 @@ set auto_index(roiSplineEnd) [list source [file join $dir RoiAreaCreate.wish]]
79	72	set auto_index(splineCreate) [list source [file join $dir RoiAreaCreate.wish]]
80	73	set auto_index(knobShow) [list source [file join $dir RoiAreaCreate.wish]]
81	74	set auto_index(knobHide) [list source [file join $dir RoiAreaCreate.wish]]
82		-set auto_index(roiMultiAreaInfoSave) [list source [file join $dir RoiAreaFile.wish]]
83		-set auto_index(roiMultiAreaInfoLoad) [list source [file join $dir RoiAreaFile.wish]]
84		-set auto_index(roiAreaFileSave) [list source [file join $dir RoiAreaFile.wish]]
85		-set auto_index(roiAreaMoveStart) [list source [file join $dir RoiAreaMove.wish]]
86		-set auto_index(roiAreaMoveMotion) [list source [file join $dir RoiAreaMove.wish]]
87		-set auto_index(roiAreaMoveEnd) [list source [file join $dir RoiAreaMove.wish]]
88		-set auto_index(rectangleMove) [list source [file join $dir RoiAreaMove.wish]]
89		-set auto_index(lineMove) [list source [file join $dir RoiAreaMove.wish]]
90		-set auto_index(splineMove) [list source [file join $dir RoiAreaMove.wish]]
	75	+set auto_index(display2BindingSet) [list source [file join $dir Display2Binding.wish]]
	76	+set auto_index(display2MenuSet) [list source [file join $dir Display2Menu.wish]]
	77	+set auto_index(menuFileCreate) [list source [file join $dir Display2Menu.wish]]
	78	+set auto_index(menuSeqFileCreate) [list source [file join $dir Display2Menu.wish]]
	79	+set auto_index(menuWindowCreate) [list source [file join $dir Display2Menu.wish]]
	80	+set auto_index(menuInfoCreate) [list source [file join $dir Display2Menu.wish]]
	81	+set auto_index(menuHelpCreate) [list source [file join $dir Display2Menu.wish]]
	82	+set auto_index(menuExitCreate) [list source [file join $dir Display2Menu.wish]]
	83	+set auto_index(roiRelatedObjectRecreate) [list source [file join $dir Display2MenuROI.wish]]
	84	+set auto_index(menuRoiCreate) [list source [file join $dir Display2MenuROI.wish]]
	85	+set auto_index(menuRoiCancelCommand) [list source [file join $dir Display2MenuROI.wish]]
	86	+set auto_index(menuRoiSingleMultiTransform) [list source [file join $dir Display2MenuROI.wish]]
	87	+set auto_index(menuMultiRoiOKCommand) [list source [file join $dir Display2MenuROI.wish]]
	88	+set auto_index(menuMultiRoiAllDeleteCommand) [list source [file join $dir Display2MenuROI.wish]]
	89	+set auto_index(menuMultiRoiDeleteCommand) [list source [file join $dir Display2MenuROI.wish]]
	90	+set auto_index(menuEditCreate) [list source [file join $dir Display2MenuROI.wish]]
91	91	set auto_index(roiAreaResizeStart) [list source [file join $dir RoiAreaResize.wish]]
92	92	set auto_index(roiAreaResizeMotion) [list source [file join $dir RoiAreaResize.wish]]
93	93	set auto_index(roiAreaResizeEnd) [list source [file join $dir RoiAreaResize.wish]]

		@@ -104,29 +104,18 @@ set auto_index(lineRotate) [list source [file join $dir RoiAreaRotate.wish]]
104	104	set auto_index(lineRotateCalc) [list source [file join $dir RoiAreaRotate.wish]]
105	105	set auto_index(splineRotate) [list source [file join $dir RoiAreaRotate.wish]]
106	106	set auto_index(splineRotateCalc) [list source [file join $dir RoiAreaRotate.wish]]
107		-set auto_index(roiAreaSelectStart) [list source [file join $dir RoiAreaSelect.wish]]
108		-set auto_index(roiAreaSelectMotion) [list source [file join $dir RoiAreaSelect.wish]]
109		-set auto_index(roiAreaSelectEnd) [list source [file join $dir RoiAreaSelect.wish]]
110		-set auto_index(roiAreaSelectOK) [list source [file join $dir RoiAreaSelect.wish]]
111		-set auto_index(roiAreaFFT) [list source [file join $dir RoiAreaUtil.wish]]
112		-set auto_index(splineNearPoint) [list source [file join $dir RoiAreaUtil.wish]]
113		-set auto_index(rectangleNearPoint) [list source [file join $dir RoiAreaUtil.wish]]
114		-set auto_index(lineNearPoint) [list source [file join $dir RoiAreaUtil.wish]]
115		-set auto_index(pointDistance) [list source [file join $dir RoiAreaUtil.wish]]
116		-set auto_index(pointDistance2) [list source [file join $dir RoiAreaUtil.wish]]
117		-set auto_index(vectorAngle) [list source [file join $dir RoiAreaUtil.wish]]
118		-set auto_index(coordGetInMainImageToReal) [list source [file join $dir RoiAreaUtil.wish]]
119		-set auto_index(coordGetInMainImageToCanvas) [list source [file join $dir RoiAreaUtil.wish]]
120		-set auto_index(dataGetInMainImageToReal) [list source [file join $dir RoiAreaUtil.wish]]
121		-set auto_index(dataGetInMainImageToCanvas) [list source [file join $dir RoiAreaUtil.wish]]
122		-set auto_index(pointSet) [list source [file join $dir RoiAreaUtil.wish]]
123		-set auto_index(roiAreaZoomIn) [list source [file join $dir RoiAreaZoom.wish]]
124		-set auto_index(roiAreaZoomOut) [list source [file join $dir RoiAreaZoom.wish]]
125		-set auto_index(roiAreaZoom) [list source [file join $dir RoiAreaZoom.wish]]
126		-set auto_index(ScaleRecreate) [list source [file join $dir ScaleUtil.wish]]
127		-set auto_index(ScaleCreate) [list source [file join $dir ScaleUtil.wish]]
128		-set auto_index(ScaleClear) [list source [file join $dir ScaleUtil.wish]]
129		-set auto_index(ScaleChange) [list source [file join $dir ScaleUtil.wish]]
	107	+set auto_index(roiMultiAreaInfoSave) [list source [file join $dir RoiAreaFile.wish]]
	108	+set auto_index(roiMultiAreaInfoLoad) [list source [file join $dir RoiAreaFile.wish]]
	109	+set auto_index(roiAreaFileSave) [list source [file join $dir RoiAreaFile.wish]]
	110	+set auto_index(layerLineRecreate) [list source [file join $dir LayerLineUtil.wish]]
	111	+set auto_index(layerLineCreate) [list source [file join $dir LayerLineUtil.wish]]
	112	+set auto_index(layerLineClear) [list source [file join $dir LayerLineUtil.wish]]
	113	+set auto_index(layerLineChange) [list source [file join $dir LayerLineUtil.wish]]
	114	+set auto_index(fileOpenWinCreate) [list source [file join $dir Display2File.wish]]
	115	+set auto_index(fileNewWinCreate) [list source [file join $dir Display2File.wish]]
	116	+set auto_index(seqFileOpenWinCreate) [list source [file join $dir Display2File.wish]]
	117	+set auto_index(seqFileNewWinCreate) [list source [file join $dir Display2File.wish]]
	118	+set auto_index(display2DesktopSet) [list source [file join $dir Display2Desktop.wish]]
130	119	set auto_index(sectionInit) [list source [file join $dir SectionUtil.wish]]
131	120	set auto_index(sectionRecreateAll) [list source [file join $dir SectionUtil.wish]]
132	121	set auto_index(sectionRecreate) [list source [file join $dir SectionUtil.wish]]

		@@ -135,5 +124,16 @@ set auto_index(sectionCreate) [list source [file join $dir SectionUtil.wish]]
135	124	set auto_index(sectionClearAll) [list source [file join $dir SectionUtil.wish]]
136	125	set auto_index(sectionClear) [list source [file join $dir SectionUtil.wish]]
137	126	set auto_index(sectionChange) [list source [file join $dir SectionUtil.wish]]
	127	+set auto_index(ScaleRecreate) [list source [file join $dir ScaleUtil.wish]]
	128	+set auto_index(ScaleCreate) [list source [file join $dir ScaleUtil.wish]]
	129	+set auto_index(ScaleClear) [list source [file join $dir ScaleUtil.wish]]
	130	+set auto_index(ScaleChange) [list source [file join $dir ScaleUtil.wish]]
138	131	set auto_index(unitCellRecreate) [list source [file join $dir UnitCell.wish]]
139		-set auto_index(fft2dCmd) [list source [file join $dir fft2dCmd.wish]]
	132	+set auto_index(display2MenuSet2) [list source [file join $dir Display2Menu2.wish]]
	133	+set auto_index(roiAreaMoveStart) [list source [file join $dir RoiAreaMove.wish]]
	134	+set auto_index(roiAreaMoveMotion) [list source [file join $dir RoiAreaMove.wish]]
	135	+set auto_index(roiAreaMoveEnd) [list source [file join $dir RoiAreaMove.wish]]
	136	+set auto_index(rectangleMove) [list source [file join $dir RoiAreaMove.wish]]
	137	+set auto_index(lineMove) [list source [file join $dir RoiAreaMove.wish]]
	138	+set auto_index(splineMove) [list source [file join $dir RoiAreaMove.wish]]
	139	+set auto_index(display2ETCSet) [list source [file join $dir Display2ETCSet.wish]]

Binary files a/src/.DS_Store and b/src/.DS_Store differ

Binary files a/src/Tools/.DS_Store and b/src/Tools/.DS_Store differ

--- a/src/Tools/.Source

+++ b/src/Tools/.Source

		@@ -26,6 +26,7 @@ psUtil \
26	26	random \
27	27	rec3d \
28	28	simulation \
	29	+test \
29	30	tiffFileUtil \
30	31	timeSeries \
31	32	transform \

--- a/src/Tools/Config/Define.inc

+++ b/src/Tools/Config/Define.inc

		@@ -1,62 +1,5 @@
1	1	WORLDNAME=Tools
2		-<<<<<<< HEAD
3	2	WORLDNAME=Tools
4	3	WORLDNAME=Tools
5	4	WORLDNAME=Tools
6	5	WORLDNAME=Tools
7		-WORLDNAME=Tools
8		-WORLDNAME=Tools
9		-WORLDNAME=Tools
10		-WORLDNAME=Tools
11		-WORLDNAME=Tools
12		-<<<<<<< HEAD
13		-=======
14		-WORLDNAME=Tools
15		-WORLDNAME=Tools
16		-WORLDNAME=Tools
17		-WORLDNAME=Tools
18		-WORLDNAME=Tools
19		-WORLDNAME=Tools
20		-WORLDNAME=Tools
21		-WORLDNAME=Tools
22		-WORLDNAME=Tools
23		-WORLDNAME=Tools
24		-WORLDNAME=Tools
25		-WORLDNAME=Tools
26		-WORLDNAME=Tools
27		-WORLDNAME=Tools
28		-WORLDNAME=Tools
29		-WORLDNAME=Tools
30		-WORLDNAME=Tools
31		-WORLDNAME=Tools
32		-WORLDNAME=Tools
33		-WORLDNAME=Tools
34		-WORLDNAME=Tools
35		-WORLDNAME=Tools
36		-WORLDNAME=Tools
37		-WORLDNAME=Tools
38		-WORLDNAME=Tools
39		-WORLDNAME=Tools
40		-WORLDNAME=Tools
41		-WORLDNAME=Tools
42		-WORLDNAME=Tools
43		-WORLDNAME=Tools
44		-WORLDNAME=Tools
45		-WORLDNAME=Tools
46		-WORLDNAME=Tools
47		-WORLDNAME=Tools
48		-WORLDNAME=Tools
49		-WORLDNAME=Tools
50		-WORLDNAME=Tools
51		-WORLDNAME=Tools
52		-WORLDNAME=Tools
53		-WORLDNAME=Tools
54		-WORLDNAME=Tools
55		-WORLDNAME=Tools
56		-WORLDNAME=Tools
57		-WORLDNAME=Tools
58		-WORLDNAME=Tools
59		-WORLDNAME=Tools
60		-=======
61		->>>>>>> refs/remotes/origin/master
62		->>>>>>> 095c177e7074abc54cbfef5b79eeef49f6aabf12

--- a/src/Tools/filter/tiff2mrc/src/tiff2mrc.c

+++ b/src/Tools/filter/tiff2mrc/src/tiff2mrc.c

		@@ -682,8 +682,8 @@ ltiff2mrc(mrcImage* mrc, TIFF* tiff, ltiff2mrcInfo* linfo, long mode)
682	682	mrcImage shrink;
683	683	mrcImageParaTypeIntegerCoord S;
684	684
685		- S.x = S.y = linfo->Shrink;
686		- S.z = 1;
	685	+ S.z = S.x = S.y = linfo->Shrink;
	686	+ //S.z = 1;
687	687	lmrcImageShrink(&shrink, mrc, S, 0);
688	688
689	689	*mrc = shrink;

Show on old repository browser