OSDN > ソフトウェアを探す > 科学/工学 > 情報分析 > Eos-Image Analysis Environment > SCM > git > base > コミット

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

R/O
HTTP
SSH
HTTPS

base: コミット

This repository is a base of Eos.

コミットメタ情報

リビジョン	14e842e98f1ff782fb96e2bdd503d99360cd5107 (tree)
日時	2014-10-16 04:46:43
作者	Takuo Yasunaga <yasunaga@bio....>
コミッター	Takuo Yasunaga

ログメッセージ

Modified: mrcImageNullImageCreate
modified: hostdepend/X86MAC64/bin/X86MAC64/mrcImageNullImageCreate
modified: src/Tools/Config/Define.inc
typechange: src/Tools/mrcImage/Makefile
modified: src/Tools/mrcImage/mrcImageNullImageCreate/Config/OptionControlFile
modified: src/Tools/mrcImage/mrcImageNullImageCreate/src/mrcImageNullImageCreate.c

変更サマリ

modified: hostdepend/X86MAC64/bin/X86MAC64/mrcImageNullImageCreate (diff)
modified: hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageNullImageCreate/src/X86MAC64/mrcImageNullImageCreate (diff)
modified: src/Tools/Config/Define.inc (diff)
modified: src/Tools/mrcImage/Makefile (diff)
modified: src/Tools/mrcImage/mrcImageNullImageCreate/Config/OptionControlFile (diff)
modified: src/Tools/mrcImage/mrcImageNullImageCreate/Makefile (diff)
add: src/Tools/mrcImage/mrcImageNullImageCreate/doc/Makefile (diff)
modified: src/Tools/mrcImage/mrcImageNullImageCreate/inc/mrcImageNullImageCreate.h (diff)
modified: src/Tools/mrcImage/mrcImageNullImageCreate/src/argCheck.c (diff)
modified: src/Tools/mrcImage/mrcImageNullImageCreate/src/init.c (diff)
modified: src/Tools/mrcImage/mrcImageNullImageCreate/src/mrcImageNullImageCreate.c (diff)
modified: src/Tools/mrcImage/mrcImageNullImageCreate/src/mrcImageNullImageCreate.html (diff)
modified: src/Tools/mrcImage/mrcImageNullImageCreate/src/mrcImageNullImageCreate.pane (diff)
add: src/Tools/mrcImage/mrcImageNullImageCreate/src/test/Makefile (diff)
add: src/Tools/mrcImage/mrcImageNullImageCreate/src/test/data (diff)
modified: src/Tools/mrcImage/mrcImageNullImageCreate/src/usage.c (diff)

差分

Binary files a/hostdepend/X86MAC64/bin/X86MAC64/mrcImageNullImageCreate and b/hostdepend/X86MAC64/bin/X86MAC64/mrcImageNullImageCreate differ

Binary files a/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageNullImageCreate/src/X86MAC64/mrcImageNullImageCreate and b/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageNullImageCreate/src/X86MAC64/mrcImageNullImageCreate differ

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

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

		@@ -224,3 +224,6 @@ WORLDNAME=Tools
224	224	WORLDNAME=Tools
225	225	WORLDNAME=Tools
226	226	WORLDNAME=Tools
	227	+WORLDNAME=Tools
	228	+WORLDNAME=Tools
	229	+WORLDNAME=Tools

--- a/src/Tools/mrcImage/Makefile

+++ /dev/null

		@@ -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		-

--- /dev/null

+++ b/src/Tools/mrcImage/Makefile

		@@ -0,0 +1 @@
	1	+/Users/tacyas/Eos/src/Config/Template/ToolsClassTemplate.Dir/Makefile
		\ No newline at end of file

--- a/src/Tools/mrcImage/mrcImageNullImageCreate/Config/OptionControlFile

+++ b/src/Tools/mrcImage/mrcImageNullImageCreate/Config/OptionControlFile

		@@ -1,10 +1,13 @@
1	1	# OptionControlFile
2	2	# FileFormat
3		-"-o","-o[utput]","OutputDataFile","Essential","1","1","Out","outFile","NULL"
	3	+"-o","-o[utput]","OutputDataFile","Essential","1","1","Out","outFile::mrcImage","NULL"
	4	+"-r","-r[eference]","Input: Reference Header","Optional","1","1","Ref","inFile::mrcImage","NULL"
4	5	"-Nx","-Nx[Number of x]","Nx:Default Nx of inputfile","Optional","1","1","Nx","Integer","0"
5	6	"-Ny","-Ny[Number of y]","Ny:Default Ny of inputfile","Optional","1","1","Ny","Integer","0"
6	7	"-Nz","-Nz[Number of z]","Nz:Default Nz of inputfile","Optional","1","1","Nz","Integer","0"
7	8	"-v","-v[alue]","Value of pixel","Optional","1","1","Value","Real","0.0"
8	9	"-d","-d[elta]","Pixel size","Optional","1","1","d","Real","0.0"
9		-"-c","-c[onfig]","ConfigurationFile","Optional","1","1","configFile","inFile","NULL"
	10	+"-M","-M[ode]","ImageMode: 0 char 1 short 2 Float","Optional","1","1","Mode","Integer","2"
	11	+"-Def","-Def[ault]","DefaultFixedValueSet","Optional","0"
	12	+"-c","-c[onfig]","ConfigurationFile","Optional","1","1","configFile","inFile::ASCII","NULL"
10	13	"-m","-m[ode]","Mode","Optional","1","1","mode","Integer","0"

--- a/src/Tools/mrcImage/mrcImageNullImageCreate/Makefile

+++ /dev/null

		@@ -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

--- /dev/null

+++ b/src/Tools/mrcImage/mrcImageNullImageCreate/Makefile

		@@ -0,0 +1 @@
	1	+/Users/tacyas/Eos/src/Config/Template/ToolsTemplate.Dir/Makefile
		\ No newline at end of file

--- /dev/null

+++ b/src/Tools/mrcImage/mrcImageNullImageCreate/doc/Makefile

		@@ -0,0 +1 @@
	1	+/Users/tacyas/Eos/src/Config/Template/ToolsTemplate.Dir/doc/Makefile
		\ No newline at end of file

--- a/src/Tools/mrcImage/mrcImageNullImageCreate/inc/mrcImageNullImageCreate.h

+++ b/src/Tools/mrcImage/mrcImageNullImageCreate/inc/mrcImageNullImageCreate.h

		@@ -17,6 +17,10 @@ typedef struct mrcImageNullImageCreateInfo {
17	17	char* Out;
18	18	FILE* fptOut;
19	19
	20	+ long flagRef;
	21	+ char* Ref;
	22	+ FILE* fptRef;
	23	+
20	24	long flagNx;
21	25	long Nx;
22	26

		@@ -32,6 +36,11 @@ typedef struct mrcImageNullImageCreateInfo {
32	36	long flagd;
33	37	float d;
34	38
	39	+ long flagMode;
	40	+ long Mode;
	41	+
	42	+ long Default;
	43	+
35	44	long flagconfigFile;
36	45	char* configFile;
37	46	FILE* fptconfigFile;

--- a/src/Tools/mrcImage/mrcImageNullImageCreate/src/argCheck.c

+++ b/src/Tools/mrcImage/mrcImageNullImageCreate/src/argCheck.c

		@@ -12,8 +12,19 @@
12	12	void
13	13	argCheck(mrcImageNullImageCreateInfo* info, int argc, char* argv[])
14	14	{
15		- long i, j, nv;
	15	+ long i;
16	16	char s[1024];
	17	+ FILE* fpt;
	18	+
	19	+ if(NULL==(fpt=fopen(".EosLog", "a+"))) {
	20	+
	21	+ } else {
	22	+ for(i=0; i<argc; i++) {
	23	+ fprintf(fpt, "%s ", argv[i]);
	24	+ }
	25	+ fprintf(fpt, "\n");
	26	+ fclose(fpt);
	27	+ }
17	28	for(i=1; i<argc; i++) {
18	29	if(OPTION_FLAG==argv[i][OPTION_FLAG_POS]) {
19	30	SSWITCH(argv[i]+OPTION_POS)

		@@ -28,6 +39,17 @@ argCheck(mrcImageNullImageCreateInfo* info, int argc, char* argv[])
28	39	}
29	40	SBREAK;
30	41	}
	42	+ SCASE("r") {
	43	+ if(i+1<argc) {
	44	+ info->Ref = stringGetNthWord(argv[i+1], 1, " ,");
	45	+ i++;
	46	+ info->flagRef++;
	47	+ } else {
	48	+ usage(argv[0]);
	49	+ exit(EXIT_FAILURE);
	50	+ }
	51	+ SBREAK;
	52	+ }
31	53	SCASE("Nx") {
32	54	if(i+1<argc) {
33	55	info->Nx = stringGetNthIntegerData(argv[i+1], 1, " ,");

		@@ -83,6 +105,26 @@ argCheck(mrcImageNullImageCreateInfo* info, int argc, char* argv[])
83	105	}
84	106	SBREAK;
85	107	}
	108	+ SCASE("M") {
	109	+ if(i+1<argc) {
	110	+ info->Mode = stringGetNthIntegerData(argv[i+1], 1, " ,");
	111	+ i++;
	112	+ info->flagMode++;
	113	+ } else {
	114	+ usage(argv[0]);
	115	+ exit(EXIT_FAILURE);
	116	+ }
	117	+ SBREAK;
	118	+ }
	119	+ SCASE("Def") {
	120	+ if(i+0<argc) {
	121	+ info->Default++;
	122	+ } else {
	123	+ usage(argv[0]);
	124	+ exit(EXIT_FAILURE);
	125	+ }
	126	+ SBREAK;
	127	+ }
86	128	SCASE("c") {
87	129	if(i+1<argc) {
88	130	info->configFile = stringGetNthWord(argv[i+1], 1, " ,");

--- a/src/Tools/mrcImage/mrcImageNullImageCreate/src/init.c

+++ b/src/Tools/mrcImage/mrcImageNullImageCreate/src/init.c

		@@ -13,11 +13,14 @@ void
13	13	init0(mrcImageNullImageCreateInfo* info)
14	14	{
15	15	info->fptOut = NULL; info->flagOut = 0;
	16	+ info->fptRef = NULL; info->flagRef = 0;
16	17	info->Nx = 0; info->flagNx = 0;
17	18	info->Ny = 0; info->flagNy = 0;
18	19	info->Nz = 0; info->flagNz = 0;
19	20	info->Value = 0.0; info->flagValue = 0;
20	21	info->d = 0.0; info->flagd = 0;
	22	+ info->Mode = 2; info->flagMode = 0;
	23	+ info->Default=0;
21	24	info->fptconfigFile = NULL; info->flagconfigFile = 0;
22	25	info->mode = 0; info->flagmode = 0;
23	26	}

		@@ -29,13 +32,17 @@ init1(mrcImageNullImageCreateInfo* info)
29	32	int i;
30	33	if(!info->flagOut) {
31	34	stringGetFromFile(s, "Out", stdin, stdout, 0);
32		- info->Out = stringGetNthWord(s, 1, " ,");
	35	+ info->Out = stringGetNthWord(s, 1, " ,\t");
33	36	info->flagOut++;
34	37	}
35	38	if(info->flagOut) {
36	39	info->fptOut = fileOpen(info->Out, "w");
37	40	}
38	41
	42	+ if(info->flagRef) {
	43	+ info->fptRef = fileOpen(info->Ref, "r");
	44	+ }
	45	+
39	46	if(info->flagNx) {
40	47	}
41	48

		@@ -51,6 +58,9 @@ init1(mrcImageNullImageCreateInfo* info)
51	58	if(info->flagd) {
52	59	}
53	60
	61	+ if(info->flagMode) {
	62	+ }
	63	+
54	64	if(info->flagconfigFile) {
55	65	info->fptconfigFile = fileOpen(info->configFile, "r");
56	66	}

--- a/src/Tools/mrcImage/mrcImageNullImageCreate/src/mrcImageNullImageCreate.c

+++ b/src/Tools/mrcImage/mrcImageNullImageCreate/src/mrcImageNullImageCreate.c

		@@ -38,6 +38,7 @@ int
38	38	main(int argc, char* argv[])
39	39	{
40	40	mrcImageNullImageCreateInfo info;
	41	+ mrcImage ref;
41	42	mrcImage out;
42	43	int x,y,z;
43	44

		@@ -47,23 +48,47 @@ main(int argc, char* argv[])
47	48
48	49	/* begin */
49	50	DEBUGPRINT("Program Start\n");
	51	+ mrcDefaultHeaderValueSet(&out);
50	52	out.HeaderN.x = info.Nx;
51	53	out.HeaderN.y = info.Ny;
52	54	out.HeaderN.z = info.Nz;
53		- out.HeaderMode = mrcFloatImage;
	55	+ out.HeaderMode = info.Mode;
54	56	out.HeaderM.x = 0.0;
55	57	out.HeaderM.y = 0.0;
56	58	out.HeaderM.z = 0.0;
57		- out.HeaderLength.x = info.d;
58		- out.HeaderLength.y = info.d;
59		- out.HeaderLength.z = info.d;
	59	+
	60	+ if(info.flagRef) {
	61	+ mrcFileRead(&ref, info.Ref, "in main", 0);
	62	+ out.Header.Cont = ref.Header.Cont;
	63	+ }
	64	+ if(info.Default) {
	65	+ mrcDefaultHeaderValueSetOnlyFixedValue(&out);
	66	+ }
	67	+ if(info.flagMode) {
	68	+ out.HeaderMode = info.Mode;
	69	+ }
	70	+ if(info.flagNx) {
	71	+ out.HeaderN.x = info.Nx;
	72	+ }
	73	+ if(info.flagNy) {
	74	+ out.HeaderN.y = info.Ny;
	75	+ }
	76	+ if(info.flagNz) {
	77	+ out.HeaderN.z = info.Nz;
	78	+ }
	79	+ if(info.flagd) {
	80	+ out.HeaderLength.x = info.d;
	81	+ out.HeaderLength.y = info.d;
	82	+ out.HeaderLength.z = info.d;
	83	+ }
	84	+
60	85	mrcInit(&out ,NULL);
61		- for (z=0; z<out.HeaderN.z; z++){
62		- for (y=0; y<out.HeaderN.y; y++){
63		- for (x=0; x<out.HeaderN.x; x++){
64		- mrcPixelDataSet(&out ,x ,y ,z ,info.Value ,mrcPixelRePart);
65		- }
66		- }
	86	+ for(z=0; z<out.HeaderN.z; z++) {
	87	+ for(y=0; y<out.HeaderN.y; y++) {
	88	+ for(x=0; x<out.HeaderN.x; x++) {
	89	+ mrcPixelDataSet(&out, x, y, z, info.Value, mrcPixelRePart);
	90	+ }
	91	+ }
67	92	}
68	93	mrcFileWrite(&out ,info.Out ,"in main" ,0);
69	94	exit(EXIT_SUCCESS);

		@@ -73,4 +98,6 @@ void
73	98	additionalUsage()
74	99	{
75	100	fprintf(stderr, "----- Additional Usage -----\n");
	101	+ fprintf(stderr, "-r is used to define a reference header.\n");
	102	+ fprintf(stderr, "-Nx etc. are used preferentially.\n");
76	103	}

--- a/src/Tools/mrcImage/mrcImageNullImageCreate/src/mrcImageNullImageCreate.html

+++ b/src/Tools/mrcImage/mrcImageNullImageCreate/src/mrcImageNullImageCreate.html

		@@ -8,15 +8,20 @@
8	8	<PRE>
9	9	Usage: mrcImageNullImageCreate
10	10	Options:
11		- [-o[utput] Out (NULL )] :Essential :OutputDataFile
12		- [-Nx[Number of x] Nx (0 )] :Optional :Nx:Default Nx of inputfile
13		- [-Ny[Number of y] Ny (0 )] :Optional :Ny:Default Ny of inputfile
14		- [-Nz[Number of z] Nz (0 )] :Optional :Nz:Default Nz of inputfile
15		- [-v[alue] Value (0.0 )] :Optional :Value of pixel
16		- [-d[elta] d (0.0 )] :Optional :Pixel size
17		- [-c[onfig] configFile (NULL )] :Optional :ConfigurationFile
18		- [-m[ode] mode (0 )] :Optional :Mode
	11	+ [-o[utput] Out (NULL ).as(outFile::mrcImage ) ] :Essential :OutputDataFile
	12	+ [-r[eference] Ref (NULL ).as(inFile::mrcImage ) ] :Optional :Input: Reference Header
	13	+ [-Nx[Number of x] Nx (0 ).as(Integer ) ] :Optional :Nx:Default Nx of inputfile
	14	+ [-Ny[Number of y] Ny (0 ).as(Integer ) ] :Optional :Ny:Default Ny of inputfile
	15	+ [-Nz[Number of z] Nz (0 ).as(Integer ) ] :Optional :Nz:Default Nz of inputfile
	16	+ [-v[alue] Value (0.0 ).as(Real ) ] :Optional :Value of pixel
	17	+ [-d[elta] d (0.0 ).as(Real ) ] :Optional :Pixel size
	18	+ [-M[ode] Mode (2 ).as(Integer ) ] :Optional :ImageMode: 0 char 1 short 2 Float
	19	+ [-Def[ault] ] :Optional :DefaultFixedValueSet
	20	+ [-c[onfig] configFile (NULL ).as(inFile::ASCII ) ] :Optional :ConfigurationFile
	21	+ [-m[ode] mode (0 ).as(Integer ) ] :Optional :Mode
19	22	----- Additional Usage -----
	23	+-r is used to define a reference header.
	24	+-Nx etc. are used preferentially.
20	25	</PRE>
21	26	</BODY>
22	27	</HTML>

--- a/src/Tools/mrcImage/mrcImageNullImageCreate/src/mrcImageNullImageCreate.pane

+++ b/src/Tools/mrcImage/mrcImageNullImageCreate/src/mrcImageNullImageCreate.pane

		@@ -8,13 +8,16 @@
8	8	-H 1 5x1+41+0 'Help' 'help page' $EOS/src/Tools/mrcImage/mrcImageNullImageCreate/doc/mrcImageNullImageCreate.doc help
9	9	-Q 1 0 5.25x1+47+0 'Close'
10	10	-O 1 0 1 1 0 1 -1x1+1+1.500000 ' ' 'Out' 'OutputDataFile' o
11		- -i 1 0 1 0 0 -1x1+1+3.000000 0 0 0 0 0 'Nx' 'Nx:Default Nx of inputfile' Nx
12		- -i 1 0 1 0 0 -1x1+1+4.500000 0 0 0 0 0 'Ny' 'Ny:Default Ny of inputfile' Ny
13		- -i 1 0 1 0 0 -1x1+1+6.000000 0 0 0 0 0 'Nz' 'Nz:Default Nz of inputfile' Nz
14		- -f 1 0 1 0 0 -1x1+1+7.500000 0 0 0.000000 0 0 0 'Value' 'Value of pixel' v
15		- -f 1 0 1 0 0 -1x1+1+9.000000 0 0 0.000000 0 0 0 'd' 'Pixel size' d
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
	11	+ -I 1 0 1 0 0 1 -1x1+1+3.000000 ' ' 'Ref' 'Input: Reference Header' r
	12	+ -i 1 0 1 0 0 -1x1+1+4.500000 0 0 0 0 0 'Nx' 'Nx:Default Nx of inputfile' Nx
	13	+ -i 1 0 1 0 0 -1x1+1+6.000000 0 0 0 0 0 'Ny' 'Ny:Default Ny of inputfile' Ny
	14	+ -i 1 0 1 0 0 -1x1+1+7.500000 0 0 0 0 0 'Nz' 'Nz:Default Nz of inputfile' Nz
	15	+ -f 1 0 1 0 0 -1x1+1+9.000000 0 0 0.000000 0 0 0 'Value' 'Value of pixel' v
	16	+ -f 1 0 1 0 0 -1x1+1+10.500000 0 0 0.000000 0 0 0 'd' 'Pixel size' d
	17	+ -i 1 0 1 0 0 -1x1+1+12.000000 0 0 2 0 0 'Mode' 'ImageMode: 0 char 1 short 2 Float' M
	18	+ -t 1 0 1 0 0 6x1+1+13 'Def' 'DefaultFixedValueSet' Def
	19	+ -I 1 0 1 0 0 1 -1x1+1+15.000000 ' ' 'configFile' 'ConfigurationFile' c
	20	+ -i 1 0 1 0 0 -1x1+1+16.500000 0 0 0 0 0 'mode' 'Mode' m
18	21	-E
19	22	-E
20	23	-E

--- /dev/null

+++ b/src/Tools/mrcImage/mrcImageNullImageCreate/src/test/Makefile

		@@ -0,0 +1,19 @@
	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) -o data/test.out -Nx 50 -Ny 50 -Nz 1 -M 2 -d 2.0
	15	+ ../$(OSTYPE)/$(OBJECTNAME) -r data/test.mrc -o data/test.outRef
	16	+ ../$(OSTYPE)/$(OBJECTNAME) -o data/test.outDef -Nx 50 -Ny 50 -Nz 1 -Def -v 1
	17	+ @echo "----- Calc check -----"
	18	+
	19	+clean:

--- /dev/null

+++ b/src/Tools/mrcImage/mrcImageNullImageCreate/src/test/data

		@@ -0,0 +1 @@
	1	+../../../../../..//data/mrcImageNullImageCreate
		\ No newline at end of file

--- a/src/Tools/mrcImage/mrcImageNullImageCreate/src/usage.c

+++ b/src/Tools/mrcImage/mrcImageNullImageCreate/src/usage.c

		@@ -7,14 +7,17 @@ usage(char* thisProgram)
7	7	{
8	8	fprintf(stderr, "Usage: %s\n", thisProgram);
9	9	fprintf(stderr, "Options:\n");
10		- fprintf(stderr, " [-o[utput] Out (NULL )] :Essential :OutputDataFile\n");
11		- fprintf(stderr, " [-Nx[Number of x] Nx (0 )] :Optional :Nx:Default Nx of inputfile\n");
12		- fprintf(stderr, " [-Ny[Number of y] Ny (0 )] :Optional :Ny:Default Ny of inputfile\n");
13		- fprintf(stderr, " [-Nz[Number of z] Nz (0 )] :Optional :Nz:Default Nz of inputfile\n");
14		- fprintf(stderr, " [-v[alue] Value (0.0 )] :Optional :Value of pixel\n");
15		- fprintf(stderr, " [-d[elta] d (0.0 )] :Optional :Pixel size\n");
16		- fprintf(stderr, " [-c[onfig] configFile (NULL )] :Optional :ConfigurationFile\n");
17		- fprintf(stderr, " [-m[ode] mode (0 )] :Optional :Mode\n");
	10	+ fprintf(stderr, " [-o[utput] Out (NULL ).as(outFile::mrcImage ) ] :Essential :OutputDataFile\n");
	11	+ fprintf(stderr, " [-r[eference] Ref (NULL ).as(inFile::mrcImage ) ] :Optional :Input: Reference Header\n");
	12	+ fprintf(stderr, " [-Nx[Number of x] Nx (0 ).as(Integer ) ] :Optional :Nx:Default Nx of inputfile\n");
	13	+ fprintf(stderr, " [-Ny[Number of y] Ny (0 ).as(Integer ) ] :Optional :Ny:Default Ny of inputfile\n");
	14	+ fprintf(stderr, " [-Nz[Number of z] Nz (0 ).as(Integer ) ] :Optional :Nz:Default Nz of inputfile\n");
	15	+ fprintf(stderr, " [-v[alue] Value (0.0 ).as(Real ) ] :Optional :Value of pixel\n");
	16	+ fprintf(stderr, " [-d[elta] d (0.0 ).as(Real ) ] :Optional :Pixel size\n");
	17	+ fprintf(stderr, " [-M[ode] Mode (2 ).as(Integer ) ] :Optional :ImageMode: 0 char 1 short 2 Float\n");
	18	+ fprintf(stderr, " [-Def[ault] ] :Optional :DefaultFixedValueSet\n");
	19	+ fprintf(stderr, " [-c[onfig] configFile (NULL ).as(inFile::ASCII ) ] :Optional :ConfigurationFile\n");
	20	+ fprintf(stderr, " [-m[ode] mode (0 ).as(Integer ) ] :Optional :Mode\n");
18	21	additionalUsage();
19	22	}
20	23

旧リポジトリブラウザで表示

Eos-Image Analysis Environment Forkothers2datatutorialoptionalothershostdependX86LINUX64hostdependX86MAC64hostdependX86LINUX64ICChostdependOTHERSbasezephyrhostdependARM64MAC64

base: コミット

コミットメタ情報

ログメッセージ

変更サマリ

差分

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