From 30ff6cdb243683428195bb81c15540f3a8b2e69c Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E5=AE=89=E6=B0=B8=E5=8D=93=E7=94=9F?= Date: Mon, 24 Jul 2017 16:49:27 +0900 Subject: [PATCH] A new tool: new file: bin/mrcImageSeriesInfoPerPixel --- Makefile | 6 +- bin/mrcImageSeriesInfoPerPixel | 1 + src/Tools/.Source | 1 + src/Tools/.Source.org | 1 - src/Tools/Config/Define.inc | 3 + src/Tools/timeSeries/.Source.org | 2 + src/Tools/timeSeries/Config/Define.inc | 1 + src/Tools/timeSeries/Makefile | 119 ++++++ .../mrcImageSeriesInfoPerPixel/Config/Define.inc | 4 + .../Config/OptionControlFile | 7 + .../mrcImageSeriesInfoPerPixel/Config/Target.inc | 0 .../timeSeries/mrcImageSeriesInfoPerPixel/Makefile | 115 ++++++ .../mrcImageSeriesInfoPerPixel/doc/Makefile | 2 + .../mrcImageSeriesInfoPerPixel/inc/config.h | 6 + .../inc/mrcImageSeriesInfoPerPixel.h | 52 +++ .../mrcImageSeriesInfoPerPixel/src/.Depend | 0 .../mrcImageSeriesInfoPerPixel/src/.Source | 0 .../mrcImageSeriesInfoPerPixel/src/Makefile | 430 +++++++++++++++++++++ .../mrcImageSeriesInfoPerPixel/src/X86MAC64 | 1 + .../mrcImageSeriesInfoPerPixel/src/argCheck.c | 110 ++++++ .../mrcImageSeriesInfoPerPixel/src/init.c | 99 +++++ .../src/mrcImageSeriesInfoPerPixel.c | 89 +++++ .../src/mrcImageSeriesInfoPerPixel.html | 20 + .../src/mrcImageSeriesInfoPerPixel.pane | 17 + .../mrcImageSeriesInfoPerPixel/src/usage.c | 37 ++ .../mrcImageSeriesInfoPerPixel/src/util.c | 4 + 26 files changed, 1123 insertions(+), 4 deletions(-) create mode 120000 bin/mrcImageSeriesInfoPerPixel create mode 100755 src/Tools/timeSeries/.Source.org create mode 100644 src/Tools/timeSeries/Config/Define.inc create mode 100755 src/Tools/timeSeries/Makefile create mode 100755 src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/Config/Define.inc create mode 100755 src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/Config/OptionControlFile create mode 100755 src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/Config/Target.inc create mode 100755 src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/Makefile create mode 100755 src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/doc/Makefile create mode 100755 src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/inc/config.h create mode 100755 src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/inc/mrcImageSeriesInfoPerPixel.h create mode 100755 src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/src/.Depend create mode 100755 src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/src/.Source create mode 100755 src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/src/Makefile create mode 120000 src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/src/X86MAC64 create mode 100755 src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/src/argCheck.c create mode 100755 src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/src/init.c create mode 100755 src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/src/mrcImageSeriesInfoPerPixel.c create mode 100644 src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/src/mrcImageSeriesInfoPerPixel.html create mode 100755 src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/src/mrcImageSeriesInfoPerPixel.pane create mode 100755 src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/src/usage.c create mode 100755 src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/src/util.c diff --git a/Makefile b/Makefile index 5e5b0c05d5..617c3bfb74 100644 --- a/Makefile +++ b/Makefile @@ -241,10 +241,10 @@ git-push::git-push-hostdepend make git-push-with-check; git-push-hostdepend:: -# git subtree push --prefix=hostdepend/$${EOS_HOSTDIR}/ --squash hostdepend$${EOS_HOSTDIR} master + @#git subtree push --prefix=hostdepend/$${EOS_HOSTDIR}/ --squash hostdepend$${EOS_HOSTDIR} master @echo "hostdepend" - #@cd hostdepend/$${EOS_HOSTDIR}/; git push hostdepend$${EOS_HOSTDIR} master - @cd hostdepend/$${EOS_HOSTDIR}/; git push || git push hostdepend$${EOS_HOSTDIR} master + @#cd hostdepend/$${EOS_HOSTDIR}/; git push hostdepend$${EOS_HOSTDIR} master + @cd hostdepend/$${EOS_HOSTDIR}/; git push || git push --set-upstream origin master || git push hostdepend$${EOS_HOSTDIR} master git-push-optional:: # cd optional; git push optional master --tags diff --git a/bin/mrcImageSeriesInfoPerPixel b/bin/mrcImageSeriesInfoPerPixel new file mode 120000 index 0000000000..eddb95508d --- /dev/null +++ b/bin/mrcImageSeriesInfoPerPixel @@ -0,0 +1 @@ +../sbin/MachineIndependent \ No newline at end of file diff --git a/src/Tools/.Source b/src/Tools/.Source index a57f74e8fb..d6983a6f16 100644 --- a/src/Tools/.Source +++ b/src/Tools/.Source @@ -25,6 +25,7 @@ psUtil \ random \ rec3d \ simulation \ +timeSeries \ transform \ utils \ vectorImage \ diff --git a/src/Tools/.Source.org b/src/Tools/.Source.org index 7406a09a7b..a57f74e8fb 100644 --- a/src/Tools/.Source.org +++ b/src/Tools/.Source.org @@ -18,7 +18,6 @@ llData \ ltlgData \ matrix3D \ mrcImage \ -mrcMultiFFTCentralSectionsCompare \ openGL \ pdbUtil \ pickup \ diff --git a/src/Tools/Config/Define.inc b/src/Tools/Config/Define.inc index fbb96902d8..8f4745e152 100755 --- a/src/Tools/Config/Define.inc +++ b/src/Tools/Config/Define.inc @@ -1126,3 +1126,6 @@ WORLDNAME=Tools WORLDNAME=Tools WORLDNAME=Tools WORLDNAME=Tools +WORLDNAME=Tools +WORLDNAME=Tools +WORLDNAME=Tools diff --git a/src/Tools/timeSeries/.Source.org b/src/Tools/timeSeries/.Source.org new file mode 100755 index 0000000000..e17b90264b --- /dev/null +++ b/src/Tools/timeSeries/.Source.org @@ -0,0 +1,2 @@ +SOURCE_FILE =\ +#LastSource diff --git a/src/Tools/timeSeries/Config/Define.inc b/src/Tools/timeSeries/Config/Define.inc new file mode 100644 index 0000000000..fe8724933d --- /dev/null +++ b/src/Tools/timeSeries/Config/Define.inc @@ -0,0 +1 @@ +CLASSNAME = timeSeries diff --git a/src/Tools/timeSeries/Makefile b/src/Tools/timeSeries/Makefile new file mode 100755 index 0000000000..6c348f0690 --- /dev/null +++ b/src/Tools/timeSeries/Makefile @@ -0,0 +1,119 @@ +include ../../Config/Define.inc +include ../Config/Define.inc +include Config/Define.inc +include .Source + +all: + for dir in ${SOURCE} ; \ + do \ + if [ -d $${dir} ] ; then \ + $(CD) $${dir}; make all; $(CD) ..; \ + fi \ + done + +install: + for dir in ${SOURCE} ; \ + do \ + if [ -d $${dir} ] ; then \ + $(CD) $${dir}; make install; $(CD) ..; \ + fi \ + done + +put: + for dir in ${SOURCE} ; \ + do \ + if [ -d $${dir} ] ; then \ + $(CD) $${dir}; make put; $(CD) ..; \ + fi \ + done + +putSF: + if [ -f private ] ; then \ + echo "$(WORLDNAME)/$(CLASSNAME) is private " ; \ + else \ + for dir in ${SOURCE} ; \ + do \ + if [ -d $${dir} ] ; then \ + $(CD) $${dir}; make putSF; $(CD) ..; \ + fi \ + done \ + fi + +clean: + for dir in ${SOURCE} ; \ + do \ + $(CD) $${dir}; make clean; $(CD) ..; \ + done + +check: + @for dir in ${SOURCE} ; do \ + if [ -d $${dir} ] ; then \ + $(CD) $${dir}; \ + echo $${dir}; \ + $(RM) Makefile; \ + $(CP) ../../../Config/Template/$(WORLDNAME)Template.Dir/Makefile Makefile ; \ + make check; \ + $(CD) ..; \ + fi \ + done + +update: + @for dir in ${SOURCE} ; do \ + if [ -d $${dir} ] ; then \ + $(CD) $${dir}; \ + echo $${dir}; \ + $(RM) Makefile; \ + $(CP) ../../../Config/Template/$(WORLDNAME)Template.Dir/Makefile Makefile ; \ + make update; \ + $(CD) ..; \ + fi \ + done + +depend: check + @for dir in ${SOURCE} ; \ + do \ + $(CD) $${dir}; make depend; $(CD) ..; \ + done + +backup: + cd ../../..; \ + tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/Config; \ + tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/Makefile; \ + tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/.[A-z]* + tar uvf ${EOS_HOME}/backup/EosBase.tar .[A-z]* + @for dir in ${SOURCE} ; \ + do \ + $(CD) $${dir}; make backup; $(CD) ..; \ + done + +backup-all: + cd ../../..; \ + tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/Config; \ + tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/Makefile; \ + tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/.[A-z]* + tar rvf ${EOS_HOME}/backup/EosBase.tar .[A-z]* + @for dir in ${SOURCE} ; \ + do \ + $(CD) $${dir}; make backup; $(CD) ..; \ + done + +distribute: + cd ../../..; \ + tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/Config; \ + tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/Makefile; \ + tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/.[A-z]* + @for dir in ${SOURCE} ; \ + do \ + $(CD) $${dir}; make distribute; $(CD) ..; \ + done + +distribute-all: + cd ../../..; \ + tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/Config; \ + tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/Makefile; \ + tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/.[A-z]* + @for dir in ${SOURCE} ; \ + do \ + $(CD) $${dir}; make distribute-all; $(CD) ..; \ + done + diff --git a/src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/Config/Define.inc b/src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/Config/Define.inc new file mode 100755 index 0000000000..7439c6cc42 --- /dev/null +++ b/src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/Config/Define.inc @@ -0,0 +1,4 @@ +OBJECTNAME = mrcImageSeriesInfoPerPixel +EXTRA_LIB = +EXTRA_CCOPTS = +EXTRA_INC = diff --git a/src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/Config/OptionControlFile b/src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/Config/OptionControlFile new file mode 100755 index 0000000000..a47cbf83ee --- /dev/null +++ b/src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/Config/OptionControlFile @@ -0,0 +1,7 @@ +# OptionControlFile +# FileFormat +"-i","-i[nput]","Input[mrcImageStack]","Essential","1","1","In","inFile::mrcImage","NULL" +"-o","-o[utput]","Output","Essential","1","1","Out","outFile::ASCII","NULL" +"-p","-p[osition]","Position","Optional","2","1","X","Real","0.0","2","Y","Real","0.0" +"-c","-c[onfig]","ConfigurationFile","Optional","1","1","configFile","inFile","NULL" +"-m","-m[ode]","Mode","Optional","1","1","mode","Integer","0" diff --git a/src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/Config/Target.inc b/src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/Config/Target.inc new file mode 100755 index 0000000000..e69de29bb2 diff --git a/src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/Makefile b/src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/Makefile new file mode 100755 index 0000000000..6c4a33690a --- /dev/null +++ b/src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/Makefile @@ -0,0 +1,115 @@ +include ../../../Config/Define.inc +include ../../Config/Define.inc +include ../Config/Define.inc +include Config/Define.inc + +all: + cd src; make all; cd .. + +install: + cd src; make install; cd .. + + +putSF: + if [ -f private ] ; \ + then \ + echo "$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME) is private"; \ + else \ + cvs -z4 -d:ext:$$USER@$$EOS_SOURCEFORGE commit || cvs -z4 -d:ext:$$USER@$$EOS_SOURCEFORGE import src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME); \ + fi + +put: + cd src; make put; cd .. + +clean: + cd src; make clean; cd .. + +depend: + cd src; make depend; cd .. + +check: + @if [ ! -d $(EOS_HOME)/hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE) ] ; then \ + echo making directory; \ + mkdir -p $(EOS_HOME)/hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE); \ + fi + ln -sf ../../../../../hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE) src/$(OSTYPE); + @$(RM) src/Makefile + @echo "New src/Makefile" + @$(CP) ../../../Config/Template/$(WORLDNAME)Template.Dir/src/Makefile src/Makefile + @cd src; touch $(OSTYPE)/.Depend; make depend + +update: + @if [ ! -d $(EOS_HOME)/hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE) ] ; then \ + echo making directory; \ + mkdir -p $(EOS_HOME)/hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE); \ + fi + ln -sf ../../../../../hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE) src/$(OSTYPE); + @$(RM) src/Makefile + @echo "New src/Makefile" + @$(CP) ../../../Config/Template/$(WORLDNAME)Template.Dir/src/Makefile src/Makefile + @cd src; touch $(OSTYPE)/.Depend; echo "Y" | make update + +cvsupdate:: + cvs -d $(EOS_CVSROOT) update -d + +cvscommit:: + cvs -d $(EOS_CVSROOT) commit + +backup: + @cd ../../../..; \ + echo $(OBJECTNAME) ; \ + tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config ; \ + tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Makefile ;\ + tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/.[A-z]* ; \ + tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/inc ; \ + tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/doc; \ + tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/wish; \ + tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/[A-z]*.[A-z]*; \ + tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/.[A-z]*; \ + tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/Makefile + +backup-all: + @cd ../../../..; \ + echo $(OBJECTNAME) ; \ + tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config ; \ + tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Makefile ;\ + tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/.[A-z]* ; \ + tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/inc ; \ + tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/doc; \ + tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/wish; \ + tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/[A-z]*.[A-z]*; \ + tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/.[A-z]*; \ + tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/Makefile + +distribute: + cd ../../../..; \ + echo $(OBJECTNAME) ; \ + tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config ; \ + tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Makefile ;\ + tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/.[A-z]* ; \ + tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/inc ; \ + tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/doc; \ + tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/wish; \ + tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/[A-z]*.[A-z]*; \ + tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/.[A-z]*; \ + tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/Makefile ; \ + tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE) + +distribute-all: + @cd ../../../..; \ + echo $(OBJECTNAME) ; \ + tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config ; \ + tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Makefile ;\ + tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/.[A-z]* ; \ + tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/inc ; \ + tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/doc; \ + tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/wish; \ + tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/[A-z]*.[A-z]*; \ + tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/.[A-z]*; \ + tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/Makefile ; \ + tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE) + +eosintroduce: + ${EOS_HOME}/sbin/eosintroduce ${WORLDNAME} ${CLASSNAME} ${OBJECTNAME} ./ + +include Config/Target.inc diff --git a/src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/doc/Makefile b/src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/doc/Makefile new file mode 100755 index 0000000000..8215199e1b --- /dev/null +++ b/src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/doc/Makefile @@ -0,0 +1,2 @@ +install: + cd ../src; make install-doc; cd ../doc diff --git a/src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/inc/config.h b/src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/inc/config.h new file mode 100755 index 0000000000..863a616daa --- /dev/null +++ b/src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/inc/config.h @@ -0,0 +1,6 @@ +#ifndef CONFIG_H +#define CONFIG_H + +#include "../inc/mrcImageSeriesInfoPerPixel.h" + +#endif /* CONFIG_H */ diff --git a/src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/inc/mrcImageSeriesInfoPerPixel.h b/src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/inc/mrcImageSeriesInfoPerPixel.h new file mode 100755 index 0000000000..732eddfcf6 --- /dev/null +++ b/src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/inc/mrcImageSeriesInfoPerPixel.h @@ -0,0 +1,52 @@ +#ifndef MRCIMAGESERIESINFOPERPIXEL_H +#define MRCIMAGESERIESINFOPERPIXEL_H +#include +#include + +#define OPTION_FLAG '-' +#define OPTION_FLAG_POS (0) +#define OPTION_POS (1) + + + + +typedef struct mrcImageSeriesInfoPerPixelInfo { + long flagRedirect; + + long flagIn; + char* In; + FILE* fptIn; + + long flagOut; + char* Out; + FILE* fptOut; + + long flagX; + float X; + + long flagY; + float Y; + + long flagconfigFile; + char* configFile; + FILE* fptconfigFile; + + long flagmode; + long mode; + +} mrcImageSeriesInfoPerPixelInfo; +#ifdef __cplusplus +extern "C" { +#endif +extern void argCheck(mrcImageSeriesInfoPerPixelInfo* info, int argc, char* avgv[]); +extern void khorosInit(int argc, char* avgv[]); +extern void init0(mrcImageSeriesInfoPerPixelInfo* info); +extern void init1(mrcImageSeriesInfoPerPixelInfo* info); +extern void usage(char* usage); +extern void additionalUsage(void); +extern void htmlBeforeUsage(char* usage); +extern void htmlAfterUsage(char* usage); +#ifdef __cplusplus +}; +#endif +#endif /* MRCIMAGESERIESINFOPERPIXEL_H */ diff --git a/src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/src/.Depend b/src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/src/.Depend new file mode 100755 index 0000000000..e69de29bb2 diff --git a/src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/src/.Source b/src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/src/.Source new file mode 100755 index 0000000000..e69de29bb2 diff --git a/src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/src/Makefile b/src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/src/Makefile new file mode 100755 index 0000000000..a360703891 --- /dev/null +++ b/src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/src/Makefile @@ -0,0 +1,430 @@ +include ../Config/Define.inc +include ../../Config/Define.inc +include ../../../Config/Define.inc +include ../../../../Config/Define.inc + +EOSHOME=../../../../../ +DSTDIR=$(EOSHOME)/bin +DSTDOC=$(EOSHOME)/doc +DSTTAR=$(EOSHOME)/tar + +INCFILES = + +LIBFILES = \ + $(LIBPREFIX)EosObjects$(LIBSUFFIX) + +LIBFILESDEBUG = \ + $(LIBPREFIX)EosObjects.debug$(LIBSUFFIX) + +SRCC = \ + $(OBJECTNAME).c \ + init.c \ + argCheck.c \ + usage.c \ + util.c \ + +SRCCXX = \ + $(OBJECTNAME).cc \ + init.cc \ + argCheck.cc \ + usage.cc \ + util.cc \ + +MODULES = \ + $(OBJECTNAME).o \ + init.o \ + argCheck.o \ + usage.o \ + util.o \ + +REALMODULES = \ + $(OSTYPE)/$(OBJECTNAME).o \ + $(OSTYPE)/init.o \ + $(OSTYPE)/argCheck.o \ + $(OSTYPE)/usage.o \ + $(OSTYPE)/util.o + +MODULESDEBUG = \ + $(OBJECTNAME).debugo \ + init.debugo \ + argCheck.debugo \ + usage.debugo \ + util.debugo \ + +REALMODULESDEBUG = \ + $(OSTYPE)/$(OBJECTNAME).debugo \ + $(OSTYPE)/init.debugo \ + $(OSTYPE)/argCheck.debugo \ + $(OSTYPE)/usage.debugo \ + $(OSTYPE)/util.debugo + + +all: $(OSTYPE)/$(OBJECTNAME) + if [ ! -L $(OSTYPE) ] ; then \ + moveHostdependent; \ + fi + +debug: $(OSTYPE)/$(OBJECTNAME).debug + +cudagdb: $(OSTYPE)/$(OBJECTNAME).cudagdb + + +$(OSTYPE)/$(OBJECTNAME):: + @$(RM) -f $(OSTYPE)/Makefile ; \ + $(CP) $(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH/Makefile $(OSTYPE)/Makefile ; \ + cd $(OSTYPE); \ + $(MAKE) $(OBJECTNAME) WORLDNAME=$(WORLDNAME) CLASSNAME=$(CLASSNAME) OBJECTNAME=$(OBJECTNAME) + +$(OSTYPE)/$(OBJECTNAME).debug:: + @$(RM) -f $(OSTYPE)/Makefile ; \ + $(CP) $(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH/Makefile $(OSTYPE)/Makefile ; \ + cd $(OSTYPE); \ + $(MAKE) $(OBJECTNAME).debug WORLDNAME=$(WORLDNAME) CLASSNAME=$(CLASSNAME) OBJECTNAME=$(OBJECTNAME) + +$(OSTYPE)/$(OBJECTNAME).cudagdb:: + @$(RM) -f $(OSTYPE)/Makefile ; \ + $(CP) $(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH/Makefile $(OSTYPE)/Makefile ; \ + cd $(OSTYPE); \ + $(MAKE) $(OBJECTNAME).cudagdb WORLDNAME=$(WORLDNAME) CLASSNAME=$(CLASSNAME) OBJECTNAME=$(OBJECTNAME) + +cvsupdate:: + cvs -d $(EOS_CVSROOT) update -d + +cvscommit:: + cvs -d $(EOS_CVSROOT) commit + +edit: + @if [ -r $(OBJECTNAME).c ]; \ + then \ + sccsEdit $(OBJECTNAME).c; \ + else \ + echo "Source files are already editable"; \ + fi + @if [ -r wish/$(OBJECTNAME).wish ]; \ + then \ + cd wish; sccsEdit $(OBJECTNAME).wish; \ + else \ + echo "Source files (wish) are already editable."; \ + fi + @if [ -r ruby/$(OBJECTNAME).rb ]; \ + then \ + cd ruby; sccsEdit $(OBJECTNAME).rb; \ + else \ + echo "Source files (ruby) are already editable."; \ + fi + @if [ -r perl/$(OBJECTNAME).pl ]; \ + then \ + cd perl; sccsEdit $(OBJECTNAME).pl ; \ + else \ + echo "Source files (perl) are already editable."; \ + fi + @if [ -r ../Config/OptionControlFile ]; \ + then \ + cd ../Config; sccsEdit OptionControlFile; \ + else \ + echo "OptionControlFile are already editable."; \ + fi + +unedit: + @if [ -w $(OBJECTNAME).c ]; \ + then \ + sccsUnedit $(OBJECTNAME).c; \ + else \ + echo "Source files are not editable"; \ + fi + @if [ -w wish/$(OBJECTNAME).wish ]; \ + then \ + cd wish; sccsUnedit $(OBJECTNAME).wish; \ + else \ + echo "Source files (wish) are not editable."; \ + fi + @if [ -w ruby/$(OBJECTNAME).rb]; \ + then \ + cd ruby; sccsUnedit $(OBJECTNAME).rb; \ + else \ + echo "Source files (ruby) are not editable."; \ + fi + @if [ -w perl/$(OBJECTNAME).pl ]; \ + then \ + cd perl; sccsUnedit $(OBJECTNAME).pl ; \ + else \ + echo "Source files (ruby) are not editable."; \ + fi + @if [ -w ../Config/OptionControlFile ]; \ + then \ + cd ../Config; sccsUnedit OptionControlFile; \ + else \ + echo "OptionControlFile are not editable."; \ + fi + +report: + @if [ -r $(OBJECTNAME).c ]; \ + then \ + sccsReport $(OBJECTNAME).c; \ + else \ + echo "Source files are already editable"; \ + fi + @if [ -r wish/$(OBJECTNAME).wish ]; \ + then \ + cd wish; sccsReport $(OBJECTNAME).wish; \ + else \ + echo "Source files (wish) are already editable."; \ + fi + @if [ -r ruby/$(OBJECTNAME).rb ]; \ + then \ + cd ruby; sccsReport $(OBJECTNAME).rb; \ + else \ + echo "Source files (ruby) are already editable."; \ + fi + @if [ -r perl/$(OBJECTNAME).pl ] ; \ + then \ + cd perl; sccsReport $(OBJECTNAME).pl ; \ + else \ + echo "Source files (perl) are already editable."; \ + fi + @if [ -r ../Config/OptionControlFile ]; \ + then \ + cd ../Config; sccsReport OptionControlFile; \ + else \ + echo "OptionControlFile are already editable."; \ + fi + +clean : + rm -f *.debugo $(OSTYPE)/*.debugo *.cudagdbo $(OSTYPE)/*.cudagdbo *.o $(OSTYPE)/*.o *.linkinfo $(OSTYPE)/*.linkinfo \ + $(OSTYPE)/$(OBJECTNAME) $(OSTYPE)/*.$(OSTYPE) \ + $(OSTYPE)/$(OBJECTNAME).debug $(OSTYPE)/*.$(OSTYPE).debug \ + $(OSTYPE)/$(OBJECTNAME).cudagdb $(OSTYPE)/*.$(OSTYPE).cudagdb \ + $(OSTYPE)/$(OBJECTNAME).linkinfo $(OSTYPE)/*.$(OSTYPE).linkinfo \ + *.bak *.$(OSTYPE) core + +install: install-bin install-doc install-wish install-ruby install-shell install-perl + @if [ dummy$(KHOROS_KENGOBJ) != dummy ] ; \ + then \ + if [ -x $(KHOROS_KGENOBJ) ] ; \ + then \ + make install-khoros ; \ + fi; \ + fi + +install-bin:$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME) + +$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME) + @echo ---- Installing to bin + @echo $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME) + @if [ ! -d $(DSTDIR)/$(OSTYPE) ]; \ + then \ + mkdir $(DSTDIR)/$(OSTYPE); \ + fi + @if [ -x $(OSTYPE)/$(OBJECTNAME) ]; \ + then \ + echo "Compilation is complete"; \ + $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \ + $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \ + $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \ + else \ + echo "Compilation is incomplete. $(OBJECTNAME)"; \ + fi + @echo ---- end of bin + +install-wish: + @if [ -d wish ]; \ + then \ + echo "---- Tcl/Tk file Install"; \ + if [ ! -d $(DSTDIR)/wish/$(OBJECTNAME) ]; \ + then \ + mkdir $(DSTDIR)/wish/$(OBJECTNAME) ; \ + fi ; \ + $(CP) -f wish/* $(DSTDIR)/wish/$(OBJECTNAME); \ + $(CHMOD) 555 $(DSTDIR)/wish/$(OBJECTNAME)/* ;\ + touch $(DSTDIR)/wish/$(OBJECTNAME)/tclIndex;\ + $(CHMOD) 666 $(DSTDIR)/wish/$(OBJECTNAME)/tclIndex;\ + echo "---- Tcl/Tk file Installed";\ + fi + +install-ruby: + @if [ -d ruby ]; \ + then \ + echo "---- Ruby/Tk file Install"; \ + if [ ! -d $(DSTDIR)/ruby/$(OBJECTNAME) ]; \ + then \ + mkdir $(DSTDIR)/ruby/$(OBJECTNAME) ; \ + fi ; \ + $(CP) -f ruby/* $(DSTDIR)/ruby/$(OBJECTNAME); \ + $(CHMOD) 555 $(DSTDIR)/ruby/$(OBJECTNAME)/* ; \ + echo "---- Ruby/Tk file Installed"; \ + fi + +install-perl: + @if [ -d perl ]; \ + then \ + echo "---- Perl/Tk file Install"; \ + if [ ! -d $(DSTDIR)/perl/$(OBJECTNAME) ]; \ + then \ + mkdir $(DSTDIR)/perl/$(OBJECTNAME) ; \ + fi; \ + $(CP) -f perl/* $(DSTDIR)/perl/$(OBJECTNAME); \ + $(CHMOD) 555 $(DSTDIR)/perl/$(OBJECTNAME)/* ; \ + echo "---- Perl/Tk file Installed"; \ + fi + +install-shell: + @if [ ! -d $(DSTDIR)/shell/$(OBJECTNAME) ]; \ + then \ + mkdir $(DSTDIR)/shell/$(OBJECTNAME) ; \ + fi + @if [ -d shell ]; \ + then \ + echo "---- Shell file Install"; \ + if [ ! -d $(DSTDIR)/shell/$(OBJECTNAME) ]; \ + then \ + mkdir $(DSTDIR)/shell/$(OBJECTNAME) ; \ + fi ; \ + $(CP) -f shell/* $(DSTDIR)/shell/$(OBJECTNAME); \ + $(CHMOD) 555 $(DSTDIR)/shell/$(OBJECTNAME)/*; \ + echo "---- Shell file Installed"; \ + fi + +install-khoros: + @echo Installing to khoros + @if [ ! -d ../../../../../objects/script/$(OBJECTNAME) -a -f $(KHOROS_KGENOBJ) ]; \ + then \ + echo kgenobj;\ + $(KHOROS_KGENOBJ) -tb Eos -oname $(OBJECTNAME) -type script -pane -cantata true -cat Eos -subcat $(CLASSNAME) -description $(OBJECTNAME) -bname $(OBJECTNAME) -form -lang ksh ; \ + fi + @if [ ! -d ../../../../../objects/script/$(OBJECTNAME) -a -f $(KHOROS_KSET) ]; \ + then \ + $(KHOROS_KSET) -tb Eos -oname $(OBJECTNAME) -icon $(OBJECTNAME) ; \ + fi + @if [ -d ../../../../../objects/script/$(OBJECTNAME) -a -f $(KHOROS_KSET) ]; \ + then \ + $(CHMOD) -R 775 ../../../../../objects/script/$(OBJECTNAME) ; \ + if [ $? ] ; \ + then \ + echo "-- setting khoros ---" ; \ + if [ -d ../../../../../objects/script/$(OBJECTNAME)/uis/ ] ; \ + then \ + $(CD) ../../../../../objects/script/$(OBJECTNAME)/uis/ ; \ + $(RM) -f $(OBJECTNAME).pane ; \ + $(LN) -s ../../../../src/Tools/$(CLASSNAME)/$(OBJECTNAME)/src/$(OBJECTNAME).pane $(OBJECTNAME).pane; \ + $(CD) ../../ ; \ + $(CHMOD) -R 555 $(OBJECTNAME); \ + else \ + echo "../../../../../objects/script/$(OBJECTNAME)/uis/ does not exist."; \ + fi ; \ + else \ + echo "Failed !!: Cannot chage mode in installing $(OBJECTNAME) to khoros system"; \ + fi ; \ + echo "-- end of khoros-installing"; \ + fi + +install-doc: html + @if [ ! -d $(DSTDOC)/SmallTools ]; \ + then \ + mkdir $(DSTDOC)/SmallTools ;\ + fi + @if [ -f $(DSTDOC)/SmallTools/$(OBJECTNAME).html ]; \ + then \ + $(RM) -f $(DSTDOC)/SmallTools/$(OBJECTNAME).html ;\ + fi + @$(CP) $(OBJECTNAME).html $(DSTDOC)/SmallTools/$(OBJECTNAME).html + @$(CHMOD) 444 $(DSTDOC)/SmallTools/$(OBJECTNAME).html + @if [ -f ../doc/*.html ]; \ + then \ + $(CP) ../doc/*.html $(DSTDOC)/SmallTools/ ;\ + fi + @$(CHMOD) 444 $(DSTDOC)/SmallTools/$(OBJECTNAME).html + @if [ -f $(DSTDOC)/SmallTools/Makefile ]; \ + then \ + cd $(DSTDOC)/SmallTools; $(MAKE); \ + fi + +html: $(OBJECTNAME).html + +configFileRead: + @ctrl2configFileRead $(CLASSNAME) $(OBJECTNAME) ../Config/OptionControlFile + +$(OBJECTNAME).html: $(OSTYPE)/$(OBJECTNAME) + @echo creating html + @$(OSTYPE)/$(OBJECTNAME) -html 2> $(OBJECTNAME).html.tmp + @sed -e s/$(OSTYPE)\\/// $(OBJECTNAME).html.tmp > $(OBJECTNAME).html + @$(RM) $(OBJECTNAME).html.tmp + +$(DSTDIR)/$(OBJECTNAME): $(OSTYPE)/$(OBJECTNAME) + @ln -s -f ../sbin/MachineIndependent $@ + +depend:: + @echo dependency checking now + @if [ ! -L $(OSTYPE) ] ; then \ + moveHostdependent; \ + fi + rm -f $(OSTYPE)/.Depend + #echo C + @if [ -f $(OBJECTNAME).c ] ; \ + then \ + echo "dependency: *.c"; \ + echo $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) *.c ; \ + $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) *.c >> $(OSTYPE)/.Depend ; \ + fi + #echo CC + @if [ -f $(OBJECTNAME).cc ] ; \ + then \ + echo "dependency: *.cc"; \ + echo $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) $(EXTRA_CCOPTS) *.cc ; \ + $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) $(EXTRA_CCOPTS) *.cc >> $(OSTYPE)/.Depend ; \ + fi + @if [ -f $(OBJECTNAME).ccm ] ; \ + then \ + echo "dependency: *.ccm"; \ + echo $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) $(EXTRA_CCOPTS) *.ccm ; \ + $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) $(EXTRA_CCOPTS) *.ccm >> $(OSTYPE)/.Depend ; \ + fi + @if [ -f $(OBJECTNAME).cu ] ; \ + then \ + echo "dependency: *.cu"; \ + echo $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) $(EXTRA_CCOPTS) *.cu ; \ + $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) $(EXTRA_CCOPTS) *.cu >> $(OSTYPE)/.Depend ; \ + fi + +update:../Config/OptionControlFile + maketool $(CLASSNAME) $(OBJECTNAME) update + +updateNoAns:../Config/OptionControlFile + maketool $(CLASSNAME) $(OBJECTNAME) update N + +changeName:: + +Test:$(OSTYPE)/$(OBJECTNAME) TestDir + @if [ -f test/Makefile ] ; \ + then \ + cd test; make ; \ + else \ + echo "No test Makefile"; \ + fi + +TestDir:: + @if [ ! -d test ] ; \ + then \ + echo "Creating test dir"; \ + mkdir test; \ + fi + @if [ ! -f test/Makefile ] ; \ + then \ + echo "Creating Makefile"; \ + cd test; \ + protoTestMakefileCreate; \ + fi + @if [ ! -d test/data ]; \ + then \ + mkdir $(EOSHOME)/data/$(OBJECTNAME); \ + cd test; \ + ln -sf ../$(EOSHOME)/data/$(OBJECTNAME) data; \ + fi + +tar:: + cd $(DSTTAR); tar cvf Tools.$(CLASSNAME).$(OBJECTNAME).tar ../bin/$(OBJECTNAME) \ + ../bin/*/$(OBJECTNAME).* \ + ../src/Tools/$(CLASSNAME)/$(OBJECTNAME) \ + ; gzip Tools.$(CLASSNAME).$(OBJECTNAME).tar + +-include $(OSTYPE)/.Depend +-include ../Config/Target.inc diff --git a/src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/src/X86MAC64 b/src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/src/X86MAC64 new file mode 120000 index 0000000000..7722dcbc1e --- /dev/null +++ b/src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/src/X86MAC64 @@ -0,0 +1 @@ +../../../../../hostdepend/X86MAC64/src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/src/X86MAC64 \ No newline at end of file diff --git a/src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/src/argCheck.c b/src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/src/argCheck.c new file mode 100755 index 0000000000..55b36b00dc --- /dev/null +++ b/src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/src/argCheck.c @@ -0,0 +1,110 @@ +#include +#include +#include +#include +#include "../inc/config.h" +#include "genUtil.h" +#include "eosString.h" +#include "File.h" +#include "Memory.h" + + +void +argCheck(mrcImageSeriesInfoPerPixelInfo* info, int argc, char* argv[]) +{ + long i; + char s[1024]; + FILE* fpt; + + if(NULL==(fpt=fopen(".EosLog", "a+"))) { + + } else { + for(i=0; iIn = stringGetNthWord(argv[i+1], 1, " ,"); + i++; + info->flagIn++; + } else { + usage(argv[0]); + exit(EXIT_FAILURE); + } + SBREAK; + } + SCASE("o") { + if(i+1Out = stringGetNthWord(argv[i+1], 1, " ,"); + i++; + info->flagOut++; + } else { + usage(argv[0]); + exit(EXIT_FAILURE); + } + SBREAK; + } + SCASE("p") { + if(i+2X = stringGetNthRealData(argv[i+1], 1, " ,"); + i++; + info->flagX++; + info->Y = stringGetNthRealData(argv[i+1], 1, " ,"); + i++; + info->flagY++; + } else { + usage(argv[0]); + exit(EXIT_FAILURE); + } + SBREAK; + } + SCASE("c") { + if(i+1configFile = stringGetNthWord(argv[i+1], 1, " ,"); + i++; + info->flagconfigFile++; + } else { + usage(argv[0]); + exit(EXIT_FAILURE); + } + SBREAK; + } + SCASE("m") { + if(i+1mode = stringGetNthIntegerData(argv[i+1], 1, " ,"); + i++; + info->flagmode++; + } else { + usage(argv[0]); + exit(EXIT_FAILURE); + } + SBREAK; + } + SCASE("h") { + usage(argv[0]); + exit(EXIT_SUCCESS); + break; + } + SCASE("html") { + htmlBeforeUsage(argv[0]); + usage(argv[0]); + htmlAfterUsage(argv[0]); + exit(EXIT_SUCCESS); + break; + } + SDEFAULT { + fprintf(stderr, "Not Supported Options: :%s\n", argv[i]); + usage(argv[0]); + exit(EXIT_FAILURE); + break; + } + SSWITCHEND; + } + } +} diff --git a/src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/src/init.c b/src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/src/init.c new file mode 100755 index 0000000000..6e073cf43e --- /dev/null +++ b/src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/src/init.c @@ -0,0 +1,99 @@ +#include +#include +#include +#include +#include "../inc/config.h" +#include "genUtil.h" +#include "eosString.h" +#include "File.h" +#include "Memory.h" + + +void +init0(mrcImageSeriesInfoPerPixelInfo* info) +{ + info->fptIn = NULL; info->flagIn = 0; + info->fptOut = NULL; info->flagOut = 0; + info->X = 0.0; info->flagX = 0; + info->Y = 0.0; info->flagY = 0; + info->fptconfigFile = NULL; info->flagconfigFile = 0; + info->mode = 0; info->flagmode = 0; +} + +void +init1(mrcImageSeriesInfoPerPixelInfo* info) +{ + char s[1024]; + int i; + if(!info->flagIn) { + stringGetFromFile(s, "In", stdin, stdout, 0); + info->In = stringGetNthWord(s, 1, " ,\t"); + info->flagIn++; + } + if(info->flagIn) { + info->fptIn = fileOpen(info->In, "r"); + } + + if(!info->flagOut) { + stringGetFromFile(s, "Out", stdin, stdout, 0); + info->Out = stringGetNthWord(s, 1, " ,\t"); + info->flagOut++; + } + if(info->flagOut) { + info->fptOut = fileOpen(info->Out, "w"); + } + + if(info->flagX) { + } + + if(info->flagY) { + } + + if(info->flagconfigFile) { + info->fptconfigFile = fileOpen(info->configFile, "r"); + } + + if(info->flagmode) { + } + +} +#ifdef KHOROS +#include +#include "bootstrap.h" +#include "dataserv.h" +#include "datamanip.h" +extern void func_usage_additions(void); +extern void func_free_args(kexit_status status, kaddr client_data); +extern void func_get_args(kform* pane); + +void +func_usage_additions(void) +{ +} +void +func_free_args(kexit_status status, kaddr client_data) +{ +} +void +func_get_args(kform* pane) +{ +} +void +khorosInit(int argc, char* argv[]) +{ + char* eospath; + char panepath[1024]; + FILE* fpt; + + eospath = getenv("EOS_HOME"); + sprintf(panepath, "%s/src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/src/mrcImageSeriesInfoPerPixel.pane", eospath); + khoros_initialize(argc, argv, "EOS"); + fpt = fopen(panepath, "r"); if(NULL!=fpt) { + fclose(fpt); + kclui_initialize(panepath, KGEN_NONE, "EOS", "mrcImageSeriesInfoPerPixel", + func_usage_additions, + func_get_args, + func_free_args); + } +} +#endif /* KHOROS */ diff --git a/src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/src/mrcImageSeriesInfoPerPixel.c b/src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/src/mrcImageSeriesInfoPerPixel.c new file mode 100755 index 0000000000..585e74c404 --- /dev/null +++ b/src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/src/mrcImageSeriesInfoPerPixel.c @@ -0,0 +1,89 @@ +/* +# mrcImageSeriesInfoPerPixel : $Revision$ +# $Date$ +# Created by $Author$ +# Usage : mrcImageSeriesInfoPerPixel +# Attention +# $Loccker$ +# $State$ +# +*/ +#include +#include +#include +#include +#define GLOBAL_DECLARATION +#include "../inc/config.h" + +#define DEBUG +#include "genUtil.h" +#include "Vector.h" +#include "mrcImage.h" + +typedef struct lmrcImageSeriesInfoPerPixelInfo { + float x; + float y; + floatVector p; +} lmrcImageSeriesInfoPerPixelInfo; + +typedef enum lmrcImageSeriesInfoPerPixelMode { + a=0, + b=1 +} lmrcImageSeriesInfoPerPixelMode; + +extern void lmrcImageiSeriesInfoPerPixelInfo(lmrcImageSeriesInfoPerPixelInfo* linfo, mrcImage* mrc, int mode); +extern void mrcImageSeriesInfoPerPixelInfoOut(FILE* fpt, lmrcImageSeriesInfoPerPixelInfo linfo, int mode); + +int +main(int argc, char* argv[]) +{ + mrcImage mrc; + mrcImageSeriesInfoPerPixelInfo info; + lmrcImageSeriesInfoPerPixelInfo linfo; + + init0(&info); + argCheck(&info, argc, argv); + init1(&info); + + DEBUGPRINT("Program Start\n"); + linfo.x = info.X; + linfo.y = info.Y; + + mrcFileRead(&mrc, info.In, "in main", 0); + + lmrcImageiSeriesInfoPerPixelInfo(&linfo, &mrc, info.mode); + + mrcImageSeriesInfoPerPixelInfoOut(info.fptOut, linfo, info.mode); + exit(EXIT_SUCCESS); +} + +void +additionalUsage() +{ + fprintf(stderr, "----- Additional Usage -----\n"); + +} + + +void +lmrcImageiSeriesInfoPerPixelInfo(lmrcImageSeriesInfoPerPixelInfo* linfo, mrcImage* mrc, int mode) +{ + int i; + double data; + + floatVectorInit(&linfo->p, mrc->HeaderN.z); + for(i=0; iHeaderN.z; i++) { + mrcPixelDataGet(mrc, linfo->x, linfo->y, i, &data, mrcPixelRePart, mrcPixelHowNearest); + linfo->p.data[i] = data; + } +} + +void +mrcImageSeriesInfoPerPixelInfoOut(FILE* fpt, lmrcImageSeriesInfoPerPixelInfo linfo, int mode) +{ + int i; + + for(i=0; i + +mrcImageSeriesInfoPerPixel + + +

mrcImageSeriesInfoPerPixel

+

Usage

+
+Usage: mrcImageSeriesInfoPerPixel
+Options:
+    [-i[nput]            In                  (NULL      ).as(inFile::mrcImage    ) ] :Essential :Input[mrcImageStack]
+    [-o[utput]           Out                 (NULL      ).as(outFile::ASCII      ) ] :Essential :Output
+    [-p[osition]         X                   (0.0       ).as(Real                ) 
+                         Y                   (0.0       ).as(Real                ) ] :Optional  :Position
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+----- Additional Usage -----
+
+ + diff --git a/src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/src/mrcImageSeriesInfoPerPixel.pane b/src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/src/mrcImageSeriesInfoPerPixel.pane new file mode 100755 index 0000000000..f3f6322da2 --- /dev/null +++ b/src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/src/mrcImageSeriesInfoPerPixel.pane @@ -0,0 +1,17 @@ +-F 4.3 1 0 52x1+0+0 +0+0 'Cantata' cantata + -M 1 1 52x1+0+0 +1+0 ' ' subform + -P 1 0 52x1+0+1 +0+0 ' ' mrcImageSeriesInfoPerPixel + -D 1 0 9x1+0+0 'Options' _gui_options + -H 1 6x1+0+0 'License' 'license' $BOOTSTRAP/repos/license/License license + -E + -R 1 0 1 5x1+35+0 'Run' 'execute operation' $EOS/bin/mrcImageSeriesInfoPerPixel + -H 1 5x1+41+0 'Help' 'help page' $EOS/src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/doc/mrcImageSeriesInfoPerPixel.doc help + -Q 1 0 5.25x1+47+0 'Close' + -I 1 0 1 1 0 1 -1x1+1+1.500000 ' ' 'In' 'Input[mrcImageStack]' i + -O 1 0 1 1 0 1 -1x1+1+3.000000 ' ' 'Out' 'Output' o + -I 1 0 0 1 0 1 -1x1+1+4 ' ' '0.0' 'X' Position + -I 1 0 1 0 0 1 -1x1+1+6.000000 ' ' 'configFile' 'ConfigurationFile' c + -i 1 0 1 0 0 -1x1+1+7.500000 0 0 0 0 0 'mode' 'Mode' m + -E + -E +-E diff --git a/src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/src/usage.c b/src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/src/usage.c new file mode 100755 index 0000000000..ca02c16b8d --- /dev/null +++ b/src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/src/usage.c @@ -0,0 +1,37 @@ +#include +#include +#include "../inc/config.h" + +void +usage(char* thisProgram) +{ + fprintf(stderr, "Usage: %s\n", thisProgram); + fprintf(stderr, "Options:\n"); + fprintf(stderr, " [-i[nput] In (NULL ).as(inFile::mrcImage ) ] :Essential :Input[mrcImageStack]\n"); + fprintf(stderr, " [-o[utput] Out (NULL ).as(outFile::ASCII ) ] :Essential :Output\n"); + fprintf(stderr, " [-p[osition] X (0.0 ).as(Real ) \n Y (0.0 ).as(Real ) ] :Optional :Position\n"); + fprintf(stderr, " [-c[onfig] configFile (NULL ).as(inFile ) ] :Optional :ConfigurationFile\n"); + fprintf(stderr, " [-m[ode] mode (0 ).as(Integer ) ] :Optional :Mode\n"); + additionalUsage(); +} + +void +htmlBeforeUsage(char* thisProgram) +{ + fprintf(stderr, "\n"); + fprintf(stderr, "\n"); + fprintf(stderr, "%s\n", thisProgram); + fprintf(stderr, "\n"); + fprintf(stderr, "\n"); + fprintf(stderr, "

%s

\n", thisProgram); + fprintf(stderr, "

Usage

\n"); + fprintf(stderr, "
\n");
+}
+
+void
+htmlAfterUsage(char* thisProgram)
+{
+    fprintf(stderr, "
\n"); + fprintf(stderr, "\n"); + fprintf(stderr, "\n"); +} diff --git a/src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/src/util.c b/src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/src/util.c new file mode 100755 index 0000000000..ee5e5f2324 --- /dev/null +++ b/src/Tools/timeSeries/mrcImageSeriesInfoPerPixel/src/util.c @@ -0,0 +1,4 @@ +#include +#include +#include "../inc/config.h" + -- 2.11.0