This repository is a base of Eos.
リビジョン | 0219b55f227b4177834d695db23599c8d89f3285 (tree) |
---|---|
日時 | 2015-04-22 18:33:36 |
作者 | Takuo Yasunaga <yasunaga@bio....> |
コミッター | Takuo Yasunaga |
Merge branch 'master' of git.sourceforge.jp:/gitroot/eos/base
@@ -6,41 +6,38 @@ | ||
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]] | |
9 | +set auto_index(roiAreaRotateStart) [list source [file join $dir RoiAreaRotate.wish]] | |
10 | +set auto_index(roiAreaRotateMotion) [list source [file join $dir RoiAreaRotate.wish]] | |
11 | +set auto_index(roiAreaRotateEnd) [list source [file join $dir RoiAreaRotate.wish]] | |
12 | +set auto_index(rectangleRotate) [list source [file join $dir RoiAreaRotate.wish]] | |
13 | +set auto_index(rectangleRotateCalc) [list source [file join $dir RoiAreaRotate.wish]] | |
14 | +set auto_index(lineRotate) [list source [file join $dir RoiAreaRotate.wish]] | |
15 | +set auto_index(lineRotateCalc) [list source [file join $dir RoiAreaRotate.wish]] | |
16 | +set auto_index(splineRotate) [list source [file join $dir RoiAreaRotate.wish]] | |
17 | +set auto_index(splineRotateCalc) [list source [file join $dir RoiAreaRotate.wish]] | |
18 | +set auto_index(roiAreaSelectStart) [list source [file join $dir RoiAreaSelect.wish]] | |
19 | +set auto_index(roiAreaSelectMotion) [list source [file join $dir RoiAreaSelect.wish]] | |
20 | +set auto_index(roiAreaSelectEnd) [list source [file join $dir RoiAreaSelect.wish]] | |
21 | +set auto_index(roiAreaSelectOK) [list source [file join $dir RoiAreaSelect.wish]] | |
10 | 22 | 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]] | |
17 | -set auto_index(fileOpen) [list source [file join $dir Display2Image.wish]] | |
18 | -set auto_index(mainImagePut) [list source [file join $dir Display2Image.wish]] | |
19 | -set auto_index(overviewImagePut) [list source [file join $dir Display2Image.wish]] | |
20 | -set auto_index(histgramGraphCreate) [list source [file join $dir Display2Info.wish]] | |
21 | -set auto_index(display2InformationWinCreate) [list source [file join $dir Display2Info.wish]] | |
22 | -set auto_index(fileReopen) [list source [file join $dir Display2Info.wish]] | |
23 | -set auto_index(mrcImageInformationWinCreate) [list source [file join $dir Display2Info.wish]] | |
24 | -set auto_index(imageInformationWinCreate) [list source [file join $dir Display2Info.wish]] | |
25 | -set auto_index(layerLineInformationWinCreate) [list source [file join $dir Display2Info.wish]] | |
26 | -set auto_index(projectionInformationWinCreate) [list source [file join $dir Display2Info.wish]] | |
27 | -set auto_index(sectionInformationWinCreate) [list source [file join $dir Display2Info.wish]] | |
28 | -set auto_index(ctfInformationWinCreate) [list source [file join $dir Display2Info.wish]] | |
29 | -set auto_index(unitCellInformationWinCreate) [list source [file join $dir Display2Info.wish]] | |
30 | -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(display2Init) [list source [file join $dir Display2Init.wish]] | |
37 | -set auto_index(display2MenuSet) [list source [file join $dir Display2Menu.wish]] | |
38 | -set auto_index(menuFileCreate) [list source [file join $dir Display2Menu.wish]] | |
39 | -set auto_index(menuSeqFileCreate) [list source [file join $dir Display2Menu.wish]] | |
40 | -set auto_index(menuWindowCreate) [list source [file join $dir Display2Menu.wish]] | |
41 | -set auto_index(menuInfoCreate) [list source [file join $dir Display2Menu.wish]] | |
42 | -set auto_index(menuHelpCreate) [list source [file join $dir Display2Menu.wish]] | |
43 | 23 | set auto_index(display2MenuSet2) [list source [file join $dir Display2Menu2.wish]] |
24 | +set auto_index(fft2dCmd) [list source [file join $dir fft2dCmd.wish]] | |
25 | +set auto_index(display2BindingSet) [list source [file join $dir Display2Binding.wish]] | |
26 | +set auto_index(roiMultiAreaInfoSave) [list source [file join $dir RoiAreaFile.wish]] | |
27 | +set auto_index(roiMultiAreaInfoLoad) [list source [file join $dir RoiAreaFile.wish]] | |
28 | +set auto_index(roiAreaFileSave) [list source [file join $dir RoiAreaFile.wish]] | |
29 | +set auto_index(roiAreaFFT) [list source [file join $dir RoiAreaUtil.wish]] | |
30 | +set auto_index(splineNearPoint) [list source [file join $dir RoiAreaUtil.wish]] | |
31 | +set auto_index(rectangleNearPoint) [list source [file join $dir RoiAreaUtil.wish]] | |
32 | +set auto_index(lineNearPoint) [list source [file join $dir RoiAreaUtil.wish]] | |
33 | +set auto_index(pointDistance) [list source [file join $dir RoiAreaUtil.wish]] | |
34 | +set auto_index(pointDistance2) [list source [file join $dir RoiAreaUtil.wish]] | |
35 | +set auto_index(vectorAngle) [list source [file join $dir RoiAreaUtil.wish]] | |
36 | +set auto_index(coordGetInMainImageToReal) [list source [file join $dir RoiAreaUtil.wish]] | |
37 | +set auto_index(coordGetInMainImageToCanvas) [list source [file join $dir RoiAreaUtil.wish]] | |
38 | +set auto_index(dataGetInMainImageToReal) [list source [file join $dir RoiAreaUtil.wish]] | |
39 | +set auto_index(dataGetInMainImageToCanvas) [list source [file join $dir RoiAreaUtil.wish]] | |
40 | +set auto_index(pointSet) [list source [file join $dir RoiAreaUtil.wish]] | |
44 | 41 | set auto_index(roiRelatedObjectRecreate) [list source [file join $dir Display2MenuROI.wish]] |
45 | 42 | set auto_index(menuRoiCreate) [list source [file join $dir Display2MenuROI.wish]] |
46 | 43 | set auto_index(menuRoiCancelCommand) [list source [file join $dir Display2MenuROI.wish]] |
@@ -49,15 +46,42 @@ set auto_index(menuMultiRoiOKCommand) [list source [file join $dir Display2MenuR | ||
49 | 46 | set auto_index(menuMultiRoiAllDeleteCommand) [list source [file join $dir Display2MenuROI.wish]] |
50 | 47 | set auto_index(menuMultiRoiDeleteCommand) [list source [file join $dir Display2MenuROI.wish]] |
51 | 48 | set auto_index(menuEditCreate) [list source [file join $dir Display2MenuROI.wish]] |
49 | +<<<<<<< HEAD | |
50 | +set auto_index(display2Init) [list source [file join $dir Display2Init.wish]] | |
51 | +set auto_index(display2MenuSet) [list source [file join $dir Display2Menu.wish]] | |
52 | +set auto_index(menuFileCreate) [list source [file join $dir Display2Menu.wish]] | |
53 | +set auto_index(menuSeqFileCreate) [list source [file join $dir Display2Menu.wish]] | |
54 | +set auto_index(menuWindowCreate) [list source [file join $dir Display2Menu.wish]] | |
55 | +set auto_index(menuInfoCreate) [list source [file join $dir Display2Menu.wish]] | |
56 | +set auto_index(menuHelpCreate) [list source [file join $dir Display2Menu.wish]] | |
57 | +set auto_index(roiAreaResizeStart) [list source [file join $dir RoiAreaResize.wish]] | |
58 | +set auto_index(roiAreaResizeMotion) [list source [file join $dir RoiAreaResize.wish]] | |
59 | +set auto_index(roiAreaResizeEnd) [list source [file join $dir RoiAreaResize.wish]] | |
60 | +set auto_index(rectangleResize) [list source [file join $dir RoiAreaResize.wish]] | |
61 | +set auto_index(rectangleResizeCalc) [list source [file join $dir RoiAreaResize.wish]] | |
62 | +set auto_index(lineResize) [list source [file join $dir RoiAreaResize.wish]] | |
63 | +set auto_index(splineResize) [list source [file join $dir RoiAreaResize.wish]] | |
64 | +======= | |
52 | 65 | set auto_index(fft2dCmd) [list source [file join $dir fft2dCmd.wish]] |
66 | +>>>>>>> FETCH_HEAD | |
53 | 67 | set auto_index(layerLineRecreate) [list source [file join $dir LayerLineUtil.wish]] |
54 | 68 | set auto_index(layerLineCreate) [list source [file join $dir LayerLineUtil.wish]] |
55 | 69 | set auto_index(layerLineClear) [list source [file join $dir LayerLineUtil.wish]] |
56 | 70 | set auto_index(layerLineChange) [list source [file join $dir LayerLineUtil.wish]] |
57 | -set auto_index(projectionRecreate) [list source [file join $dir ProjectionUtil.wish]] | |
58 | -set auto_index(projectionCreate) [list source [file join $dir ProjectionUtil.wish]] | |
59 | -set auto_index(projectionClear) [list source [file join $dir ProjectionUtil.wish]] | |
60 | -set auto_index(projectionChange) [list source [file join $dir ProjectionUtil.wish]] | |
71 | +set auto_index(histgramGraphCreate) [list source [file join $dir Display2Info.wish]] | |
72 | +set auto_index(display2InformationWinCreate) [list source [file join $dir Display2Info.wish]] | |
73 | +set auto_index(fileReopen) [list source [file join $dir Display2Info.wish]] | |
74 | +set auto_index(mrcImageInformationWinCreate) [list source [file join $dir Display2Info.wish]] | |
75 | +set auto_index(imageInformationWinCreate) [list source [file join $dir Display2Info.wish]] | |
76 | +set auto_index(layerLineInformationWinCreate) [list source [file join $dir Display2Info.wish]] | |
77 | +set auto_index(projectionInformationWinCreate) [list source [file join $dir Display2Info.wish]] | |
78 | +set auto_index(sectionInformationWinCreate) [list source [file join $dir Display2Info.wish]] | |
79 | +set auto_index(ctfInformationWinCreate) [list source [file join $dir Display2Info.wish]] | |
80 | +set auto_index(unitCellInformationWinCreate) [list source [file join $dir Display2Info.wish]] | |
81 | +set auto_index(scaleInfoWinCreate) [list source [file join $dir Display2Info.wish]] | |
82 | +set auto_index(roiAreaZoomIn) [list source [file join $dir RoiAreaZoom.wish]] | |
83 | +set auto_index(roiAreaZoomOut) [list source [file join $dir RoiAreaZoom.wish]] | |
84 | +set auto_index(roiAreaZoom) [list source [file join $dir RoiAreaZoom.wish]] | |
61 | 85 | set auto_index(roiAreaCreateStart) [list source [file join $dir RoiAreaCreate.wish]] |
62 | 86 | set auto_index(roiAreaCreateMotion) [list source [file join $dir RoiAreaCreate.wish]] |
63 | 87 | set auto_index(roiAreaCreateEnd) [list source [file join $dir RoiAreaCreate.wish]] |
@@ -75,54 +99,29 @@ set auto_index(roiSplineEnd) [list source [file join $dir RoiAreaCreate.wish]] | ||
75 | 99 | set auto_index(splineCreate) [list source [file join $dir RoiAreaCreate.wish]] |
76 | 100 | set auto_index(knobShow) [list source [file join $dir RoiAreaCreate.wish]] |
77 | 101 | set auto_index(knobHide) [list source [file join $dir RoiAreaCreate.wish]] |
78 | -set auto_index(roiMultiAreaInfoSave) [list source [file join $dir RoiAreaFile.wish]] | |
79 | -set auto_index(roiMultiAreaInfoLoad) [list source [file join $dir RoiAreaFile.wish]] | |
80 | -set auto_index(roiAreaFileSave) [list source [file join $dir RoiAreaFile.wish]] | |
102 | +set auto_index(fileOpenWinCreate) [list source [file join $dir Display2File.wish]] | |
103 | +set auto_index(fileNewWinCreate) [list source [file join $dir Display2File.wish]] | |
104 | +set auto_index(seqFileOpenWinCreate) [list source [file join $dir Display2File.wish]] | |
105 | +set auto_index(seqFileNewWinCreate) [list source [file join $dir Display2File.wish]] | |
106 | +set auto_index(ScaleRecreate) [list source [file join $dir ScaleUtil.wish]] | |
107 | +set auto_index(ScaleCreate) [list source [file join $dir ScaleUtil.wish]] | |
108 | +set auto_index(ScaleClear) [list source [file join $dir ScaleUtil.wish]] | |
109 | +set auto_index(ScaleChange) [list source [file join $dir ScaleUtil.wish]] | |
110 | +set auto_index(unitCellRecreate) [list source [file join $dir UnitCell.wish]] | |
111 | +set auto_index(fileOpen) [list source [file join $dir Display2Image.wish]] | |
112 | +set auto_index(mainImagePut) [list source [file join $dir Display2Image.wish]] | |
113 | +set auto_index(overviewImagePut) [list source [file join $dir Display2Image.wish]] | |
81 | 114 | set auto_index(roiAreaMoveStart) [list source [file join $dir RoiAreaMove.wish]] |
82 | 115 | set auto_index(roiAreaMoveMotion) [list source [file join $dir RoiAreaMove.wish]] |
83 | 116 | set auto_index(roiAreaMoveEnd) [list source [file join $dir RoiAreaMove.wish]] |
84 | 117 | set auto_index(rectangleMove) [list source [file join $dir RoiAreaMove.wish]] |
85 | 118 | set auto_index(lineMove) [list source [file join $dir RoiAreaMove.wish]] |
86 | 119 | set auto_index(splineMove) [list source [file join $dir RoiAreaMove.wish]] |
87 | -set auto_index(roiAreaResizeStart) [list source [file join $dir RoiAreaResize.wish]] | |
88 | -set auto_index(roiAreaResizeMotion) [list source [file join $dir RoiAreaResize.wish]] | |
89 | -set auto_index(roiAreaResizeEnd) [list source [file join $dir RoiAreaResize.wish]] | |
90 | -set auto_index(rectangleResize) [list source [file join $dir RoiAreaResize.wish]] | |
91 | -set auto_index(rectangleResizeCalc) [list source [file join $dir RoiAreaResize.wish]] | |
92 | -set auto_index(lineResize) [list source [file join $dir RoiAreaResize.wish]] | |
93 | -set auto_index(splineResize) [list source [file join $dir RoiAreaResize.wish]] | |
94 | -set auto_index(roiAreaRotateStart) [list source [file join $dir RoiAreaRotate.wish]] | |
95 | -set auto_index(roiAreaRotateMotion) [list source [file join $dir RoiAreaRotate.wish]] | |
96 | -set auto_index(roiAreaRotateEnd) [list source [file join $dir RoiAreaRotate.wish]] | |
97 | -set auto_index(rectangleRotate) [list source [file join $dir RoiAreaRotate.wish]] | |
98 | -set auto_index(rectangleRotateCalc) [list source [file join $dir RoiAreaRotate.wish]] | |
99 | -set auto_index(lineRotate) [list source [file join $dir RoiAreaRotate.wish]] | |
100 | -set auto_index(lineRotateCalc) [list source [file join $dir RoiAreaRotate.wish]] | |
101 | -set auto_index(splineRotate) [list source [file join $dir RoiAreaRotate.wish]] | |
102 | -set auto_index(splineRotateCalc) [list source [file join $dir RoiAreaRotate.wish]] | |
103 | -set auto_index(roiAreaSelectStart) [list source [file join $dir RoiAreaSelect.wish]] | |
104 | -set auto_index(roiAreaSelectMotion) [list source [file join $dir RoiAreaSelect.wish]] | |
105 | -set auto_index(roiAreaSelectEnd) [list source [file join $dir RoiAreaSelect.wish]] | |
106 | -set auto_index(roiAreaSelectOK) [list source [file join $dir RoiAreaSelect.wish]] | |
107 | -set auto_index(roiAreaFFT) [list source [file join $dir RoiAreaUtil.wish]] | |
108 | -set auto_index(splineNearPoint) [list source [file join $dir RoiAreaUtil.wish]] | |
109 | -set auto_index(rectangleNearPoint) [list source [file join $dir RoiAreaUtil.wish]] | |
110 | -set auto_index(lineNearPoint) [list source [file join $dir RoiAreaUtil.wish]] | |
111 | -set auto_index(pointDistance) [list source [file join $dir RoiAreaUtil.wish]] | |
112 | -set auto_index(pointDistance2) [list source [file join $dir RoiAreaUtil.wish]] | |
113 | -set auto_index(vectorAngle) [list source [file join $dir RoiAreaUtil.wish]] | |
114 | -set auto_index(coordGetInMainImageToReal) [list source [file join $dir RoiAreaUtil.wish]] | |
115 | -set auto_index(coordGetInMainImageToCanvas) [list source [file join $dir RoiAreaUtil.wish]] | |
116 | -set auto_index(dataGetInMainImageToReal) [list source [file join $dir RoiAreaUtil.wish]] | |
117 | -set auto_index(dataGetInMainImageToCanvas) [list source [file join $dir RoiAreaUtil.wish]] | |
118 | -set auto_index(pointSet) [list source [file join $dir RoiAreaUtil.wish]] | |
119 | -set auto_index(roiAreaZoomIn) [list source [file join $dir RoiAreaZoom.wish]] | |
120 | -set auto_index(roiAreaZoomOut) [list source [file join $dir RoiAreaZoom.wish]] | |
121 | -set auto_index(roiAreaZoom) [list source [file join $dir RoiAreaZoom.wish]] | |
122 | -set auto_index(ScaleRecreate) [list source [file join $dir ScaleUtil.wish]] | |
123 | -set auto_index(ScaleCreate) [list source [file join $dir ScaleUtil.wish]] | |
124 | -set auto_index(ScaleClear) [list source [file join $dir ScaleUtil.wish]] | |
125 | -set auto_index(ScaleChange) [list source [file join $dir ScaleUtil.wish]] | |
120 | +set auto_index(roiInformationWinCreate) [list source [file join $dir Display2InfoROI.wish]] | |
121 | +set auto_index(roiLineInfoFrameCreate) [list source [file join $dir Display2InfoROI.wish]] | |
122 | +set auto_index(roiSplineInfoFrameCreate) [list source [file join $dir Display2InfoROI.wish]] | |
123 | +set auto_index(roiRectangleInfoFrameCreate) [list source [file join $dir Display2InfoROI.wish]] | |
124 | +set auto_index(roiAnalysisFrameCreate) [list source [file join $dir Display2InfoROI.wish]] | |
126 | 125 | set auto_index(sectionInit) [list source [file join $dir SectionUtil.wish]] |
127 | 126 | set auto_index(sectionRecreateAll) [list source [file join $dir SectionUtil.wish]] |
128 | 127 | set auto_index(sectionRecreate) [list source [file join $dir SectionUtil.wish]] |
@@ -3,6 +3,13 @@ | ||
3 | 3 | <H2>Information from source codes</H2> |
4 | 4 | </A> |
5 | 5 | <PRE> |
6 | +../src/dmFileInfo.c: | |
7 | + | |
8 | +../src/dmFileRead.c: | |
9 | + | |
10 | +../src/dmFileUtil.c: | |
11 | + | |
12 | +../src/ldm2mrc.c: | |
6 | 13 | </PRE> |
7 | 14 | <HR> |
8 | 15 | <A NAME="include"> |