Revisión | 58c4945fe1a99aff73590c8cb67610eeb8b3c143 (tree) |
---|---|
Tiempo | 2014-10-01 22:06:16 |
Autor | Takuo Yasunaga <yasunaga@bio....> |
Commiter | Takuo Yasunaga |
Modified: bmp2mrc supported Y/R/G/B to mono of mrcImage, respecitively.
modified: src/Objects/DataManip/bmpFile/src/lbmp2mrc.c
modified: src/Tools/filter/bmp2mrc/src/bmp2mrc.c
@@ -18,7 +18,7 @@ argCheck.o: argCheck.c /usr/include/stdio.h /usr/include/sys/cdefs.h \ | ||
18 | 18 | /usr/include/sys/_types/_pthread_attr_t.h \ |
19 | 19 | /usr/include/sys/_types/_sigset_t.h /usr/include/sys/_types/_uid_t.h \ |
20 | 20 | /usr/include/sys/resource.h \ |
21 | - /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/5.1/include/stdint.h \ | |
21 | + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/6.0/include/stdint.h \ | |
22 | 22 | /usr/include/stdint.h /usr/include/sys/_types/_int8_t.h \ |
23 | 23 | /usr/include/sys/_types/_int16_t.h /usr/include/sys/_types/_int32_t.h \ |
24 | 24 | /usr/include/sys/_types/_int64_t.h /usr/include/_types/_uint8_t.h \ |
@@ -36,7 +36,7 @@ argCheck.o: argCheck.c /usr/include/stdio.h /usr/include/sys/cdefs.h \ | ||
36 | 36 | /Users/tacyas/Eos/include/string.h /usr/include/math.h ../inc/config.h \ |
37 | 37 | ../inc/../inc/bmp2mrc.h /Users/tacyas/Eos/include/genUtil.h \ |
38 | 38 | /Users/tacyas/Eos/include/File.h /Users/tacyas/Eos/include/Memory.h \ |
39 | - /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/5.1/include/limits.h \ | |
39 | + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/6.0/include/limits.h \ | |
40 | 40 | /usr/include/limits.h /usr/include/machine/limits.h \ |
41 | 41 | /usr/include/i386/limits.h /usr/include/i386/_limits.h \ |
42 | 42 | /usr/include/sys/syslimits.h |
@@ -60,7 +60,7 @@ bmp2mrc.o: bmp2mrc.c /usr/include/stdio.h /usr/include/sys/cdefs.h \ | ||
60 | 60 | /usr/include/sys/_types/_pthread_attr_t.h \ |
61 | 61 | /usr/include/sys/_types/_sigset_t.h /usr/include/sys/_types/_uid_t.h \ |
62 | 62 | /usr/include/sys/resource.h \ |
63 | - /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/5.1/include/stdint.h \ | |
63 | + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/6.0/include/stdint.h \ | |
64 | 64 | /usr/include/stdint.h /usr/include/sys/_types/_int8_t.h \ |
65 | 65 | /usr/include/sys/_types/_int16_t.h /usr/include/sys/_types/_int32_t.h \ |
66 | 66 | /usr/include/sys/_types/_int64_t.h /usr/include/_types/_uint8_t.h \ |
@@ -102,7 +102,7 @@ init.o: init.c /usr/include/stdio.h /usr/include/sys/cdefs.h \ | ||
102 | 102 | /usr/include/sys/_types/_pthread_attr_t.h \ |
103 | 103 | /usr/include/sys/_types/_sigset_t.h /usr/include/sys/_types/_uid_t.h \ |
104 | 104 | /usr/include/sys/resource.h \ |
105 | - /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/5.1/include/stdint.h \ | |
105 | + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/6.0/include/stdint.h \ | |
106 | 106 | /usr/include/stdint.h /usr/include/sys/_types/_int8_t.h \ |
107 | 107 | /usr/include/sys/_types/_int16_t.h /usr/include/sys/_types/_int32_t.h \ |
108 | 108 | /usr/include/sys/_types/_int64_t.h /usr/include/_types/_uint8_t.h \ |
@@ -120,7 +120,7 @@ init.o: init.c /usr/include/stdio.h /usr/include/sys/cdefs.h \ | ||
120 | 120 | /Users/tacyas/Eos/include/string.h /usr/include/math.h ../inc/config.h \ |
121 | 121 | ../inc/../inc/bmp2mrc.h /Users/tacyas/Eos/include/genUtil.h \ |
122 | 122 | /Users/tacyas/Eos/include/File.h /Users/tacyas/Eos/include/Memory.h \ |
123 | - /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/5.1/include/limits.h \ | |
123 | + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/6.0/include/limits.h \ | |
124 | 124 | /usr/include/limits.h /usr/include/machine/limits.h \ |
125 | 125 | /usr/include/i386/limits.h /usr/include/i386/_limits.h \ |
126 | 126 | /usr/include/sys/syslimits.h |
@@ -144,7 +144,7 @@ usage.o: usage.c /usr/include/stdio.h /usr/include/sys/cdefs.h \ | ||
144 | 144 | /usr/include/sys/_types/_pthread_attr_t.h \ |
145 | 145 | /usr/include/sys/_types/_sigset_t.h /usr/include/sys/_types/_uid_t.h \ |
146 | 146 | /usr/include/sys/resource.h \ |
147 | - /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/5.1/include/stdint.h \ | |
147 | + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/6.0/include/stdint.h \ | |
148 | 148 | /usr/include/stdint.h /usr/include/sys/_types/_int8_t.h \ |
149 | 149 | /usr/include/sys/_types/_int16_t.h /usr/include/sys/_types/_int32_t.h \ |
150 | 150 | /usr/include/sys/_types/_int64_t.h /usr/include/_types/_uint8_t.h \ |
@@ -180,7 +180,7 @@ util.o: util.c /usr/include/stdio.h /usr/include/sys/cdefs.h \ | ||
180 | 180 | /usr/include/sys/_types/_pthread_attr_t.h \ |
181 | 181 | /usr/include/sys/_types/_sigset_t.h /usr/include/sys/_types/_uid_t.h \ |
182 | 182 | /usr/include/sys/resource.h \ |
183 | - /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/5.1/include/stdint.h \ | |
183 | + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/6.0/include/stdint.h \ | |
184 | 184 | /usr/include/stdint.h /usr/include/sys/_types/_int8_t.h \ |
185 | 185 | /usr/include/sys/_types/_int16_t.h /usr/include/sys/_types/_int32_t.h \ |
186 | 186 | /usr/include/sys/_types/_int64_t.h /usr/include/_types/_uint8_t.h \ |
@@ -68,8 +68,16 @@ typedef struct bmpFile { | ||
68 | 68 | int BytesPerImage; |
69 | 69 | } bmpFile; |
70 | 70 | |
71 | +typedef enum lbmp2mrcInfoMode { | |
72 | + lbmp2mrcInfoModeY=0, | |
73 | + lbmp2mrcInfoModeR=1, | |
74 | + lbmp2mrcInfoModeG=2, | |
75 | + lbmp2mrcInfoModeB=3 | |
76 | +} lbmp2mrcInfoMode; | |
77 | + | |
71 | 78 | typedef struct lbmp2mrcInfo { |
72 | 79 | mrcImageParaTypeRealCoord Length; |
80 | + lbmp2mrcInfoMode mode; | |
73 | 81 | } lbmp2mrcInfo; |
74 | 82 | |
75 | 83 | /* struct end */ |
@@ -3,11 +3,6 @@ | ||
3 | 3 | <H2>Information from source codes</H2> |
4 | 4 | </A> |
5 | 5 | <PRE> |
6 | -../src/bmpFileInfo.c: | |
7 | - | |
8 | -../src/bmpFileRead.c: | |
9 | - | |
10 | -../src/lbmp2mrc.c: | |
11 | 6 | </PRE> |
12 | 7 | <HR> |
13 | 8 | <A NAME="include"> |
@@ -84,8 +79,16 @@ typedef struct bmpFile { | ||
84 | 79 | int BytesPerImage; |
85 | 80 | } bmpFile; |
86 | 81 | |
82 | +typedef enum lbmp2mrcInfoMode { | |
83 | + lbmp2mrcInfoModeY=0, | |
84 | + lbmp2mrcInfoModeR=1, | |
85 | + lbmp2mrcInfoModeG=2, | |
86 | + lbmp2mrcInfoModeB=3 | |
87 | +} lbmp2mrcInfoMode; | |
88 | + | |
87 | 89 | typedef struct lbmp2mrcInfo { |
88 | 90 | mrcImageParaTypeRealCoord Length; |
91 | + lbmp2mrcInfoMode mode; | |
89 | 92 | } lbmp2mrcInfo; |
90 | 93 | |
91 | 94 | /* struct end */ |
@@ -68,8 +68,16 @@ typedef struct bmpFile { | ||
68 | 68 | int BytesPerImage; |
69 | 69 | } bmpFile; |
70 | 70 | |
71 | +typedef enum lbmp2mrcInfoMode { | |
72 | + lbmp2mrcInfoModeY=0, | |
73 | + lbmp2mrcInfoModeR=1, | |
74 | + lbmp2mrcInfoModeG=2, | |
75 | + lbmp2mrcInfoModeB=3 | |
76 | +} lbmp2mrcInfoMode; | |
77 | + | |
71 | 78 | typedef struct lbmp2mrcInfo { |
72 | 79 | mrcImageParaTypeRealCoord Length; |
80 | + lbmp2mrcInfoMode mode; | |
73 | 81 | } lbmp2mrcInfo; |
74 | 82 | |
75 | 83 | /* struct end */ |
@@ -50,7 +50,29 @@ lbmp2mrc(mrcImage* mrc, bmpFile* bmp, lbmp2mrcInfo linfo, int mode) | ||
50 | 50 | fprintf(stderr, "Not supported Mode: BytesPerPixel: %d BitsPerPixel: %d \n", bmp->BytesPerPixel, bmp->BitsPerPixel); |
51 | 51 | exit(EXIT_FAILURE); |
52 | 52 | } |
53 | - data = 0.299*r + 0.587*g + 0.114*b; | |
53 | + switch(linfo.mode) { | |
54 | + case lbmp2mrcInfoModeY: { | |
55 | + data = 0.299*r + 0.587*g + 0.114*b; | |
56 | + break; | |
57 | + } | |
58 | + case lbmp2mrcInfoModeR: { | |
59 | + data = r; | |
60 | + break; | |
61 | + } | |
62 | + case lbmp2mrcInfoModeG: { | |
63 | + data = g; | |
64 | + break; | |
65 | + } | |
66 | + case lbmp2mrcInfoModeB: { | |
67 | + data = b; | |
68 | + break; | |
69 | + } | |
70 | + default: { | |
71 | + fprintf(stderr, "Not supported mode: %d. Instead, use Y: %d\n", linfo.mode, lbmp2mrcInfoModeY); | |
72 | + data = 0.299*r + 0.587*g + 0.114*b; | |
73 | + break; | |
74 | + } | |
75 | + } | |
54 | 76 | if(0<bmp->Info.biWidth) { |
55 | 77 | mrcPixelDataSet(mrc, x, y, 0, data, mrcPixelRePart); |
56 | 78 | } else { |
@@ -186,3 +186,5 @@ WORLDNAME=Tools | ||
186 | 186 | WORLDNAME=Tools |
187 | 187 | WORLDNAME=Tools |
188 | 188 | WORLDNAME=Tools |
189 | +WORLDNAME=Tools | |
190 | +WORLDNAME=Tools |
@@ -1,107 +0,0 @@ | ||
1 | -include ../../Config/Define.inc | |
2 | -include ../Config/Define.inc | |
3 | -include Config/Define.inc | |
4 | -include .Source | |
5 | - | |
6 | -all: | |
7 | - for dir in ${SOURCE} ; \ | |
8 | - do \ | |
9 | - if [ -d $${dir} ] ; then \ | |
10 | - $(CD) $${dir}; make all; $(CD) ..; \ | |
11 | - fi \ | |
12 | - done | |
13 | - | |
14 | -install: | |
15 | - for dir in ${SOURCE} ; \ | |
16 | - do \ | |
17 | - if [ -d $${dir} ] ; then \ | |
18 | - $(CD) $${dir}; make install; $(CD) ..; \ | |
19 | - fi \ | |
20 | - done | |
21 | - | |
22 | -put: | |
23 | - for dir in ${SOURCE} ; \ | |
24 | - do \ | |
25 | - if [ -d $${dir} ] ; then \ | |
26 | - $(CD) $${dir}; make put; $(CD) ..; \ | |
27 | - fi \ | |
28 | - done | |
29 | - | |
30 | -putSF: | |
31 | - if [ -f private ] ; then \ | |
32 | - echo "$(WORLDNAME)/$(CLASSNAME) is private " ; \ | |
33 | - else \ | |
34 | - for dir in ${SOURCE} ; \ | |
35 | - do \ | |
36 | - if [ -d $${dir} ] ; then \ | |
37 | - $(CD) $${dir}; make putSF; $(CD) ..; \ | |
38 | - fi \ | |
39 | - done \ | |
40 | - fi | |
41 | - | |
42 | -clean: | |
43 | - for dir in ${SOURCE} ; \ | |
44 | - do \ | |
45 | - $(CD) $${dir}; make clean; $(CD) ..; \ | |
46 | - done | |
47 | - | |
48 | -check: | |
49 | - @for dir in ${SOURCE} ; do \ | |
50 | - if [ -d $${dir} ] ; then \ | |
51 | - $(CD) $${dir}; \ | |
52 | - echo $${dir}; \ | |
53 | - $(RM) Makefile; \ | |
54 | - $(CP) ../../../Config/Template/$(WORLDNAME)Template.Dir/Makefile Makefile ; \ | |
55 | - make check; \ | |
56 | - $(CD) ..; \ | |
57 | - fi \ | |
58 | - done | |
59 | - | |
60 | -depend: check | |
61 | - @for dir in ${SOURCE} ; \ | |
62 | - do \ | |
63 | - $(CD) $${dir}; make depend; $(CD) ..; \ | |
64 | - done | |
65 | - | |
66 | -backup: | |
67 | - cd ../../..; \ | |
68 | - tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/Config; \ | |
69 | - tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/Makefile; \ | |
70 | - tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/.[A-z]* | |
71 | - tar uvf ${EOS_HOME}/backup/EosBase.tar .[A-z]* | |
72 | - @for dir in ${SOURCE} ; \ | |
73 | - do \ | |
74 | - $(CD) $${dir}; make backup; $(CD) ..; \ | |
75 | - done | |
76 | - | |
77 | -backup-all: | |
78 | - cd ../../..; \ | |
79 | - tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/Config; \ | |
80 | - tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/Makefile; \ | |
81 | - tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/.[A-z]* | |
82 | - tar rvf ${EOS_HOME}/backup/EosBase.tar .[A-z]* | |
83 | - @for dir in ${SOURCE} ; \ | |
84 | - do \ | |
85 | - $(CD) $${dir}; make backup; $(CD) ..; \ | |
86 | - done | |
87 | - | |
88 | -distribute: | |
89 | - cd ../../..; \ | |
90 | - tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/Config; \ | |
91 | - tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/Makefile; \ | |
92 | - tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/.[A-z]* | |
93 | - @for dir in ${SOURCE} ; \ | |
94 | - do \ | |
95 | - $(CD) $${dir}; make distribute; $(CD) ..; \ | |
96 | - done | |
97 | - | |
98 | -distribute-all: | |
99 | - cd ../../..; \ | |
100 | - tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/Config; \ | |
101 | - tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/Makefile; \ | |
102 | - tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/.[A-z]* | |
103 | - @for dir in ${SOURCE} ; \ | |
104 | - do \ | |
105 | - $(CD) $${dir}; make distribute-all; $(CD) ..; \ | |
106 | - done | |
107 | - |
@@ -0,0 +1 @@ | ||
1 | +/Users/tacyas/Eos/src/Config/Template/ToolsClassTemplate.Dir/Makefile | |
\ No newline at end of file |
@@ -3,5 +3,6 @@ | ||
3 | 3 | "-i","-i[nput]","Input: bmpFile","Essential","1","1","In","inFile::bmpFile","NULL" |
4 | 4 | "-o","-o[utput]","Output: mrcImage","Essential","1","1","Out","outFile::mrcImage","NULL" |
5 | 5 | "-L","-L[ength]","Input: Length","Optional","2","1","LengthX","Real","1.0","1","LengthY","Real","1.0" |
6 | +"-M","-M[ode]","Input: Mode","Optional","1","1","Mode","Integer","0" | |
6 | 7 | "-c","-c[onfig]","ConfigurationFile","Optional","1","1","configFile","inFile","NULL" |
7 | 8 | "-m","-m[ode]","Mode","Optional","1","1","mode","Integer","0" |
@@ -1,104 +0,0 @@ | ||
1 | -include ../../../Config/Define.inc | |
2 | -include ../../Config/Define.inc | |
3 | -include ../Config/Define.inc | |
4 | -include Config/Define.inc | |
5 | - | |
6 | -all: | |
7 | - cd src; make all; cd .. | |
8 | - | |
9 | -install: | |
10 | - cd src; make install; cd .. | |
11 | - | |
12 | - | |
13 | -putSF: | |
14 | - if [ -f private ] ; \ | |
15 | - then \ | |
16 | - echo "$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME) is private"; \ | |
17 | - else \ | |
18 | - cvs -z4 -d:ext:$$USER@$$EOS_SOURCEFORGE commit || cvs -z4 -d:ext:$$USER@$$EOS_SOURCEFORGE import src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME); \ | |
19 | - fi | |
20 | - | |
21 | -put: | |
22 | - cd src; make put; cd .. | |
23 | - | |
24 | -clean: | |
25 | - cd src; make clean; cd .. | |
26 | - | |
27 | -depend: | |
28 | - cd src; make depend; cd .. | |
29 | - | |
30 | -check: | |
31 | - @if [ ! -d $(EOS_HOME)/hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE) ] ; then \ | |
32 | - echo making directory; \ | |
33 | - mkdir -p $(EOS_HOME)/hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE); \ | |
34 | - fi | |
35 | - ln -sf ../../../../../hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE) src/$(OSTYPE); | |
36 | - @$(RM) src/Makefile | |
37 | - @echo "New src/Makefile" | |
38 | - @$(CP) ../../../Config/Template/$(WORLDNAME)Template.Dir/src/Makefile src/Makefile | |
39 | - @cd src; touch $(OSTYPE)/.Depend; make depend | |
40 | - | |
41 | -cvsupdate:: | |
42 | - cvs -d $(EOS_CVSROOT) update -d | |
43 | - | |
44 | -cvscommit:: | |
45 | - cvs -d $(EOS_CVSROOT) commit | |
46 | - | |
47 | -backup: | |
48 | - @cd ../../../..; \ | |
49 | - echo $(OBJECTNAME) ; \ | |
50 | - tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config ; \ | |
51 | - tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Makefile ;\ | |
52 | - tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/.[A-z]* ; \ | |
53 | - tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/inc ; \ | |
54 | - tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/doc; \ | |
55 | - tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/wish; \ | |
56 | - tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/[A-z]*.[A-z]*; \ | |
57 | - tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/.[A-z]*; \ | |
58 | - tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/Makefile | |
59 | - | |
60 | -backup-all: | |
61 | - @cd ../../../..; \ | |
62 | - echo $(OBJECTNAME) ; \ | |
63 | - tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config ; \ | |
64 | - tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Makefile ;\ | |
65 | - tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/.[A-z]* ; \ | |
66 | - tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/inc ; \ | |
67 | - tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/doc; \ | |
68 | - tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/wish; \ | |
69 | - tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/[A-z]*.[A-z]*; \ | |
70 | - tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/.[A-z]*; \ | |
71 | - tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/Makefile | |
72 | - | |
73 | -distribute: | |
74 | - cd ../../../..; \ | |
75 | - echo $(OBJECTNAME) ; \ | |
76 | - tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config ; \ | |
77 | - tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Makefile ;\ | |
78 | - tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/.[A-z]* ; \ | |
79 | - tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/inc ; \ | |
80 | - tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/doc; \ | |
81 | - tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/wish; \ | |
82 | - tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/[A-z]*.[A-z]*; \ | |
83 | - tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/.[A-z]*; \ | |
84 | - tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/Makefile ; \ | |
85 | - tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE) | |
86 | - | |
87 | -distribute-all: | |
88 | - @cd ../../../..; \ | |
89 | - echo $(OBJECTNAME) ; \ | |
90 | - tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config ; \ | |
91 | - tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Makefile ;\ | |
92 | - tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/.[A-z]* ; \ | |
93 | - tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/inc ; \ | |
94 | - tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/doc; \ | |
95 | - tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/wish; \ | |
96 | - tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/[A-z]*.[A-z]*; \ | |
97 | - tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/.[A-z]*; \ | |
98 | - tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/Makefile ; \ | |
99 | - tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE) | |
100 | - | |
101 | -eosintroduce: | |
102 | - ${EOS_HOME}/sbin/eosintroduce ${WORLDNAME} ${CLASSNAME} ${OBJECTNAME} ./ | |
103 | - | |
104 | -include Config/Target.inc |
@@ -0,0 +1 @@ | ||
1 | +/Users/tacyas/Eos/src/Config/Template/ToolsTemplate.Dir/Makefile | |
\ No newline at end of file |
@@ -27,6 +27,9 @@ typedef struct bmp2mrcInfo { | ||
27 | 27 | long flagLengthY; |
28 | 28 | float LengthY; |
29 | 29 | |
30 | + long flagMode; | |
31 | + long Mode; | |
32 | + | |
30 | 33 | long flagconfigFile; |
31 | 34 | char* configFile; |
32 | 35 | FILE* fptconfigFile; |
@@ -64,6 +64,17 @@ argCheck(bmp2mrcInfo* info, int argc, char* argv[]) | ||
64 | 64 | } |
65 | 65 | SBREAK; |
66 | 66 | } |
67 | + SCASE("M") { | |
68 | + if(i+1<argc) { | |
69 | + info->Mode = stringGetNthIntegerData(argv[i+1], 1, " ,"); | |
70 | + i++; | |
71 | + info->flagMode++; | |
72 | + } else { | |
73 | + usage(argv[0]); | |
74 | + exit(EXIT_FAILURE); | |
75 | + } | |
76 | + SBREAK; | |
77 | + } | |
67 | 78 | SCASE("c") { |
68 | 79 | if(i+1<argc) { |
69 | 80 | info->configFile = stringGetNthWord(argv[i+1], 1, " ,"); |
@@ -49,12 +49,12 @@ main(int argc, char* argv[]) | ||
49 | 49 | linfo.Length.x = info.LengthX; |
50 | 50 | linfo.Length.y = info.LengthY; |
51 | 51 | linfo.Length.z = info.LengthX; |
52 | - | |
52 | + linfo.mode = info.Mode; | |
53 | 53 | bmpFileRead(&in, info.fptIn, 0); |
54 | 54 | |
55 | 55 | DEBUGPRINT("lbmp2mrc\n"); |
56 | 56 | |
57 | - lbmp2mrc(&out, &in, linfo, 0); | |
57 | + lbmp2mrc(&out, &in, linfo, info.mode); | |
58 | 58 | |
59 | 59 | DEBUGPRINT1("mrcFileWrite: %s\n", info.Out); |
60 | 60 | mrcFileWrite(&out, info.Out, "in main", 0); |
@@ -1 +1,21 @@ | ||
1 | -/bin/bash: bmp2mrc: そのようなファイルやディレクトリはありません | |
1 | +<HTML> | |
2 | +<HEAD> | |
3 | +<TITLE>bmp2mrc</TITLE> | |
4 | +</HEAD> | |
5 | +<BODY> | |
6 | +<H1>bmp2mrc</H1> | |
7 | +<H2>Usage</H2> | |
8 | +<PRE> | |
9 | +Usage: bmp2mrc | |
10 | +Options: | |
11 | + [-i[nput] In (NULL ).as(inFile::bmpFile ) ] :Essential :Input: bmpFile | |
12 | + [-o[utput] Out (NULL ).as(outFile::mrcImage ) ] :Essential :Output: mrcImage | |
13 | + [-L[ength] LengthX (1.0 ).as(Real ) | |
14 | + LengthY (1.0 ).as(Real ) ] :Optional :Input: Length | |
15 | + [-M[ode] Mode (0 ).as(Integer ) ] :Optional :Input: Mode | |
16 | + [-c[onfig] configFile (NULL ).as(inFile ) ] :Optional :ConfigurationFile | |
17 | + [-m[ode] mode (0 ).as(Integer ) ] :Optional :Mode | |
18 | +----- Additional Usage ----- | |
19 | +</PRE> | |
20 | +</BODY> | |
21 | +</HTML> |
@@ -10,8 +10,9 @@ | ||
10 | 10 | -I 1 0 1 1 0 1 -1x1+1+1.500000 ' ' 'In' 'Input: bmpFile' i |
11 | 11 | -O 1 0 1 1 0 1 -1x1+1+3.000000 ' ' 'Out' 'Output: mrcImage' o |
12 | 12 | -I 1 0 0 1 0 1 -1x1+1+4 ' ' '1.0' 'LengthX' Input: Length |
13 | - -I 1 0 1 0 0 1 -1x1+1+6.000000 ' ' 'configFile' 'ConfigurationFile' c | |
14 | - -i 1 0 1 0 0 -1x1+1+7.500000 0 0 0 0 0 'mode' 'Mode' m | |
13 | + -i 1 0 1 0 0 -1x1+1+6.000000 0 0 0 0 0 'Mode' 'Input: Mode' M | |
14 | + -I 1 0 1 0 0 1 -1x1+1+7.500000 ' ' 'configFile' 'ConfigurationFile' c | |
15 | + -i 1 0 1 0 0 -1x1+1+9.000000 0 0 0 0 0 'mode' 'Mode' m | |
15 | 16 | -E |
16 | 17 | -E |
17 | 18 | -E |
@@ -15,7 +15,8 @@ init0(bmp2mrcInfo* info) | ||
15 | 15 | info->fptIn = NULL; info->flagIn = 0; |
16 | 16 | info->fptOut = NULL; info->flagOut = 0; |
17 | 17 | info->LengthX = 1.0; info->flagLengthX = 0; |
18 | - info->LengthX = 1.0; info->flagLengthX = 0; | |
18 | + info->LengthY = 1.0; info->flagLengthY = 0; | |
19 | + info->Mode = 0; info->flagMode = 0; | |
19 | 20 | info->fptconfigFile = NULL; info->flagconfigFile = 0; |
20 | 21 | info->mode = 0; info->flagmode = 0; |
21 | 22 | } |
@@ -49,6 +50,9 @@ init1(bmp2mrcInfo* info) | ||
49 | 50 | if(info->flagLengthY) { |
50 | 51 | } |
51 | 52 | |
53 | + if(info->flagMode) { | |
54 | + } | |
55 | + | |
52 | 56 | if(info->flagconfigFile) { |
53 | 57 | info->fptconfigFile = fileOpen(info->configFile, "r"); |
54 | 58 | } |
@@ -10,6 +10,7 @@ usage(char* thisProgram) | ||
10 | 10 | fprintf(stderr, " [-i[nput] In (NULL ).as(inFile::bmpFile ) ] :Essential :Input: bmpFile\n"); |
11 | 11 | fprintf(stderr, " [-o[utput] Out (NULL ).as(outFile::mrcImage ) ] :Essential :Output: mrcImage\n"); |
12 | 12 | fprintf(stderr, " [-L[ength] LengthX (1.0 ).as(Real ) \n LengthY (1.0 ).as(Real ) ] :Optional :Input: Length\n"); |
13 | + fprintf(stderr, " [-M[ode] Mode (0 ).as(Integer ) ] :Optional :Input: Mode\n"); | |
13 | 14 | fprintf(stderr, " [-c[onfig] configFile (NULL ).as(inFile ) ] :Optional :ConfigurationFile\n"); |
14 | 15 | fprintf(stderr, " [-m[ode] mode (0 ).as(Integer ) ] :Optional :Mode\n"); |
15 | 16 | additionalUsage(); |