From: 安永卓生 Date: Fri, 1 Jun 2018 05:39:44 +0000 (+0900) Subject: New command: mrc2ascii X-Git-Tag: v2.3.65p0294~12 X-Git-Url: http://git.sourceforge.jp/view?p=eos%2Fbase.git;a=commitdiff_plain;h=e4ee9b8762b1ca0a0bdd5d3603ae6f66ef5cb423 New command: mrc2ascii Modified: mrcImageModeChange Committer: 安永卓生 On branch master Your branch is up-to-date with 'origin/master'. Changes to be committed: new file: bin/mrc2ascii modified: include/mrcImage.h modified: src/Objects/DataManip/mrcImage/inc/mrcImage.h modified: src/Objects/DataManip/mrcImage/src/lmrcImage3DPad.c modified: src/Objects/DataManip/mrcImage/src/mrcImageGet.c modified: src/Tools/.Source modified: src/Tools/.Source.org modified: src/Tools/Config/Define.inc modified: src/Tools/filter/.Source new file: src/Tools/filter/mrc2ascii/Config/Define.inc new file: src/Tools/filter/mrc2ascii/Config/OptionControlFile new file: src/Tools/filter/mrc2ascii/Config/Target.inc new file: src/Tools/filter/mrc2ascii/Makefile new file: src/Tools/filter/mrc2ascii/doc/Makefile new file: src/Tools/filter/mrc2ascii/inc/config.h new file: src/Tools/filter/mrc2ascii/inc/mrc2ascii.h new file: src/Tools/filter/mrc2ascii/src/.Depend new file: src/Tools/filter/mrc2ascii/src/.Source new file: src/Tools/filter/mrc2ascii/src/Makefile new file: src/Tools/filter/mrc2ascii/src/X86MAC64 new file: src/Tools/filter/mrc2ascii/src/argCheck.c new file: src/Tools/filter/mrc2ascii/src/init.c new file: src/Tools/filter/mrc2ascii/src/mrc2ascii.c new file: src/Tools/filter/mrc2ascii/src/mrc2ascii.html new file: src/Tools/filter/mrc2ascii/src/mrc2ascii.pane new file: src/Tools/filter/mrc2ascii/src/usage.c new file: src/Tools/filter/mrc2ascii/src/util.c modified: src/Tools/mrcImage/mrcImage3DPad/src/mrcImage3DPad.c modified: src/Tools/mrcImage/mrcImageModeChange/Config/OptionControlFile modified: src/Tools/mrcImage/mrcImageModeChange/inc/mrcImageModeChange.h modified: src/Tools/mrcImage/mrcImageModeChange/src/argCheck.c modified: src/Tools/mrcImage/mrcImageModeChange/src/init.c modified: src/Tools/mrcImage/mrcImageModeChange/src/mrcImageModeChange.c modified: src/Tools/mrcImage/mrcImageModeChange/src/mrcImageModeChange.html modified: src/Tools/mrcImage/mrcImageModeChange/src/mrcImageModeChange.pane modified: src/Tools/mrcImage/mrcImageModeChange/src/usage.c --- diff --git a/bin/mrc2ascii b/bin/mrc2ascii new file mode 120000 index 0000000000..eddb95508d --- /dev/null +++ b/bin/mrc2ascii @@ -0,0 +1 @@ +../sbin/MachineIndependent \ No newline at end of file diff --git a/include/mrcImage.h b/include/mrcImage.h index 79545aac38..dc110c55c7 100644 --- a/include/mrcImage.h +++ b/include/mrcImage.h @@ -388,6 +388,9 @@ typedef struct mrcImage { mrcImageParaTypeInteger flagCCP4; mrcImageParaTypeInteger ImageOffset; mrcImageSymmetryOperator* SymmetryOperator; + + /* flag signed char/short */ + int flagSigned; } mrcImage; typedef struct mrcImageInformation { diff --git a/src/Objects/DataManip/mrcImage/inc/mrcImage.h b/src/Objects/DataManip/mrcImage/inc/mrcImage.h index 79545aac38..dc110c55c7 100755 --- a/src/Objects/DataManip/mrcImage/inc/mrcImage.h +++ b/src/Objects/DataManip/mrcImage/inc/mrcImage.h @@ -388,6 +388,9 @@ typedef struct mrcImage { mrcImageParaTypeInteger flagCCP4; mrcImageParaTypeInteger ImageOffset; mrcImageSymmetryOperator* SymmetryOperator; + + /* flag signed char/short */ + int flagSigned; } mrcImage; typedef struct mrcImageInformation { diff --git a/src/Objects/DataManip/mrcImage/src/lmrcImage3DPad.c b/src/Objects/DataManip/mrcImage/src/lmrcImage3DPad.c index f242bd8955..788844c25b 100644 --- a/src/Objects/DataManip/mrcImage/src/lmrcImage3DPad.c +++ b/src/Objects/DataManip/mrcImage/src/lmrcImage3DPad.c @@ -519,9 +519,9 @@ lmrcImage3DPadRectangle(mrcImage* out, mrcImage* in, lmrcImage3DPadInfo linfo, i cx=(in->HeaderN.x-1)*0.5; cy=(in->HeaderN.y-1)*0.5; cz=(in->HeaderN.z-1)*0.5; - sx=(out->HeaderN.x-in->HeaderN.x)*0.5; + sx=(out->HeaderN.x-in->HeaderN.x)*0.5; // sy=(out->HeaderN.y-in->HeaderN.y)*0.5; - sz=(out->HeaderN.z-in->HeaderN.z)*0.5; + sz=(out->HeaderN.z-in->HeaderN.z)*0.5; r2=SQR(linfo.rmax); ww = linfo.w*2; rmax = linfo.rmax+linfo.w; @@ -561,11 +561,14 @@ lmrcImage3DPadRectangle(mrcImage* out, mrcImage* in, lmrcImage3DPadInfo linfo, i } } for (z=0;zHeaderN.z;z++){ - wz = fabs(z-cz)*2.0; + wz = fabs(z-cz)*2.0; // c[x|y|z]: centre of in + dstz = z + sz; for (y=0;yHeaderN.y;y++){ wy = fabs(y-cy)*2.0; + dsty = y + sy; for (x=0;xHeaderN.x;x++){ wx = fabs(x-cx)*2.0; + dstx = x + sx; mrcPixelDataGet(in, x, y, z, &data, mrcPixelRePart, mrcPixelHowNearest); if (linfo.flagr) { @@ -574,8 +577,12 @@ lmrcImage3DPadRectangle(mrcImage* out, mrcImage* in, lmrcImage3DPadInfo linfo, i ||(wzHeaderN.x-0.5 + && -0.5<=dsty && dstyHeaderN.y-0.5 + && -0.5<=dstz && dstzHeaderN.z-0.5 ) { + mrcPixelDataSet(out, dstx, dsty, dstz, data-offset, mrcPixelRePart); + } } } } diff --git a/src/Objects/DataManip/mrcImage/src/mrcImageGet.c b/src/Objects/DataManip/mrcImage/src/mrcImageGet.c index ee8a27570d..60e71b30a6 100755 --- a/src/Objects/DataManip/mrcImage/src/mrcImageGet.c +++ b/src/Objects/DataManip/mrcImage/src/mrcImageGet.c @@ -186,12 +186,20 @@ mrcPixelDataGet(mrcImage* mrc, case mrcPixelRePart: { switch(mrc->HeaderMode) { case mrcCharImage: { - *data = (double)mrc->ImageCharImage[n]; + if(mrc->flagSigned) { + *data = (double)(signed char)mrc->ImageCharImage[n]; + } else { + *data = (double)mrc->ImageCharImage[n]; + } break; } case mrcShortImage: case mrcUShortImage: { - *data = (double)mrc->ImageShortImage[n]; + if(mrc->flagSigned) { + *data = (double)(signed short)mrc->ImageShortImage[n]; + } else { + *data = (double)mrc->ImageShortImage[n]; + } break; } case mrcFloatImage: { diff --git a/src/Tools/.Source b/src/Tools/.Source index d6983a6f16..9d406dcad5 100644 --- a/src/Tools/.Source +++ b/src/Tools/.Source @@ -11,6 +11,7 @@ database \ eosBayes \ eosPoint \ filter \ +fiter \ hf2000 \ khorosTool \ largeIP \ diff --git a/src/Tools/.Source.org b/src/Tools/.Source.org index a57f74e8fb..d6983a6f16 100644 --- a/src/Tools/.Source.org +++ b/src/Tools/.Source.org @@ -25,6 +25,7 @@ psUtil \ random \ rec3d \ simulation \ +timeSeries \ transform \ utils \ vectorImage \ diff --git a/src/Tools/Config/Define.inc b/src/Tools/Config/Define.inc index 4799b90143..f8b0da97d9 100755 --- a/src/Tools/Config/Define.inc +++ b/src/Tools/Config/Define.inc @@ -1660,3 +1660,7 @@ WORLDNAME=Tools WORLDNAME=Tools WORLDNAME=Tools WORLDNAME=Tools +WORLDNAME=Tools +WORLDNAME=Tools +WORLDNAME=Tools +WORLDNAME=Tools diff --git a/src/Tools/filter/.Source b/src/Tools/filter/.Source index d27a56c16a..96b2567766 100644 --- a/src/Tools/filter/.Source +++ b/src/Tools/filter/.Source @@ -9,6 +9,7 @@ emData2mrc \ imodst2mrc \ ip2mrc \ moi2mrc \ +mrc2ascii \ mrc2bild \ mrc2fld \ mrc2gif \ diff --git a/src/Tools/filter/mrc2ascii/Config/Define.inc b/src/Tools/filter/mrc2ascii/Config/Define.inc new file mode 100755 index 0000000000..8b0e585244 --- /dev/null +++ b/src/Tools/filter/mrc2ascii/Config/Define.inc @@ -0,0 +1,4 @@ +OBJECTNAME = mrc2ascii +EXTRA_LIB = +EXTRA_CCOPTS = +EXTRA_INC = diff --git a/src/Tools/filter/mrc2ascii/Config/OptionControlFile b/src/Tools/filter/mrc2ascii/Config/OptionControlFile new file mode 100755 index 0000000000..013ab0256b --- /dev/null +++ b/src/Tools/filter/mrc2ascii/Config/OptionControlFile @@ -0,0 +1,6 @@ +# OptionControlFile +# FileFormat +"-i","-i[nput]","InputDataFile","Essential","1","1","In","inFile","NULL" +"-o","-o[utput]","OutputDataFile","Essential","1","1","Out","outFile","stdout" +"-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/filter/mrc2ascii/Config/Target.inc b/src/Tools/filter/mrc2ascii/Config/Target.inc new file mode 100755 index 0000000000..e69de29bb2 diff --git a/src/Tools/filter/mrc2ascii/Makefile b/src/Tools/filter/mrc2ascii/Makefile new file mode 100755 index 0000000000..6c4a33690a --- /dev/null +++ b/src/Tools/filter/mrc2ascii/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/filter/mrc2ascii/doc/Makefile b/src/Tools/filter/mrc2ascii/doc/Makefile new file mode 100755 index 0000000000..8215199e1b --- /dev/null +++ b/src/Tools/filter/mrc2ascii/doc/Makefile @@ -0,0 +1,2 @@ +install: + cd ../src; make install-doc; cd ../doc diff --git a/src/Tools/filter/mrc2ascii/inc/config.h b/src/Tools/filter/mrc2ascii/inc/config.h new file mode 100755 index 0000000000..4b48b9b5c9 --- /dev/null +++ b/src/Tools/filter/mrc2ascii/inc/config.h @@ -0,0 +1,6 @@ +#ifndef CONFIG_H +#define CONFIG_H + +#include "../inc/mrc2ascii.h" + +#endif /* CONFIG_H */ diff --git a/src/Tools/filter/mrc2ascii/inc/mrc2ascii.h b/src/Tools/filter/mrc2ascii/inc/mrc2ascii.h new file mode 100755 index 0000000000..22d1646dc6 --- /dev/null +++ b/src/Tools/filter/mrc2ascii/inc/mrc2ascii.h @@ -0,0 +1,46 @@ +#ifndef MRC2ASCII_H +#define MRC2ASCII_H +#include +#include + +#define OPTION_FLAG '-' +#define OPTION_FLAG_POS (0) +#define OPTION_POS (1) + + + + +typedef struct mrc2asciiInfo { + long flagRedirect; + + long flagIn; + char* In; + FILE* fptIn; + + long flagOut; + char* Out; + FILE* fptOut; + + long flagconfigFile; + char* configFile; + FILE* fptconfigFile; + + long flagmode; + long mode; + +} mrc2asciiInfo; +#ifdef __cplusplus +extern "C" { +#endif +extern void argCheck(mrc2asciiInfo* info, int argc, char* avgv[]); +extern void khorosInit(int argc, char* avgv[]); +extern void init0(mrc2asciiInfo* info); +extern void init1(mrc2asciiInfo* info); +extern void usage(char* usage); +extern void additionalUsage(void); +extern void htmlBeforeUsage(char* usage); +extern void htmlAfterUsage(char* usage); +#ifdef __cplusplus +}; +#endif +#endif /* MRC2ASCII_H */ diff --git a/src/Tools/filter/mrc2ascii/src/.Depend b/src/Tools/filter/mrc2ascii/src/.Depend new file mode 100755 index 0000000000..e69de29bb2 diff --git a/src/Tools/filter/mrc2ascii/src/.Source b/src/Tools/filter/mrc2ascii/src/.Source new file mode 100755 index 0000000000..e69de29bb2 diff --git a/src/Tools/filter/mrc2ascii/src/Makefile b/src/Tools/filter/mrc2ascii/src/Makefile new file mode 100755 index 0000000000..a360703891 --- /dev/null +++ b/src/Tools/filter/mrc2ascii/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/filter/mrc2ascii/src/X86MAC64 b/src/Tools/filter/mrc2ascii/src/X86MAC64 new file mode 120000 index 0000000000..50e0758602 --- /dev/null +++ b/src/Tools/filter/mrc2ascii/src/X86MAC64 @@ -0,0 +1 @@ +../../../../../hostdepend/X86MAC64/src/Tools/filter/mrc2ascii/src/X86MAC64 \ No newline at end of file diff --git a/src/Tools/filter/mrc2ascii/src/argCheck.c b/src/Tools/filter/mrc2ascii/src/argCheck.c new file mode 100755 index 0000000000..2c326df717 --- /dev/null +++ b/src/Tools/filter/mrc2ascii/src/argCheck.c @@ -0,0 +1,96 @@ +#include +#include +#include +#include +#include "../inc/config.h" +#include "genUtil.h" +#include "eosString.h" +#include "File.h" +#include "Memory.h" + + +void +argCheck(mrc2asciiInfo* 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("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/filter/mrc2ascii/src/init.c b/src/Tools/filter/mrc2ascii/src/init.c new file mode 100755 index 0000000000..e32ce3bb6a --- /dev/null +++ b/src/Tools/filter/mrc2ascii/src/init.c @@ -0,0 +1,91 @@ +#include +#include +#include +#include +#include "../inc/config.h" +#include "genUtil.h" +#include "eosString.h" +#include "File.h" +#include "Memory.h" + + +void +init0(mrc2asciiInfo* info) +{ + info->fptIn = NULL; info->flagIn = 0; + info->fptOut = stdout; info->flagOut = 0; + info->fptconfigFile = NULL; info->flagconfigFile = 0; + info->mode = 0; info->flagmode = 0; +} + +void +init1(mrc2asciiInfo* 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->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/filter/mrc2ascii/src/mrc2ascii.pane", eospath); + khoros_initialize(argc, argv, "EOS"); + fpt = fopen(panepath, "r"); if(NULL!=fpt) { + fclose(fpt); + kclui_initialize(panepath, KGEN_NONE, "EOS", "mrc2ascii", + func_usage_additions, + func_get_args, + func_free_args); + } +} +#endif /* KHOROS */ diff --git a/src/Tools/filter/mrc2ascii/src/mrc2ascii.c b/src/Tools/filter/mrc2ascii/src/mrc2ascii.c new file mode 100755 index 0000000000..596e8f9b7d --- /dev/null +++ b/src/Tools/filter/mrc2ascii/src/mrc2ascii.c @@ -0,0 +1,116 @@ +/* +# mrc2ascii : $Revision$ +# $Date$ +# Created by $Author$ +# Usage : mrc2ascii +# Attention +# $Loccker$ +# $State$ +# +*/ +#include +#include +#include +#include +#define GLOBAL_DECLARATION +#include "../inc/config.h" + +#define DEBUG +#include "genUtil.h" +#include "mrcImage.h" + +/* +Example: +typedef struct lmrc2asciiInfo { + float a; + int b; +} lmrc2asciiInfo; + +typedef enum lmrc2asciiMode { + a=0, + b=1 +} lmrc2asciiMode; +*/ + +extern void lmrc2ascii(FILE* fpt, mrcImage* in, int mode); +int +main(int argc, char* argv[]) +{ + mrcImage in; + mrc2asciiInfo info; + + init0(&info); + argCheck(&info, argc, argv); + init1(&info); + + DEBUGPRINT("Program Start\n"); + mrcFileRead(&in, info.In, "in main", 0); + + lmrc2ascii(info.fptOut, &in, info.mode); + + exit(EXIT_SUCCESS); +} + +void +additionalUsage() +{ + fprintf(stderr, "----- Additional Usage -----\n"); + fprintf(stderr, "-m \n"); + fprintf(stderr, " 0: A\n"); + fprintf(stderr, " 1: nm\n"); + fprintf(stderr, " +16: Length is Sampling x N\n"); + fprintf(stderr, " +32: Use start\n"); + fprintf(stderr, " +64: Integer\n"); +} + + +void +lmrc2ascii(FILE* fpt, mrcImage* in, int mode) +{ + float x, y, z; + int ix, iy, iz; + float offsetx, offsety, offsetz; + float lx, ly, lz; + double data; + + if(mode&0x10) { + lx = in->HeaderLength.x/in->HeaderN.x; + ly = in->HeaderLength.y/in->HeaderN.y; + lz = in->HeaderLength.z/in->HeaderN.z; + } else { + lx = in->HeaderLength.x; + ly = in->HeaderLength.y; + lz = in->HeaderLength.z; + } + if(mode&0x1) { + lx /=10; + ly /=10; + lz /=10; + } + if(mode&0x20) { + offsetx = in->HeaderStartN.x*lx; + offsety = in->HeaderStartN.y*ly; + offsetz = in->HeaderStartN.z*lz; + } else { + offsetx = 0; + offsety = 0; + offsetz = 0; + } + + for(iz=0; izHeaderN.z; iz++) { + z = iz*lz + offsetz; + for(iy=0; iyHeaderN.y; iy++) { + y = iy*ly + offsety; + for(ix=0; ixHeaderN.x; ix++) { + x = ix*lx + offsetx; + mrcPixelDataGet(in, ix, iy, iz, &data, mrcPixelRePart, mrcPixelHowNearest); + if(0x40&mode) { + fprintf(fpt, "%10d %10d %10d %10d\n", (int)x, (int)y, (int)z, (int)data); + } else { + fprintf(fpt, "%15.6f %15.6f %15.6f %15.6f\n", x, y, z, data); + } + } + } + } + +} diff --git a/src/Tools/filter/mrc2ascii/src/mrc2ascii.html b/src/Tools/filter/mrc2ascii/src/mrc2ascii.html new file mode 100644 index 0000000000..26829ca1e4 --- /dev/null +++ b/src/Tools/filter/mrc2ascii/src/mrc2ascii.html @@ -0,0 +1,24 @@ + + +mrc2ascii + + +

mrc2ascii

+

Usage

+
+Usage: mrc2ascii
+Options:
+    [-i[nput]            In                  (NULL      ).as(inFile              ) ] :Essential :InputDataFile
+    [-o[utput]           Out                 (stdout    ).as(outFile             ) ] :Essential :OutputDataFile
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+----- Additional Usage -----
+-m 
+ 0: A
+ 1: nm
+ +16: Length is Sampling x N
+ +32: Use start
+ +64: Integer
+
+ + diff --git a/src/Tools/filter/mrc2ascii/src/mrc2ascii.pane b/src/Tools/filter/mrc2ascii/src/mrc2ascii.pane new file mode 100755 index 0000000000..496e430bd1 --- /dev/null +++ b/src/Tools/filter/mrc2ascii/src/mrc2ascii.pane @@ -0,0 +1,16 @@ +-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 ' ' mrc2ascii + -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/mrc2ascii + -H 1 5x1+41+0 'Help' 'help page' $EOS/src/Tools/filter/mrc2ascii/doc/mrc2ascii.doc help + -Q 1 0 5.25x1+47+0 'Close' + -I 1 0 1 1 0 1 -1x1+1+1.500000 ' ' 'In' 'InputDataFile' i + -O 1 0 1 1 0 1 -1x1+1+3.000000 ' ' 'Out' 'OutputDataFile' o + -I 1 0 1 0 0 1 -1x1+1+4.500000 ' ' 'configFile' 'ConfigurationFile' c + -i 1 0 1 0 0 -1x1+1+6.000000 0 0 0 0 0 'mode' 'Mode' m + -E + -E +-E diff --git a/src/Tools/filter/mrc2ascii/src/usage.c b/src/Tools/filter/mrc2ascii/src/usage.c new file mode 100755 index 0000000000..203a91c93a --- /dev/null +++ b/src/Tools/filter/mrc2ascii/src/usage.c @@ -0,0 +1,36 @@ +#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 ) ] :Essential :InputDataFile\n"); + fprintf(stderr, " [-o[utput] Out (stdout ).as(outFile ) ] :Essential :OutputDataFile\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/filter/mrc2ascii/src/util.c b/src/Tools/filter/mrc2ascii/src/util.c new file mode 100755 index 0000000000..ee5e5f2324 --- /dev/null +++ b/src/Tools/filter/mrc2ascii/src/util.c @@ -0,0 +1,4 @@ +#include +#include +#include "../inc/config.h" + diff --git a/src/Tools/mrcImage/mrcImage3DPad/src/mrcImage3DPad.c b/src/Tools/mrcImage/mrcImage3DPad/src/mrcImage3DPad.c index f79c5cdec4..c319d67d50 100755 --- a/src/Tools/mrcImage/mrcImage3DPad/src/mrcImage3DPad.c +++ b/src/Tools/mrcImage/mrcImage3DPad/src/mrcImage3DPad.c @@ -63,14 +63,6 @@ main(int argc, char* argv[]) linfo.flagFloating = info.Floating; DEBUGPRINT3("N: %d %d %d\n", linfo.Nx, linfo.Ny, linfo.Nz); - /* - if (!info.mode2){ - lmrcImage3DPadfilament(&out, &in, linfo, info.mode); - } else { - lmrcImage3DPad(&out, &in, linfo, info.mode); - } - */ - linfo.ShapeMode = info.mode2; lmrcImage3DPad(&out, &in, linfo, info.mode); mrcFileWrite(&out ,info.Out ,"in main" ,0); return EXIT_SUCCESS; diff --git a/src/Tools/mrcImage/mrcImageModeChange/Config/OptionControlFile b/src/Tools/mrcImage/mrcImageModeChange/Config/OptionControlFile index ef4a2bd6fa..6ed1b1d4b0 100755 --- a/src/Tools/mrcImage/mrcImageModeChange/Config/OptionControlFile +++ b/src/Tools/mrcImage/mrcImageModeChange/Config/OptionControlFile @@ -5,5 +5,6 @@ "-Min","-Min","Min","Optional","1","1","Min","Real","0.0" "-Max","-Max","Max","Optional","1","1","Max","Real","1.0" "-flagStat","-flagStat","StatCheck before mode change ","Optional","0" +"-flagSigned","-flagSigned","in: signed char","Optional","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/mrcImage/mrcImageModeChange/inc/mrcImageModeChange.h b/src/Tools/mrcImage/mrcImageModeChange/inc/mrcImageModeChange.h index e101119721..a34d3a6c8b 100755 --- a/src/Tools/mrcImage/mrcImageModeChange/inc/mrcImageModeChange.h +++ b/src/Tools/mrcImage/mrcImageModeChange/inc/mrcImageModeChange.h @@ -29,6 +29,8 @@ typedef struct mrcImageModeChangeInfo { long flagStat; + long flagSigned; + long flagconfigFile; char* configFile; FILE* fptconfigFile; diff --git a/src/Tools/mrcImage/mrcImageModeChange/src/argCheck.c b/src/Tools/mrcImage/mrcImageModeChange/src/argCheck.c index b93047bfbb..e4a7053739 100755 --- a/src/Tools/mrcImage/mrcImageModeChange/src/argCheck.c +++ b/src/Tools/mrcImage/mrcImageModeChange/src/argCheck.c @@ -81,6 +81,15 @@ argCheck(mrcImageModeChangeInfo* info, int argc, char* argv[]) } SBREAK; } + SCASE("flagSigned") { + if(i+0flagSigned++; + } else { + usage(argv[0]); + exit(EXIT_FAILURE); + } + SBREAK; + } SCASE("c") { if(i+1configFile = stringGetNthWord(argv[i+1], 1, " ,"); diff --git a/src/Tools/mrcImage/mrcImageModeChange/src/init.c b/src/Tools/mrcImage/mrcImageModeChange/src/init.c index e5f87e32b6..2f86b7622e 100755 --- a/src/Tools/mrcImage/mrcImageModeChange/src/init.c +++ b/src/Tools/mrcImage/mrcImageModeChange/src/init.c @@ -17,6 +17,7 @@ init0(mrcImageModeChangeInfo* info) info->Min = 0.0; info->flagMin = 0; info->Max = 1.0; info->flagMax = 0; info->flagStat=0; + info->flagSigned=0; info->fptconfigFile = NULL; info->flagconfigFile = 0; info->mode = 0; info->flagmode = 0; } diff --git a/src/Tools/mrcImage/mrcImageModeChange/src/mrcImageModeChange.c b/src/Tools/mrcImage/mrcImageModeChange/src/mrcImageModeChange.c index 548ea62ab0..1dedb8d057 100755 --- a/src/Tools/mrcImage/mrcImageModeChange/src/mrcImageModeChange.c +++ b/src/Tools/mrcImage/mrcImageModeChange/src/mrcImageModeChange.c @@ -49,7 +49,12 @@ main(int argc, char* argv[]) if(info.flagMax) { in.HeaderAMax = info.Max; } - + + if(info.flagSigned) { + in.flagSigned = 1; + } else { + in.flagSigned = 0; + } lmrcImageModeChange(&out, &in, info.mode); mrcFileWrite(&out, info.Out, "in main", 0); diff --git a/src/Tools/mrcImage/mrcImageModeChange/src/mrcImageModeChange.html b/src/Tools/mrcImage/mrcImageModeChange/src/mrcImageModeChange.html index 62471ca7e8..2271fa53c9 100755 --- a/src/Tools/mrcImage/mrcImageModeChange/src/mrcImageModeChange.html +++ b/src/Tools/mrcImage/mrcImageModeChange/src/mrcImageModeChange.html @@ -13,6 +13,7 @@ Options: [-Min Min (0.0 ).as(Real ) ] :Optional :Min [-Max Max (1.0 ).as(Real ) ] :Optional :Max [-flagStat ] :Optional :StatCheck before mode change + [-flagSigned ] :Optional :in: signed char [-c[onfig] configFile (NULL ).as(inFile ) ] :Optional :ConfigurationFile [-m[ode] mode (0 ).as(Integer ) ] :Optional :Mode diff --git a/src/Tools/mrcImage/mrcImageModeChange/src/mrcImageModeChange.pane b/src/Tools/mrcImage/mrcImageModeChange/src/mrcImageModeChange.pane index a982df8533..3cfa0b701a 100755 --- a/src/Tools/mrcImage/mrcImageModeChange/src/mrcImageModeChange.pane +++ b/src/Tools/mrcImage/mrcImageModeChange/src/mrcImageModeChange.pane @@ -12,8 +12,9 @@ -f 1 0 1 0 0 -1x1+1+4.500000 0 0 0.000000 0 0 0 'Min' 'Min' Min -f 1 0 1 0 0 -1x1+1+6.000000 0 0 1.000000 0 0 0 'Max' 'Max' Max -t 1 0 1 0 0 6x1+1+7 'flagStat' 'StatCheck before mode change ' flagStat - -I 1 0 1 0 0 1 -1x1+1+9.000000 ' ' 'configFile' 'ConfigurationFile' c - -i 1 0 1 0 0 -1x1+1+10.500000 0 0 0 0 0 'mode' 'Mode' m + -t 1 0 1 0 0 6x1+1+9 'flagSigned' 'in: signed char' flagSigned + -I 1 0 1 0 0 1 -1x1+1+10.500000 ' ' 'configFile' 'ConfigurationFile' c + -i 1 0 1 0 0 -1x1+1+12.000000 0 0 0 0 0 'mode' 'Mode' m -E -E -E diff --git a/src/Tools/mrcImage/mrcImageModeChange/src/usage.c b/src/Tools/mrcImage/mrcImageModeChange/src/usage.c index 6934201257..7fd26e7a7e 100755 --- a/src/Tools/mrcImage/mrcImageModeChange/src/usage.c +++ b/src/Tools/mrcImage/mrcImageModeChange/src/usage.c @@ -12,6 +12,7 @@ usage(char* thisProgram) fprintf(stderr, " [-Min Min (0.0 ).as(Real ) ] :Optional :Min\n"); fprintf(stderr, " [-Max Max (1.0 ).as(Real ) ] :Optional :Max\n"); fprintf(stderr, " [-flagStat ] :Optional :StatCheck before mode change \n"); + fprintf(stderr, " [-flagSigned ] :Optional :in: signed char\n"); fprintf(stderr, " [-c[onfig] configFile (NULL ).as(inFile ) ] :Optional :ConfigurationFile\n"); fprintf(stderr, " [-m[ode] mode (0 ).as(Integer ) ] :Optional :Mode\n"); additionalUsage();