This repository is a base of Eos.
Revisión | c2d1fe339d5ec0bfa1017b97c48658245c3b5dcc (tree) |
---|---|
Tiempo | 2015-10-18 22:26:40 |
Autor | Takuo Yasunaga <yasunaga@bio....> |
Commiter | Takuo Yasunaga |
mrc2bild completed:
new file: bin/mrc2bild
modified: include/bildFile.h
modified: src/Objects/DataManip/bildFile/src/lmrc2bild.c
modified: src/Tools/filter/mrc2bild/Config/OptionControlFile
@@ -0,0 +1 @@ | ||
1 | +../sbin/MachineIndependent | |
\ No newline at end of file |
@@ -17,7 +17,8 @@ | ||
17 | 17 | |
18 | 18 | /* constant begin */ |
19 | 19 | typedef enum lmrc2bildMode { |
20 | - lmrc2bildModeArrows=0 | |
20 | + lmrc2bildModeArrows=0, | |
21 | + lmrc2bildModeSpheres=1 | |
21 | 22 | } lmrc2bildMode; |
22 | 23 | |
23 | 24 |
@@ -41,8 +42,10 @@ extern "C" { | ||
41 | 42 | |
42 | 43 | /* prototype begin */ |
43 | 44 | |
45 | +extern void lmrc2bildUsage(FILE* fpt); | |
44 | 46 | extern void lmrc2bild(FILE* fpt, mrcImage* in, lmrc2bildInfo linfo, int mode); |
45 | 47 | extern void lmrc2bildArrows(FILE* fpt, mrcImage* in, lmrc2bildInfo linfo, int mode); |
48 | +extern void lmrc2bildSpheres(FILE* fpt, mrcImage* in, lmrc2bildInfo linfo, int mode); | |
46 | 49 | |
47 | 50 | /* prototype end */ |
48 | 51 |
@@ -28,7 +28,8 @@ | ||
28 | 28 | |
29 | 29 | /* constant begin */ |
30 | 30 | typedef enum lmrc2bildMode { |
31 | - lmrc2bildModeArrows=0 | |
31 | + lmrc2bildModeArrows=0, | |
32 | + lmrc2bildModeSpheres=1 | |
32 | 33 | } lmrc2bildMode; |
33 | 34 | |
34 | 35 |
@@ -52,8 +53,10 @@ extern "C" { | ||
52 | 53 | |
53 | 54 | /* prototype begin */ |
54 | 55 | |
56 | +extern void lmrc2bildUsage(FILE* fpt); | |
55 | 57 | extern void lmrc2bild(FILE* fpt, mrcImage* in, lmrc2bildInfo linfo, int mode); |
56 | 58 | extern void lmrc2bildArrows(FILE* fpt, mrcImage* in, lmrc2bildInfo linfo, int mode); |
59 | +extern void lmrc2bildSpheres(FILE* fpt, mrcImage* in, lmrc2bildInfo linfo, int mode); | |
57 | 60 | |
58 | 61 | /* prototype end */ |
59 | 62 |
@@ -17,7 +17,8 @@ | ||
17 | 17 | |
18 | 18 | /* constant begin */ |
19 | 19 | typedef enum lmrc2bildMode { |
20 | - lmrc2bildModeArrows=0 | |
20 | + lmrc2bildModeArrows=0, | |
21 | + lmrc2bildModeSpheres=1 | |
21 | 22 | } lmrc2bildMode; |
22 | 23 | |
23 | 24 |
@@ -41,8 +42,10 @@ extern "C" { | ||
41 | 42 | |
42 | 43 | /* prototype begin */ |
43 | 44 | |
45 | +extern void lmrc2bildUsage(FILE* fpt); | |
44 | 46 | extern void lmrc2bild(FILE* fpt, mrcImage* in, lmrc2bildInfo linfo, int mode); |
45 | 47 | extern void lmrc2bildArrows(FILE* fpt, mrcImage* in, lmrc2bildInfo linfo, int mode); |
48 | +extern void lmrc2bildSpheres(FILE* fpt, mrcImage* in, lmrc2bildInfo linfo, int mode); | |
46 | 49 | |
47 | 50 | /* prototype end */ |
48 | 51 |
@@ -17,7 +17,7 @@ void | ||
17 | 17 | lmrc2bildUsage(FILE* fpt) |
18 | 18 | { |
19 | 19 | fprintf(fpt, "%d: Arrows\n", lmrc2bildModeArrows); |
20 | - | |
20 | + fprintf(fpt, "%d: Spheres\n", lmrc2bildModeSpheres); | |
21 | 21 | } |
22 | 22 | |
23 | 23 | void |
@@ -28,6 +28,10 @@ lmrc2bild(FILE* fpt, mrcImage* in, lmrc2bildInfo linfo, int mode) | ||
28 | 28 | lmrc2bildArrows(fpt, in, linfo, mode); |
29 | 29 | break; |
30 | 30 | } |
31 | + case lmrc2bildModeSpheres: { | |
32 | + lmrc2bildSpheres(fpt, in, linfo, mode); | |
33 | + break; | |
34 | + } | |
31 | 35 | } |
32 | 36 | } |
33 | 37 |
@@ -40,14 +44,14 @@ lmrc2bildArrows(FILE* fpt, mrcImage* in, lmrc2bildInfo linfo, int mode) | ||
40 | 44 | mrcImageParaTypeReal endx, endy, endz; |
41 | 45 | double d0, d1, d2; |
42 | 46 | |
43 | - fprintf(fpt, ".color %g %g %g", linfo.color[0], linfo.color[1], linfo.color[2]); | |
47 | + fprintf(fpt, ".color %g %g %g\n", linfo.color[0], linfo.color[1], linfo.color[2]); | |
44 | 48 | for(z=0; z<in[0].HeaderN.z; z++) { |
45 | 49 | for(y=0; y<in[0].HeaderN.y; y++) { |
46 | 50 | for(x=0; x<in[0].HeaderN.x; x++) { |
47 | 51 | mrcPixelDataGet(&in[0], x, y, z, &d0, mrcPixelRePart, mrcPixelHowNearest); |
48 | 52 | mrcPixelDataGet(&in[1], x, y, z, &d1, mrcPixelRePart, mrcPixelHowNearest); |
49 | 53 | mrcPixelDataGet(&in[2], x, y, z, &d2, mrcPixelRePart, mrcPixelHowNearest); |
50 | - if(d0==0 && d1==1 && d2==0) { | |
54 | + if(d0==0 && d1==0 && d2==0) { | |
51 | 55 | } else { |
52 | 56 | startx = (x+in[0].HeaderStartN.x)*in[0].HeaderLength.x; |
53 | 57 | starty = (y+in[0].HeaderStartN.y)*in[0].HeaderLength.y; |
@@ -63,3 +67,34 @@ lmrc2bildArrows(FILE* fpt, mrcImage* in, lmrc2bildInfo linfo, int mode) | ||
63 | 67 | } |
64 | 68 | } |
65 | 69 | } |
70 | + | |
71 | + | |
72 | +void | |
73 | +lmrc2bildSpheres(FILE* fpt, mrcImage* in, lmrc2bildInfo linfo, int mode) | |
74 | +{ | |
75 | + mrcImageParaTypeReal x, y, z; | |
76 | + mrcImageParaTypeReal startx, starty, startz; | |
77 | + mrcImageParaTypeReal endx, endy, endz; | |
78 | + double d0, d1, d2; | |
79 | + | |
80 | + fprintf(fpt, ".color %g %g %g\n", linfo.color[0], linfo.color[1], linfo.color[2]); | |
81 | + for(z=0; z<in[0].HeaderN.z; z++) { | |
82 | + for(y=0; y<in[0].HeaderN.y; y++) { | |
83 | + for(x=0; x<in[0].HeaderN.x; x++) { | |
84 | + mrcPixelDataGet(&in[0], x, y, z, &d0, mrcPixelRePart, mrcPixelHowNearest); | |
85 | + if(d0==0 && d1==0 && d2==0) { | |
86 | + } else { | |
87 | + startx = (x+in[0].HeaderStartN.x)*in[0].HeaderLength.x; | |
88 | + starty = (y+in[0].HeaderStartN.y)*in[0].HeaderLength.y; | |
89 | + startz = (z+in[0].HeaderStartN.z)*in[0].HeaderLength.z; | |
90 | + fprintf(fpt, ".sphere %g %g %g %g\n", startx | |
91 | + , starty | |
92 | + , startz | |
93 | + ,d0*in[0].HeaderLength.x*linfo.zoom); | |
94 | + } | |
95 | + } | |
96 | + } | |
97 | + } | |
98 | +} | |
99 | + | |
100 | + |
@@ -668,3 +668,7 @@ WORLDNAME=Tools | ||
668 | 668 | WORLDNAME=Tools |
669 | 669 | WORLDNAME=Tools |
670 | 670 | WORLDNAME=Tools |
671 | +WORLDNAME=Tools | |
672 | +WORLDNAME=Tools | |
673 | +WORLDNAME=Tools | |
674 | +WORLDNAME=Tools |
@@ -1,6 +1,10 @@ | ||
1 | 1 | # OptionControlFile |
2 | 2 | # FileFormat |
3 | -"-i","-i[nput]","Input:mrcImagex3","Essential","3","1","In0","inFile::mrcImage","NULL","2","In1","inFile::mrcImage","NULL","3","In2","inFile::mrcImage","NULL" | |
3 | +"-i","-i[nput]","Input:mrcImagex3","Optional","1","1","In","inFile::mrcImage","NULL" | |
4 | +"-i3","-i[nput]3","Input:mrcImagex3","Optional","3","1","In0","inFile::mrcImage","NULL","2","In1","inFile::mrcImage","NULL","3","In2","inFile::mrcImage","NULL" | |
4 | 5 | "-o","-o[utput]","OutputDataFile","Essential","1","1","Out","outFile::BILD","stdout" |
6 | +"-color","-color","Color","Optional","3","1","Red","Real","1.0","2","Green","Real","1.0","3","Blue","Real","1.0" | |
7 | +"-zoom","-zoom","Zoom","Optional","1","1","Zoom","Real","1.0" | |
8 | +"-arrow","-arrow[Shape]","Arrow","Optional","3","1","R1","Real","0.1","2","R2","Real","0.4","3","Rho","Real","0.75" | |
5 | 9 | "-c","-c[onfig]","ConfigurationFile","Optional","1","1","configFile","inFile","NULL" |
6 | 10 | "-m","-m[ode]","Mode","Optional","1","1","mode","Integer","0" |
@@ -13,6 +13,10 @@ | ||
13 | 13 | typedef struct mrc2bildInfo { |
14 | 14 | long flagRedirect; |
15 | 15 | |
16 | + long flagIn; | |
17 | + char* In; | |
18 | + FILE* fptIn; | |
19 | + | |
16 | 20 | long flagIn0; |
17 | 21 | char* In0; |
18 | 22 | FILE* fptIn0; |
@@ -29,6 +33,27 @@ typedef struct mrc2bildInfo { | ||
29 | 33 | char* Out; |
30 | 34 | FILE* fptOut; |
31 | 35 | |
36 | + long flagRed; | |
37 | + float Red; | |
38 | + | |
39 | + long flagGreen; | |
40 | + float Green; | |
41 | + | |
42 | + long flagBlue; | |
43 | + float Blue; | |
44 | + | |
45 | + long flagZoom; | |
46 | + float Zoom; | |
47 | + | |
48 | + long flagR1; | |
49 | + float R1; | |
50 | + | |
51 | + long flagR2; | |
52 | + float R2; | |
53 | + | |
54 | + long flagRho; | |
55 | + float Rho; | |
56 | + | |
32 | 57 | long flagconfigFile; |
33 | 58 | char* configFile; |
34 | 59 | FILE* fptconfigFile; |
@@ -29,6 +29,17 @@ argCheck(mrc2bildInfo* info, int argc, char* argv[]) | ||
29 | 29 | if(OPTION_FLAG==argv[i][OPTION_FLAG_POS]) { |
30 | 30 | SSWITCH(argv[i]+OPTION_POS) |
31 | 31 | SCASE("i") { |
32 | + if(i+1<argc) { | |
33 | + info->In = stringGetNthWord(argv[i+1], 1, " ,"); | |
34 | + i++; | |
35 | + info->flagIn++; | |
36 | + } else { | |
37 | + usage(argv[0]); | |
38 | + exit(EXIT_FAILURE); | |
39 | + } | |
40 | + SBREAK; | |
41 | + } | |
42 | + SCASE("i3") { | |
32 | 43 | if(i+3<argc) { |
33 | 44 | info->In0 = stringGetNthWord(argv[i+1], 1, " ,"); |
34 | 45 | i++; |
@@ -56,6 +67,51 @@ argCheck(mrc2bildInfo* info, int argc, char* argv[]) | ||
56 | 67 | } |
57 | 68 | SBREAK; |
58 | 69 | } |
70 | + SCASE("color") { | |
71 | + if(i+3<argc) { | |
72 | + info->Red = stringGetNthRealData(argv[i+1], 1, " ,"); | |
73 | + i++; | |
74 | + info->flagRed++; | |
75 | + info->Green = stringGetNthRealData(argv[i+1], 1, " ,"); | |
76 | + i++; | |
77 | + info->flagGreen++; | |
78 | + info->Blue = stringGetNthRealData(argv[i+1], 1, " ,"); | |
79 | + i++; | |
80 | + info->flagBlue++; | |
81 | + } else { | |
82 | + usage(argv[0]); | |
83 | + exit(EXIT_FAILURE); | |
84 | + } | |
85 | + SBREAK; | |
86 | + } | |
87 | + SCASE("zoom") { | |
88 | + if(i+1<argc) { | |
89 | + info->Zoom = stringGetNthRealData(argv[i+1], 1, " ,"); | |
90 | + i++; | |
91 | + info->flagZoom++; | |
92 | + } else { | |
93 | + usage(argv[0]); | |
94 | + exit(EXIT_FAILURE); | |
95 | + } | |
96 | + SBREAK; | |
97 | + } | |
98 | + SCASE("arrow") { | |
99 | + if(i+3<argc) { | |
100 | + info->R1 = stringGetNthRealData(argv[i+1], 1, " ,"); | |
101 | + i++; | |
102 | + info->flagR1++; | |
103 | + info->R2 = stringGetNthRealData(argv[i+1], 1, " ,"); | |
104 | + i++; | |
105 | + info->flagR2++; | |
106 | + info->Rho = stringGetNthRealData(argv[i+1], 1, " ,"); | |
107 | + i++; | |
108 | + info->flagRho++; | |
109 | + } else { | |
110 | + usage(argv[0]); | |
111 | + exit(EXIT_FAILURE); | |
112 | + } | |
113 | + SBREAK; | |
114 | + } | |
59 | 115 | SCASE("c") { |
60 | 116 | if(i+1<argc) { |
61 | 117 | info->configFile = stringGetNthWord(argv[i+1], 1, " ,"); |
@@ -12,10 +12,18 @@ | ||
12 | 12 | void |
13 | 13 | init0(mrc2bildInfo* info) |
14 | 14 | { |
15 | + info->fptIn = NULL; info->flagIn = 0; | |
15 | 16 | info->fptIn0 = NULL; info->flagIn0 = 0; |
16 | 17 | info->fptIn1 = NULL; info->flagIn1 = 0; |
17 | 18 | info->fptIn2 = NULL; info->flagIn2 = 0; |
18 | 19 | info->fptOut = stdout; info->flagOut = 0; |
20 | + info->Red = 1.0; info->flagRed = 0; | |
21 | + info->Green = 1.0; info->flagGreen = 0; | |
22 | + info->Blue = 1.0; info->flagBlue = 0; | |
23 | + info->Zoom = 1.0; info->flagZoom = 0; | |
24 | + info->R1 = 0.1; info->flagR1 = 0; | |
25 | + info->R2 = 0.4; info->flagR2 = 0; | |
26 | + info->Rho = 0.75; info->flagRho = 0; | |
19 | 27 | info->fptconfigFile = NULL; info->flagconfigFile = 0; |
20 | 28 | info->mode = 0; info->flagmode = 0; |
21 | 29 | } |
@@ -25,29 +33,18 @@ init1(mrc2bildInfo* info) | ||
25 | 33 | { |
26 | 34 | char s[1024]; |
27 | 35 | int i; |
28 | - if(!info->flagIn0) { | |
29 | - stringGetFromFile(s, "In0", stdin, stdout, 0); | |
30 | - info->In0 = stringGetNthWord(s, 1, " ,\t"); | |
31 | - info->flagIn0++; | |
36 | + if(info->flagIn) { | |
37 | + info->fptIn = fileOpen(info->In, "r"); | |
32 | 38 | } |
39 | + | |
33 | 40 | if(info->flagIn0) { |
34 | 41 | info->fptIn0 = fileOpen(info->In0, "r"); |
35 | 42 | } |
36 | 43 | |
37 | - if(!info->flagIn1) { | |
38 | - stringGetFromFile(s, "In1", stdin, stdout, 0); | |
39 | - info->In1 = stringGetNthWord(s, 1, " ,\t"); | |
40 | - info->flagIn1++; | |
41 | - } | |
42 | 44 | if(info->flagIn1) { |
43 | 45 | info->fptIn1 = fileOpen(info->In1, "r"); |
44 | 46 | } |
45 | 47 | |
46 | - if(!info->flagIn2) { | |
47 | - stringGetFromFile(s, "In2", stdin, stdout, 0); | |
48 | - info->In2 = stringGetNthWord(s, 1, " ,\t"); | |
49 | - info->flagIn2++; | |
50 | - } | |
51 | 48 | if(info->flagIn2) { |
52 | 49 | info->fptIn2 = fileOpen(info->In2, "r"); |
53 | 50 | } |
@@ -61,6 +58,27 @@ init1(mrc2bildInfo* info) | ||
61 | 58 | info->fptOut = fileOpen(info->Out, "w"); |
62 | 59 | } |
63 | 60 | |
61 | + if(info->flagRed) { | |
62 | + } | |
63 | + | |
64 | + if(info->flagGreen) { | |
65 | + } | |
66 | + | |
67 | + if(info->flagBlue) { | |
68 | + } | |
69 | + | |
70 | + if(info->flagZoom) { | |
71 | + } | |
72 | + | |
73 | + if(info->flagR1) { | |
74 | + } | |
75 | + | |
76 | + if(info->flagR2) { | |
77 | + } | |
78 | + | |
79 | + if(info->flagRho) { | |
80 | + } | |
81 | + | |
64 | 82 | if(info->flagconfigFile) { |
65 | 83 | info->fptconfigFile = fileOpen(info->configFile, "r"); |
66 | 84 | } |
@@ -33,9 +33,40 @@ main(int argc, char* argv[]) | ||
33 | 33 | |
34 | 34 | DEBUGPRINT("Program Start\n"); |
35 | 35 | |
36 | - mrcFileRead(&in[0], info.In0, "in main", 0); | |
37 | - mrcFileRead(&in[1], info.In1, "in main", 0); | |
38 | - mrcFileRead(&in[2], info.In2, "in main", 0); | |
36 | + switch(info.mode) { | |
37 | + case lmrc2bildModeArrows: { | |
38 | + if(info.flagIn0) { | |
39 | + mrcFileRead(&in[0], info.In0, "in main", 0); | |
40 | + mrcFileRead(&in[1], info.In1, "in main", 0); | |
41 | + mrcFileRead(&in[2], info.In2, "in main", 0); | |
42 | + } else { | |
43 | + fprintf(stderr, "need -i3\n"); | |
44 | + usage(argv[0]); | |
45 | + } | |
46 | + break; | |
47 | + } | |
48 | + case lmrc2bildModeSpheres: { | |
49 | + if(info.flagIn) { | |
50 | + mrcFileRead(&in[0], info.In, "in main", 0); | |
51 | + } else { | |
52 | + fprintf(stderr, "need -i\n"); | |
53 | + usage(argv[0]); | |
54 | + } | |
55 | + break; | |
56 | + } | |
57 | + default: { | |
58 | + fprintf(stderr, "Not supported mode: %ld\n", info.mode); | |
59 | + exit(EXIT_FAILURE); | |
60 | + } | |
61 | + } | |
62 | + | |
63 | + linfo.color[0] = info.Red; | |
64 | + linfo.color[1] = info.Green; | |
65 | + linfo.color[2] = info.Blue; | |
66 | + linfo.zoom = info.Zoom; | |
67 | + linfo.r1 = info.R1; | |
68 | + linfo.r2 = info.R2; | |
69 | + linfo.rho = info.Rho; | |
39 | 70 | |
40 | 71 | lmrc2bild(info.fptOut, in, linfo, info.mode); |
41 | 72 |
@@ -46,6 +77,7 @@ void | ||
46 | 77 | additionalUsage() |
47 | 78 | { |
48 | 79 | fprintf(stderr, "----- Additional Usage -----\n"); |
80 | + lmrc2bildUsage(stderr); | |
49 | 81 | } |
50 | 82 | |
51 | 83 |
@@ -0,0 +1,30 @@ | ||
1 | +<HTML> | |
2 | +<HEAD> | |
3 | +<TITLE>mrc2bild</TITLE> | |
4 | +</HEAD> | |
5 | +<BODY> | |
6 | +<H1>mrc2bild</H1> | |
7 | +<H2>Usage</H2> | |
8 | +<PRE> | |
9 | +Usage: mrc2bild | |
10 | +Options: | |
11 | + [-i[nput] In (NULL ).as(inFile::mrcImage ) ] :Optional :Input:mrcImagex3 | |
12 | + [-i[nput]3 In0 (NULL ).as(inFile::mrcImage ) | |
13 | + In1 (NULL ).as(inFile::mrcImage ) | |
14 | + In2 (NULL ).as(inFile::mrcImage ) ] :Optional :Input:mrcImagex3 | |
15 | + [-o[utput] Out (stdout ).as(outFile::BILD ) ] :Essential :OutputDataFile | |
16 | + [-color Red (1.0 ).as(Real ) | |
17 | + Green (1.0 ).as(Real ) | |
18 | + Blue (1.0 ).as(Real ) ] :Optional :Color | |
19 | + [-zoom Zoom (1.0 ).as(Real ) ] :Optional :Zoom | |
20 | + [-arrow[Shape] R1 (0.1 ).as(Real ) | |
21 | + R2 (0.4 ).as(Real ) | |
22 | + Rho (0.75 ).as(Real ) ] :Optional :Arrow | |
23 | + [-c[onfig] configFile (NULL ).as(inFile ) ] :Optional :ConfigurationFile | |
24 | + [-m[ode] mode (0 ).as(Integer ) ] :Optional :Mode | |
25 | +----- Additional Usage ----- | |
26 | +0: Arrows | |
27 | +1: Spheres | |
28 | +</PRE> | |
29 | +</BODY> | |
30 | +</HTML> |
@@ -7,10 +7,14 @@ | ||
7 | 7 | -R 1 0 1 5x1+35+0 'Run' 'execute operation' $EOS/bin/mrc2bild |
8 | 8 | -H 1 5x1+41+0 'Help' 'help page' $EOS/src/Tools/filter/mrc2bild/doc/mrc2bild.doc help |
9 | 9 | -Q 1 0 5.25x1+47+0 'Close' |
10 | - -I 1 0 1 1 0 1 -1x1+1+1 ' ' 'NULL' 'In0' Input:mrcImagex3 | |
11 | - -O 1 0 1 1 0 1 -1x1+1+3.000000 ' ' 'Out' 'OutputDataFile' o | |
12 | - -I 1 0 1 0 0 1 -1x1+1+4.500000 ' ' 'configFile' 'ConfigurationFile' c | |
13 | - -i 1 0 1 0 0 -1x1+1+6.000000 0 0 0 0 0 'mode' 'Mode' m | |
10 | + -I 1 0 1 0 0 1 -1x1+1+1.500000 ' ' 'In' 'Input:mrcImagex3' i | |
11 | + -I 1 0 0 1 0 1 -1x1+1+3 ' ' 'NULL' 'In0' Input:mrcImagex3 | |
12 | + -O 1 0 1 1 0 1 -1x1+1+4.500000 ' ' 'Out' 'OutputDataFile' o | |
13 | + -I 1 0 0 1 0 1 -1x1+1+6 ' ' '1.0' 'Red' Color | |
14 | + -f 1 0 1 0 0 -1x1+1+7.500000 0 0 1.000000 0 0 0 'Zoom' 'Zoom' zoom | |
15 | + -I 1 0 0 1 0 1 -1x1+1+9 ' ' '0.1' 'R1' Arrow | |
16 | + -I 1 0 1 0 0 1 -1x1+1+10.500000 ' ' 'configFile' 'ConfigurationFile' c | |
17 | + -i 1 0 1 0 0 -1x1+1+12.000000 0 0 0 0 0 'mode' 'Mode' m | |
14 | 18 | -E |
15 | 19 | -E |
16 | 20 | -E |
@@ -0,0 +1,18 @@ | ||
1 | +include ../../Config/Define.inc | |
2 | +include ../../../Config/Define.inc | |
3 | +include ../../../../Config/Define.inc | |
4 | +include ../../../../../Config/Define.inc | |
5 | + | |
6 | +all: help exec | |
7 | + | |
8 | +help: | |
9 | + @echo "----- Help Message Check -----" | |
10 | + @../$(OSTYPE)/$(OBJECTNAME) -h | |
11 | + | |
12 | +exec: | |
13 | + @echo "----- Execution Check -----" | |
14 | + ../$(OSTYPE)/$(OBJECTNAME) -i3 data/test.mrc3d data/test.mrc3d data/test.mrc3d -o data/test-arrow.bild -zoom 0.01 | |
15 | + ../$(OSTYPE)/$(OBJECTNAME) -i data/test.mrc3d -o data/test-sphere.bild -zoom 0.01 -m 1 | |
16 | + @echo "----- Calc check -----" | |
17 | + | |
18 | +clean: |
@@ -0,0 +1 @@ | ||
1 | +../../../../../..//data/mrc2bild | |
\ No newline at end of file |
@@ -7,8 +7,12 @@ usage(char* thisProgram) | ||
7 | 7 | { |
8 | 8 | fprintf(stderr, "Usage: %s\n", thisProgram); |
9 | 9 | fprintf(stderr, "Options:\n"); |
10 | - fprintf(stderr, " [-i[nput] In0 (NULL ).as(inFile::mrcImage ) \n In1 (NULL ).as(inFile::mrcImage ) \n In2 (NULL ).as(inFile::mrcImage ) ] :Essential :Input:mrcImagex3\n"); | |
10 | + fprintf(stderr, " [-i[nput] In (NULL ).as(inFile::mrcImage ) ] :Optional :Input:mrcImagex3\n"); | |
11 | + fprintf(stderr, " [-i[nput]3 In0 (NULL ).as(inFile::mrcImage ) \n In1 (NULL ).as(inFile::mrcImage ) \n In2 (NULL ).as(inFile::mrcImage ) ] :Optional :Input:mrcImagex3\n"); | |
11 | 12 | fprintf(stderr, " [-o[utput] Out (stdout ).as(outFile::BILD ) ] :Essential :OutputDataFile\n"); |
13 | + fprintf(stderr, " [-color Red (1.0 ).as(Real ) \n Green (1.0 ).as(Real ) \n Blue (1.0 ).as(Real ) ] :Optional :Color\n"); | |
14 | + fprintf(stderr, " [-zoom Zoom (1.0 ).as(Real ) ] :Optional :Zoom\n"); | |
15 | + fprintf(stderr, " [-arrow[Shape] R1 (0.1 ).as(Real ) \n R2 (0.4 ).as(Real ) \n Rho (0.75 ).as(Real ) ] :Optional :Arrow\n"); | |
12 | 16 | fprintf(stderr, " [-c[onfig] configFile (NULL ).as(inFile ) ] :Optional :ConfigurationFile\n"); |
13 | 17 | fprintf(stderr, " [-m[ode] mode (0 ).as(Integer ) ] :Optional :Mode\n"); |
14 | 18 | additionalUsage(); |