Modified: bmp2mrc supported Y/R/G/B to mono of mrcImage, respecitively.

	modified:   src/Objects/DataManip/bmpFile/src/lbmp2mrc.c
	modified:   src/Tools/filter/bmp2mrc/src/bmp2mrc.c

diff --git a/hostdepend/X86MAC64/bin/X86MAC64/bmp2mrc b/hostdepend/X86MAC64/bin/X86MAC64/bmp2mrc
index a71e3bd..b57f64c 100755 (executable)
Binary files a/hostdepend/X86MAC64/bin/X86MAC64/bmp2mrc and b/hostdepend/X86MAC64/bin/X86MAC64/bmp2mrc differ

diff --git a/hostdepend/X86MAC64/lib/X86MAC64/libEosObjects.a b/hostdepend/X86MAC64/lib/X86MAC64/libEosObjects.a
index 5dd0544..807c928 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/libEosObjects.a and b/hostdepend/X86MAC64/lib/X86MAC64/libEosObjects.a differ

diff --git a/hostdepend/X86MAC64/lib/X86MAC64/libbmpFile.a b/hostdepend/X86MAC64/lib/X86MAC64/libbmpFile.a
index ed97c5e..a5e8285 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/libbmpFile.a and b/hostdepend/X86MAC64/lib/X86MAC64/libbmpFile.a differ

diff --git a/hostdepend/X86MAC64/lib/X86MAC64/shared/lbmp2mrc.sharedo b/hostdepend/X86MAC64/lib/X86MAC64/shared/lbmp2mrc.sharedo
index 0f6d0e0..8290181 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lbmp2mrc.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lbmp2mrc.sharedo differ

diff --git a/hostdepend/X86MAC64/src/Objects/DataManip/bmpFile/src/X86MAC64/lbmp2mrc.sharedo b/hostdepend/X86MAC64/src/Objects/DataManip/bmpFile/src/X86MAC64/lbmp2mrc.sharedo
index 0f6d0e0..8290181 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/bmpFile/src/X86MAC64/lbmp2mrc.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/bmpFile/src/X86MAC64/lbmp2mrc.sharedo differ

diff --git a/hostdepend/X86MAC64/src/Objects/DataManip/bmpFile/src/X86MAC64/libbmpFile.a b/hostdepend/X86MAC64/src/Objects/DataManip/bmpFile/src/X86MAC64/libbmpFile.a
index ed97c5e..a5e8285 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/bmpFile/src/X86MAC64/libbmpFile.a and b/hostdepend/X86MAC64/src/Objects/DataManip/bmpFile/src/X86MAC64/libbmpFile.a differ

diff --git a/hostdepend/X86MAC64/src/Objects/DataManip/bmpFile/src/X86MAC64/libbmpFile.debug.a b/hostdepend/X86MAC64/src/Objects/DataManip/bmpFile/src/X86MAC64/libbmpFile.debug.a
index 3831123..c7dc9f5 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/bmpFile/src/X86MAC64/libbmpFile.debug.a and b/hostdepend/X86MAC64/src/Objects/DataManip/bmpFile/src/X86MAC64/libbmpFile.debug.a differ

diff --git a/hostdepend/X86MAC64/src/Tools/filter/bmp2mrc/src/X86MAC64/.Depend b/hostdepend/X86MAC64/src/Tools/filter/bmp2mrc/src/X86MAC64/.Depend
index 5db89b4..baad39e 100644 (file)
--- a/hostdepend/X86MAC64/src/Tools/filter/bmp2mrc/src/X86MAC64/.Depend
+++ b/hostdepend/X86MAC64/src/Tools/filter/bmp2mrc/src/X86MAC64/.Depend
@@ -18,7 +18,7 @@ argCheck.o: argCheck.c /usr/include/stdio.h /usr/include/sys/cdefs.h \
   /usr/include/sys/_types/_pthread_attr_t.h \
   /usr/include/sys/_types/_sigset_t.h /usr/include/sys/_types/_uid_t.h \
   /usr/include/sys/resource.h \
-  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/5.1/include/stdint.h \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/6.0/include/stdint.h \
   /usr/include/stdint.h /usr/include/sys/_types/_int8_t.h \
   /usr/include/sys/_types/_int16_t.h /usr/include/sys/_types/_int32_t.h \
   /usr/include/sys/_types/_int64_t.h /usr/include/_types/_uint8_t.h \
@@ -36,7 +36,7 @@ argCheck.o: argCheck.c /usr/include/stdio.h /usr/include/sys/cdefs.h \
   /Users/tacyas/Eos/include/string.h /usr/include/math.h ../inc/config.h \
   ../inc/../inc/bmp2mrc.h /Users/tacyas/Eos/include/genUtil.h \
   /Users/tacyas/Eos/include/File.h /Users/tacyas/Eos/include/Memory.h \
-  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/5.1/include/limits.h \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/6.0/include/limits.h \
   /usr/include/limits.h /usr/include/machine/limits.h \
   /usr/include/i386/limits.h /usr/include/i386/_limits.h \
   /usr/include/sys/syslimits.h
@@ -60,7 +60,7 @@ bmp2mrc.o: bmp2mrc.c /usr/include/stdio.h /usr/include/sys/cdefs.h \
   /usr/include/sys/_types/_pthread_attr_t.h \
   /usr/include/sys/_types/_sigset_t.h /usr/include/sys/_types/_uid_t.h \
   /usr/include/sys/resource.h \
-  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/5.1/include/stdint.h \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/6.0/include/stdint.h \
   /usr/include/stdint.h /usr/include/sys/_types/_int8_t.h \
   /usr/include/sys/_types/_int16_t.h /usr/include/sys/_types/_int32_t.h \
   /usr/include/sys/_types/_int64_t.h /usr/include/_types/_uint8_t.h \
@@ -102,7 +102,7 @@ init.o: init.c /usr/include/stdio.h /usr/include/sys/cdefs.h \
   /usr/include/sys/_types/_pthread_attr_t.h \
   /usr/include/sys/_types/_sigset_t.h /usr/include/sys/_types/_uid_t.h \
   /usr/include/sys/resource.h \
-  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/5.1/include/stdint.h \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/6.0/include/stdint.h \
   /usr/include/stdint.h /usr/include/sys/_types/_int8_t.h \
   /usr/include/sys/_types/_int16_t.h /usr/include/sys/_types/_int32_t.h \
   /usr/include/sys/_types/_int64_t.h /usr/include/_types/_uint8_t.h \
@@ -120,7 +120,7 @@ init.o: init.c /usr/include/stdio.h /usr/include/sys/cdefs.h \
   /Users/tacyas/Eos/include/string.h /usr/include/math.h ../inc/config.h \
   ../inc/../inc/bmp2mrc.h /Users/tacyas/Eos/include/genUtil.h \
   /Users/tacyas/Eos/include/File.h /Users/tacyas/Eos/include/Memory.h \
-  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/5.1/include/limits.h \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/6.0/include/limits.h \
   /usr/include/limits.h /usr/include/machine/limits.h \
   /usr/include/i386/limits.h /usr/include/i386/_limits.h \
   /usr/include/sys/syslimits.h
@@ -144,7 +144,7 @@ usage.o: usage.c /usr/include/stdio.h /usr/include/sys/cdefs.h \
   /usr/include/sys/_types/_pthread_attr_t.h \
   /usr/include/sys/_types/_sigset_t.h /usr/include/sys/_types/_uid_t.h \
   /usr/include/sys/resource.h \
-  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/5.1/include/stdint.h \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/6.0/include/stdint.h \
   /usr/include/stdint.h /usr/include/sys/_types/_int8_t.h \
   /usr/include/sys/_types/_int16_t.h /usr/include/sys/_types/_int32_t.h \
   /usr/include/sys/_types/_int64_t.h /usr/include/_types/_uint8_t.h \
@@ -180,7 +180,7 @@ util.o: util.c /usr/include/stdio.h /usr/include/sys/cdefs.h \
   /usr/include/sys/_types/_pthread_attr_t.h \
   /usr/include/sys/_types/_sigset_t.h /usr/include/sys/_types/_uid_t.h \
   /usr/include/sys/resource.h \
-  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/5.1/include/stdint.h \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/6.0/include/stdint.h \
   /usr/include/stdint.h /usr/include/sys/_types/_int8_t.h \
   /usr/include/sys/_types/_int16_t.h /usr/include/sys/_types/_int32_t.h \
   /usr/include/sys/_types/_int64_t.h /usr/include/_types/_uint8_t.h \

diff --git a/hostdepend/X86MAC64/src/Tools/filter/bmp2mrc/src/X86MAC64/bmp2mrc b/hostdepend/X86MAC64/src/Tools/filter/bmp2mrc/src/X86MAC64/bmp2mrc
index a71e3bd..b57f64c 100755 (executable)
Binary files a/hostdepend/X86MAC64/src/Tools/filter/bmp2mrc/src/X86MAC64/bmp2mrc and b/hostdepend/X86MAC64/src/Tools/filter/bmp2mrc/src/X86MAC64/bmp2mrc differ

diff --git a/include/bmpFile.h b/include/bmpFile.h
index e73e0ea..e3ae0be 100644 (file)
--- a/include/bmpFile.h
+++ b/include/bmpFile.h
@@ -68,8 +68,16 @@ typedef struct bmpFile {
        int BytesPerImage;
 } bmpFile;
 
+typedef enum lbmp2mrcInfoMode {
+       lbmp2mrcInfoModeY=0,
+       lbmp2mrcInfoModeR=1,
+       lbmp2mrcInfoModeG=2,
+       lbmp2mrcInfoModeB=3
+} lbmp2mrcInfoMode;
+
 typedef struct lbmp2mrcInfo {
        mrcImageParaTypeRealCoord Length;       
+       lbmp2mrcInfoMode mode;
 } lbmp2mrcInfo;
 
 /* struct end */

diff --git a/src/Objects/DataManip/bmpFile/doc/bmpFile.html b/src/Objects/DataManip/bmpFile/doc/bmpFile.html
index d22cd79..3683d20 100644 (file)
--- a/src/Objects/DataManip/bmpFile/doc/bmpFile.html
+++ b/src/Objects/DataManip/bmpFile/doc/bmpFile.html
@@ -3,11 +3,6 @@
 <H2>Information from source codes</H2>
 </A>
 <PRE>
-../src/bmpFileInfo.c:
-
-../src/bmpFileRead.c:
-
-../src/lbmp2mrc.c:
 </PRE>
 <HR>
 <A NAME="include">
@@ -84,8 +79,16 @@ typedef struct bmpFile {
        int BytesPerImage;
 } bmpFile;
 
+typedef enum lbmp2mrcInfoMode {
+       lbmp2mrcInfoModeY=0,
+       lbmp2mrcInfoModeR=1,
+       lbmp2mrcInfoModeG=2,
+       lbmp2mrcInfoModeB=3
+} lbmp2mrcInfoMode;
+
 typedef struct lbmp2mrcInfo {
        mrcImageParaTypeRealCoord Length;       
+       lbmp2mrcInfoMode mode;
 } lbmp2mrcInfo;
 
 /* struct end */

diff --git a/src/Objects/DataManip/bmpFile/inc/bmpFile.h b/src/Objects/DataManip/bmpFile/inc/bmpFile.h
index e73e0ea..e3ae0be 100644 (file)
--- a/src/Objects/DataManip/bmpFile/inc/bmpFile.h
+++ b/src/Objects/DataManip/bmpFile/inc/bmpFile.h
@@ -68,8 +68,16 @@ typedef struct bmpFile {
        int BytesPerImage;
 } bmpFile;
 
+typedef enum lbmp2mrcInfoMode {
+       lbmp2mrcInfoModeY=0,
+       lbmp2mrcInfoModeR=1,
+       lbmp2mrcInfoModeG=2,
+       lbmp2mrcInfoModeB=3
+} lbmp2mrcInfoMode;
+
 typedef struct lbmp2mrcInfo {
        mrcImageParaTypeRealCoord Length;       
+       lbmp2mrcInfoMode mode;
 } lbmp2mrcInfo;
 
 /* struct end */

diff --git a/src/Objects/DataManip/bmpFile/src/lbmp2mrc.c b/src/Objects/DataManip/bmpFile/src/lbmp2mrc.c
index 194d8a2..2567ef9 100644 (file)
--- a/src/Objects/DataManip/bmpFile/src/lbmp2mrc.c
+++ b/src/Objects/DataManip/bmpFile/src/lbmp2mrc.c
@@ -50,7 +50,29 @@ lbmp2mrc(mrcImage* mrc, bmpFile* bmp, lbmp2mrcInfo linfo, int mode)
                        fprintf(stderr, "Not supported Mode: BytesPerPixel: %d BitsPerPixel: %d \n", bmp->BytesPerPixel, bmp->BitsPerPixel);
                        exit(EXIT_FAILURE);
                }
-               data = 0.299*r + 0.587*g + 0.114*b;     
+               switch(linfo.mode) {
+                       case lbmp2mrcInfoModeY: {
+                               data = 0.299*r + 0.587*g + 0.114*b; 
+                               break;
+                       }
+                       case lbmp2mrcInfoModeR: {
+                               data = r;
+                               break;
+                       }
+                       case lbmp2mrcInfoModeG: {
+                               data = g;
+                               break;
+                       }
+                       case lbmp2mrcInfoModeB: {
+                               data = b;
+                               break;
+                       }
+                       default: {
+                               fprintf(stderr, "Not supported mode: %d. Instead, use Y: %d\n", linfo.mode, lbmp2mrcInfoModeY);
+                               data = 0.299*r + 0.587*g + 0.114*b; 
+                               break;
+                       }
+               }
                if(0<bmp->Info.biWidth) {
                        mrcPixelDataSet(mrc, x, y, 0, data, mrcPixelRePart);
                } else {

diff --git a/src/Tools/Config/Define.inc b/src/Tools/Config/Define.inc
index e455da0..c60bfd1 100755 (executable)
--- a/src/Tools/Config/Define.inc
+++ b/src/Tools/Config/Define.inc
@@ -186,3 +186,5 @@ WORLDNAME=Tools
 WORLDNAME=Tools
 WORLDNAME=Tools
 WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools

diff --git a/src/Tools/filter/Makefile b/src/Tools/filter/Makefile
deleted file mode 100755 (executable)
index dfd525eab555f9091108b34834053d364b8bf0ad..0000000000000000000000000000000000000000
--- a/src/Tools/filter/Makefile
+++ /dev/null
@@ -1,107 +0,0 @@
-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
-
-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/filter/Makefile b/src/Tools/filter/Makefile
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..01f58fa4fda07b9019cef70af10c561dec5bb121
--- /dev/null
+++ b/src/Tools/filter/Makefile
@@ -0,0 +1 @@
+/Users/tacyas/Eos/src/Config/Template/ToolsClassTemplate.Dir/Makefile
\ No newline at end of file

diff --git a/src/Tools/filter/bmp2mrc/Config/OptionControlFile b/src/Tools/filter/bmp2mrc/Config/OptionControlFile
index 3737b77..06d27a5 100755 (executable)
--- a/src/Tools/filter/bmp2mrc/Config/OptionControlFile
+++ b/src/Tools/filter/bmp2mrc/Config/OptionControlFile
@@ -3,5 +3,6 @@
 "-i","-i[nput]","Input: bmpFile","Essential","1","1","In","inFile::bmpFile","NULL"
 "-o","-o[utput]","Output: mrcImage","Essential","1","1","Out","outFile::mrcImage","NULL"
 "-L","-L[ength]","Input: Length","Optional","2","1","LengthX","Real","1.0","1","LengthY","Real","1.0"
+"-M","-M[ode]","Input: Mode","Optional","1","1","Mode","Integer","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/filter/bmp2mrc/Makefile b/src/Tools/filter/bmp2mrc/Makefile
deleted file mode 100755 (executable)
index 4dbb018acae5475bce203b3db2365124accfa24b..0000000000000000000000000000000000000000
--- a/src/Tools/filter/bmp2mrc/Makefile
+++ /dev/null
@@ -1,104 +0,0 @@
-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
-
-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/bmp2mrc/Makefile b/src/Tools/filter/bmp2mrc/Makefile
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..ef1f6300ba0b84da4931ed574ccec31fc5b88177
--- /dev/null
+++ b/src/Tools/filter/bmp2mrc/Makefile
@@ -0,0 +1 @@
+/Users/tacyas/Eos/src/Config/Template/ToolsTemplate.Dir/Makefile
\ No newline at end of file

diff --git a/src/Tools/filter/bmp2mrc/inc/bmp2mrc.h b/src/Tools/filter/bmp2mrc/inc/bmp2mrc.h
index a047319..36acb9c 100755 (executable)
--- a/src/Tools/filter/bmp2mrc/inc/bmp2mrc.h
+++ b/src/Tools/filter/bmp2mrc/inc/bmp2mrc.h
@@ -27,6 +27,9 @@ typedef struct bmp2mrcInfo {
     long flagLengthY;
     float LengthY;
     
+    long flagMode;
+    long Mode;
+    
     long flagconfigFile;
     char* configFile;
     FILE* fptconfigFile;

diff --git a/src/Tools/filter/bmp2mrc/src/argCheck.c b/src/Tools/filter/bmp2mrc/src/argCheck.c
index 47ec819..df7e8b0 100755 (executable)
--- a/src/Tools/filter/bmp2mrc/src/argCheck.c
+++ b/src/Tools/filter/bmp2mrc/src/argCheck.c
@@ -64,6 +64,17 @@ argCheck(bmp2mrcInfo* info, int argc, char* argv[])
                     }
                     SBREAK;
                 }
+                SCASE("M") {
+                    if(i+1<argc) {
+                        info->Mode = stringGetNthIntegerData(argv[i+1], 1, " ,");
+                        i++;
+                        info->flagMode++;
+                    } else {
+                        usage(argv[0]);
+                        exit(EXIT_FAILURE);
+                    }
+                    SBREAK;
+                }
                 SCASE("c") {
                     if(i+1<argc) {
                         info->configFile = stringGetNthWord(argv[i+1], 1, " ,");

diff --git a/src/Tools/filter/bmp2mrc/src/bmp2mrc.c b/src/Tools/filter/bmp2mrc/src/bmp2mrc.c
index 63206f5..1538263 100755 (executable)
--- a/src/Tools/filter/bmp2mrc/src/bmp2mrc.c
+++ b/src/Tools/filter/bmp2mrc/src/bmp2mrc.c
@@ -49,12 +49,12 @@ main(int argc, char* argv[])
        linfo.Length.x = info.LengthX;
        linfo.Length.y = info.LengthY;
        linfo.Length.z = info.LengthX;
-
+       linfo.mode = info.Mode;
        bmpFileRead(&in, info.fptIn, 0);
        
        DEBUGPRINT("lbmp2mrc\n");
 
-       lbmp2mrc(&out, &in, linfo, 0);
+       lbmp2mrc(&out, &in, linfo, info.mode);
 
        DEBUGPRINT1("mrcFileWrite: %s\n", info.Out);
        mrcFileWrite(&out, info.Out, "in main", 0);

diff --git a/src/Tools/filter/bmp2mrc/src/bmp2mrc.html b/src/Tools/filter/bmp2mrc/src/bmp2mrc.html
index 6b45e52..e85d288 100755 (executable)
--- a/src/Tools/filter/bmp2mrc/src/bmp2mrc.html
+++ b/src/Tools/filter/bmp2mrc/src/bmp2mrc.html
@@ -1 +1,21 @@
-/bin/bash: bmp2mrc: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>bmp2mrc</TITLE>
+</HEAD>
+<BODY>
+<H1>bmp2mrc</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: bmp2mrc
+Options:
+    [-i[nput]            In                  (NULL      ).as(inFile::bmpFile     ) ] :Essential :Input: bmpFile
+    [-o[utput]           Out                 (NULL      ).as(outFile::mrcImage   ) ] :Essential :Output: mrcImage
+    [-L[ength]           LengthX             (1.0       ).as(Real                ) 
+                         LengthY             (1.0       ).as(Real                ) ] :Optional  :Input: Length
+    [-M[ode]             Mode                (0         ).as(Integer             ) ] :Optional  :Input: Mode
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+----- Additional Usage -----
+</PRE>
+</BODY>
+</HTML>

diff --git a/src/Tools/filter/bmp2mrc/src/bmp2mrc.pane b/src/Tools/filter/bmp2mrc/src/bmp2mrc.pane
index 3d7d94a..1be62dd 100755 (executable)
--- a/src/Tools/filter/bmp2mrc/src/bmp2mrc.pane
+++ b/src/Tools/filter/bmp2mrc/src/bmp2mrc.pane
@@ -10,8 +10,9 @@
         -I 1 0 1 1 0 1 -1x1+1+1.500000 ' ' 'In' 'Input: bmpFile' i
         -O 1 0 1 1 0 1 -1x1+1+3.000000 ' ' 'Out' 'Output: mrcImage' o
         -I  1 0 0 1 0 1 -1x1+1+4 ' ' '1.0' 'LengthX' Input: Length
-        -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
+        -i 1 0 1 0 0 -1x1+1+6.000000 0 0 0 0 0 'Mode' 'Input: Mode' M
+        -I 1 0 1 0 0 1 -1x1+1+7.500000 ' ' 'configFile' 'ConfigurationFile' c
+        -i 1 0 1 0 0 -1x1+1+9.000000 0 0 0 0 0 'mode' 'Mode' m
     -E
   -E
 -E

diff --git a/src/Tools/filter/bmp2mrc/src/init.c b/src/Tools/filter/bmp2mrc/src/init.c
index c7bd8ad..8b6bc21 100755 (executable)
--- a/src/Tools/filter/bmp2mrc/src/init.c
+++ b/src/Tools/filter/bmp2mrc/src/init.c
@@ -15,7 +15,8 @@ init0(bmp2mrcInfo* info)
     info->fptIn = NULL;    info->flagIn = 0;
     info->fptOut = NULL;    info->flagOut = 0;
     info->LengthX = 1.0;    info->flagLengthX = 0;
-    info->LengthX = 1.0;    info->flagLengthX = 0;
+    info->LengthY = 1.0;    info->flagLengthY = 0;
+    info->Mode = 0;    info->flagMode = 0;
     info->fptconfigFile = NULL;    info->flagconfigFile = 0;
     info->mode = 0;    info->flagmode = 0;
 }
@@ -49,6 +50,9 @@ init1(bmp2mrcInfo* info)
     if(info->flagLengthY) {
     }
     
+    if(info->flagMode) {
+    }
+    
     if(info->flagconfigFile) {
         info->fptconfigFile = fileOpen(info->configFile, "r");
     }

diff --git a/src/Tools/filter/bmp2mrc/src/usage.c b/src/Tools/filter/bmp2mrc/src/usage.c
index 4a37a78..742fe40 100755 (executable)
--- a/src/Tools/filter/bmp2mrc/src/usage.c
+++ b/src/Tools/filter/bmp2mrc/src/usage.c
@@ -10,6 +10,7 @@ usage(char* thisProgram)
     fprintf(stderr, "    [-i[nput]            In                  (NULL      ).as(inFile::bmpFile     ) ] :Essential :Input: bmpFile\n");
     fprintf(stderr, "    [-o[utput]           Out                 (NULL      ).as(outFile::mrcImage   ) ] :Essential :Output: mrcImage\n");
     fprintf(stderr, "    [-L[ength]           LengthX             (1.0       ).as(Real                ) \n                         LengthY             (1.0       ).as(Real                ) ] :Optional  :Input: Length\n");
+    fprintf(stderr, "    [-M[ode]             Mode                (0         ).as(Integer             ) ] :Optional  :Input: Mode\n");
     fprintf(stderr, "    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile\n");
     fprintf(stderr, "    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode\n");
     additionalUsage();