with '#' will be ignored, and an empty message aborts the commit.
On branch master
Changes to be committed:
modified: bin/wish/ctfDisplay/ctfDisplay.wish
modified: bin/wish/ctfDisplay/tclIndex
modified: include/bildFile.h
modified: src/Objects/DataExpress/Makefile
modified: src/Objects/DataExpress/TclTk/src/.Wish
modified: src/Objects/DataExpress/TclTk/src/CommandEntry.wish
new file: src/Objects/DataExpress/TclTk/src/defaultLoad.wish
new file: src/Objects/DataExpress/pngFile/Config/Define.inc
new file: src/Objects/DataExpress/pngFile/Config/Target.inc
new file: src/Objects/DataExpress/pngFile/Makefile
new file: src/Objects/DataExpress/pngFile/doc/.footer
new file: src/Objects/DataExpress/pngFile/doc/.header
new file: src/Objects/DataExpress/pngFile/doc/.pngFile.html
new file: src/Objects/DataExpress/pngFile/doc/Makefile
new file: src/Objects/DataExpress/pngFile/inc/Makefile
new file: src/Objects/DataExpress/pngFile/inc/pngFile.h
new file: src/Objects/DataExpress/pngFile/inc/pngFile.h.org
new file: src/Objects/DataExpress/pngFile/src/.CCHeader
new file: src/Objects/DataExpress/pngFile/src/.CHeader
new file: src/Objects/DataExpress/pngFile/src/.Ruby
new file: src/Objects/DataExpress/pngFile/src/.Wish
new file: src/Objects/DataExpress/pngFile/src/Makefile
new file: src/Objects/DataExpress/pngFile/src/X86MAC64
modified: src/Objects/DataManip/bildFile/doc/bildFile.html
modified: src/Objects/DataManip/bildFile/inc/bildFile.h
modified: src/Objects/DataManip/bildFile/src/lmrc2bild.c
modified: src/Objects/Makefile
modified: src/Objects/Makefile.org
modified: src/Tools/Config/Define.inc
modified: src/Tools/Integration/ctfDisplay/src/wish/ctfDisplay.wish
typechange: src/Tools/Makefile
modified: src/Tools/filter/.Source
modified: src/Tools/filter/mrc2bild/Config/OptionControlFile
modified: src/Tools/filter/mrc2bild/inc/mrc2bild.h
modified: src/Tools/filter/mrc2bild/src/argCheck.c
modified: src/Tools/filter/mrc2bild/src/init.c
modified: src/Tools/filter/mrc2bild/src/mrc2bild.c
modified: src/Tools/filter/mrc2bild/src/mrc2bild.html
modified: src/Tools/filter/mrc2bild/src/mrc2bild.pane
modified: src/Tools/filter/mrc2bild/src/test/Makefile
modified: src/Tools/filter/mrc2bild/src/usage.c
new file: src/Tools/filter/mrc2png/Config/Define.inc
new file: src/Tools/filter/mrc2png/Config/OptionControlFile
new file: src/Tools/filter/mrc2png/Config/Target.inc
new file: src/Tools/filter/mrc2png/Makefile
new file: src/Tools/filter/mrc2png/doc/Makefile
new file: src/Tools/filter/mrc2png/inc/config.h
new file: src/Tools/filter/mrc2png/inc/mrc2png.h
new file: src/Tools/filter/mrc2png/src/.Depend
new file: src/Tools/filter/mrc2png/src/.Source
new file: src/Tools/filter/mrc2png/src/Makefile
new file: src/Tools/filter/mrc2png/src/X86MAC64
new file: src/Tools/filter/mrc2png/src/argCheck.c
new file: src/Tools/filter/mrc2png/src/init.c
new file: src/Tools/filter/mrc2png/src/mrc2png.c
new file: src/Tools/filter/mrc2png/src/mrc2png.pane
new file: src/Tools/filter/mrc2png/src/usage.c
new file: src/Tools/filter/mrc2png/src/util.c
modified: src/Tools/mrcImage/mrcImageAreaCalc/Config/OptionControlFile
modified: src/Tools/mrcImage/mrcImageAreaCalc/src/mrcImageAreaCalc.html
modified: src/Tools/mrcImage/mrcImageAreaCalc/src/mrcImageAreaCalc.pane
modified: src/Tools/mrcImage/mrcImageAreaCalc/src/usage.c
#puts [pwd]
set DEBUG 0
-option add *font {FixedSys 10}
+option add *font {FixedSys 11}
proc libraryLoad { program } {
global tcl_version
libraryLoad $program
+proc ctfDisplayDefault { f } {
+ set fpt [ open $f w 0600 ]
+ puts $fpt "option add font {{option } 10}"
+}
+defaultLoad ctfDisplay ~/.Eos ctfDisplayDefault
+
namespace eval CTF2D {
variable ctfInfo
variable fftPattern
# a script that loads the command.
set auto_index(libraryLoad) [list source [file join $dir ctfDisplay.wish]]
+set auto_index(ctfDisplayDefault) [list source [file join $dir ctfDisplay.wish]]
set auto_index(::CTF2D::Init) [list source [file join $dir ctfDisplay.wish]]
set auto_index(::CTF2D::ctfInfoSync) [list source [file join $dir ctfDisplay.wish]]
set auto_index(::CTF2D::ctfInfoUpload) [list source [file join $dir ctfDisplay.wish]]
set auto_index(::CTF2D::CTFCalculation) [list source [file join $dir ctfDisplay.wish]]
set auto_index(::CTF2D::ScatteringCalc) [list source [file join $dir ctfDisplay.wish]]
set auto_index(::CTF2D::ctfInfoSave) [list source [file join $dir ctfDisplay.wish]]
+set auto_index(::CTF2D::ctfInfoSaveDefaultDir) [list source [file join $dir ctfDisplay.wish]]
+set auto_index(::CTF2D::ctfInfoSaveDefault) [list source [file join $dir ctfDisplay.wish]]
set auto_index(::CTF2D::ctfInfoLoad) [list source [file join $dir ctfDisplay.wish]]
+set auto_index(::CTF2D::dummyFunc) [list source [file join $dir ctfDisplay.wish]]
typedef struct lmrc2bildInfo {
float zoom;
float color[3];
+
// For Arrow
float r1;
float r2;
float rho;
+
+ // skip
+ int flagSkip;
+ int skipX;
+ int skipY;
+ int skipZ;
} lmrc2bildInfo;
/* struct end */
bltGraph.wish \
commandUtil.wish \
ctfInfo.wish \
+defaultLoad.wish \
fileSave.wish \
fileSelect.wish \
fileUtil.wish \
# CommandEntry
#
proc CommandEntry { name label width command args } {
+
set f [ frame $name ]
- label $name.label -text $label -width [ expr $width * 5] -anchor w
+ label $name.label -text $label -anchor w
+ #label $name.label -text $label -width [ expr $width*20 ] -anchor w
#label $name.label -text $label -width 20 -anchor w
#labelframe $name -text $label -labelanchor w
--- /dev/null
+proc defaultLoad { { filename "default" } { dir "~/.Eos/" } { procdef defaultLoadProcTemplate } } {
+ if [ file isdirectory $dir ] {
+ #
+ } else {
+ file mkdir $dir
+ }
+
+ if [ file exists $filename ] {
+ source $filename
+ } elseif [ file exists $dir/$filename ] {
+ source $dir/$filename
+ } else {
+ eval "$procdef $dir/$filename"
+ }
+}
+
+proc defaultLoadProcTemplate { f } {
+ fpt [ open $f r 600 ]
+ puts $fpt "option add font {{Arial} 10}"
+}
+
+
--- /dev/null
+OBJECTNAME = pngFile
+EXTRA_INC =
+EXTRA_CCOPTS =
--- /dev/null
+include ../../../Config/Define.inc
+include ../../Config/Define.inc
+include ../Config/Define.inc
+include Config/Define.inc
+
+DIRS = src inc doc
+
+all:
+ for dir in ${DIRS} ; \
+ do \
+ $(CD) $${dir}; $(MAKE) all; $(CD) ..; \
+ done
+
+install:
+ for dir in ${DIRS}; \
+ do \
+ ${CD} $${dir} ; $(MAKE) install; $(CD) ..; \
+ done
+
+debug:
+ for dir in ${DIRS} ; \
+ do \
+ $(CD) $${dir}; $(MAKE) debug; $(CD) ..; \
+ done
+
+install-debug:
+ for dir in ${DIRS}; \
+ do \
+ ${CD} $${dir} ; $(MAKE) install-debug; $(CD) ..; \
+ done
+
+clean:
+ for dir in ${DIRS} ; \
+ do \
+ $(CD) $${dir}; $(MAKE) clean; $(CD) ..; \
+ done
+
+depend:
+ for dir in ${DIRS} ; \
+ do \
+ $(CD) $${dir}; $(MAKE) depend; $(CD) ..; \
+ done
+
+put:
+ for dir in ${DIRS} ; \
+ do \
+ $(CD) $${dir}; $(MAKE) put; $(CD) ..; \
+ done
+
+check:
+ @cd src; \
+ 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) -f src/Makefile
+ @$(RM) -f inc/Makefile
+ @$(RM) -f doc/Makefile
+ @$(CP) ../../../Config/Template/$(WORLDNAME)Template.Dir/src/Makefile src/Makefile
+ @$(CP) ../../../Config/Template/$(WORLDNAME)Template.Dir/inc/Makefile inc/Makefile
+ @$(CP) ../../../Config/Template/$(WORLDNAME)Template.Dir/doc/Makefile doc/Makefile
+ @rm -f src/.Depend src/.Source
+ @touch src/$(OSTYPE)/.Depend
+ @touch src/$(OSTYPE)/.Source
+ @touch src/.CCHeader
+ @touch src/.CHeader
+ @touch src/.Wish
+ @touch src/.Ruby
+ @cd inc; make install
+ @cd src; make install-ascii
+
+#
+# CVS
+#
+cvsupdate::
+ cvs -d $(EOS_CVSROOT) update -d
+
+cvscommit::
+ cvs -d $(EOS_CVSROOT) commit -R
+
+#
+# Backup
+#
+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)/inc ; \
+ tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/doc; \
+ tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/.[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/.[A-z]*
+
+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)/inc ; \
+ tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/doc; \
+ tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/.[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/.[A-z]*
+
+#
+# Distribution
+#
+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)/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)/.[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/.[A-z]* ; \
+ 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)/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)/.[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/.[A-z]* ; \
+ tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE)
+
+include Config/Target.inc
+
--- /dev/null
+include ../../../../Config/Define.inc
+include ../../../Config/Define.inc
+include ../../Config/Define.inc
+include ../Config/Define.inc
+
+SOURCEDOC = $(OBJECTNAME).html
+DOCDSTDIR = $(EOS_HOME)/doc/Objects
+TARGETDOC = $(DOCDSTDIR)/$(SOURCEDOC)
+
+all: $(SOURCEDOC)
+
+install : $(TARGETDOC)
+
+$(TARGETDOC):$(SOURCEDOC)
+ $(INSTALL) -m 444 *.html $(DOCDSTDIR)
+ @cd $(DOCDSTDIR); make
+
+$(SOURCEDOC) : .$(SOURCEDOC) .header .footer ../inc/$(OBJECTNAME).h Makefile ../src/*.c
+ @echo Creating $(OBJECTNAME).html
+ @cat .header > $(SOURCEDOC)
+ @#htmlUpdateTime >> $(SOURCEDOC)
+ @cat .$(SOURCEDOC) >> $(SOURCEDOC)
+ @echo \<HR\> >> $(SOURCEDOC)
+ @echo "<A NAME=\"Information\">" >> $(SOURCEDOC)
+ @echo "<H2>Information from source codes</H2>" >> $(SOURCEDOC)
+ @echo "</A>" >> $(SOURCEDOC)
+ @echo "<PRE>" >> $(SOURCEDOC)
+ -@ident ../src/*.c >> $(SOURCEDOC)
+ @echo "</PRE>" >> $(SOURCEDOC)
+ @echo \<HR\> >> $(SOURCEDOC)
+ @echo \<A NAME=\"include\"\>>> $(SOURCEDOC)
+ @echo "<H2>$(OBJECTNAME).h</H2>">> $(SOURCEDOC)
+ @echo \</A\> >>$(SOURCEDOC)
+ @echo \<PRE\> >> $(SOURCEDOC)
+ @cat ../inc/$(OBJECTNAME).h >> $(SOURCEDOC)
+ @echo \</PRE\> >> $(SOURCEDOC)
+ @cat .footer >> $(SOURCEDOC)
+
+clean:
+
+depend:
--- /dev/null
+include ../../../../Config/Define.inc
+include ../../../Config/Define.inc
+include ../../Config/Define.inc
+include ../Config/Define.inc
+
+INCFILE = $(OBJECTNAME).h
+
+all:
+
+install:$(EOS_HOME)/include/$(INCFILE)
+
+$(EOS_HOME)/include/$(INCFILE):$(INCFILE)
+ if [ ! -d $(EOS_HOME)/include ] ; then \
+ mkdir $(EOS_HOME)/include ; \
+ fi
+ $(INSTALL) -m 444 $(INCFILE) $(EOS_HOME)/include/
+
+clean:
+ $(RM) -f *.bak
+
+depend:
+ $(RM) -f *.bak
+
+cvsupdate::
+ cvs -d $(EOS_CVSROOT) update
+
+cvscommit::
+ @echo "cvs -d $(EOS_CVSROOT) commit"
+
+cvsadd::
+ @echo "cvs -d $(EOS_CVSROOT) add"
--- /dev/null
+/*
+# pngFile.h : $Revision$
+# $Date$
+# Created by $Author$
+# Usage : pngFile.h
+# Attention
+# $Loccker$
+# $State$
+#
+*/
+/* $Log$ */
+#ifndef PNG_FILE_H
+#define PNG_FILE_H
+
+#include <stdio.h>
+#inlcude <png.h>
+
+/* constant begin */
+
+
+/* constant end */
+
+/* struct begin */
+
+typedef struct pngFile {
+ png_structp pngPtr;
+ png_infop pngInfoPtr;
+} pngFile;
+
+
+/* struct end */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* prototype begin */
+
+void pngFileInit(pngFile* png, int mode);
+void lmrc2png(pngFile* png, mrcImage* mrc, int mode);
+void pngFileWrite(pngFile* png, int mode);
+
+/* prototype end */
+
+#ifdef __cplusplus
+};
+#endif
+
+#endif /* XXXX */
--- /dev/null
+SHELL=/bin/ksh
+include ../Config/Define.inc
+include ../../Config/Define.inc
+include ../../../Config/Define.inc
+include ../../../../Config/Define.inc
+
+include $(OSTYPE)/.Source
+include .CHeader
+include .CCHeader
+include .Wish
+include .Ruby
+
+LIBNAME=lib$(OBJECTNAME).a
+SHAREDLIB=lib$(OBJECTNAME).so
+LIBNAMEDEBUG=lib$(OBJECTNAME).debug.a
+
+DSTDIR=../../../../../lib/$(OSTYPE)/
+SOURCE=$(OSTYPE)/.Source
+ARCHTEMPLATEDIR=$(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH
+
+all: hostdepend static-lib shared-lib ruby-lib debug
+ @echo LIBNAME:$(LIBNAME)
+ @echo OBJECTNAME:$(OBJECTNAME)
+
+hostdepend:
+ @if [ ! -L $(OSTYPE) ] ; then \
+ moveHostdependent ; \
+ fi
+
+debug: debug-lib
+
+static-lib::
+ @echo static-lib:LIBNAME:$(LIBNAME) ; \
+ $(RM) -f $(OSTYPE)/Makefile; \
+ $(CP) $(ARCHTEMPLATEDIR)/Makefile $(OSTYPE)/Makefile ; \
+ cd $(OSTYPE); \
+ $(MAKE) $(LIBNAME) CLASSNAME=$(CLASSNAME) OBJECTNAME=$(OBJECTNAME) WORLDNAME=$(WORLDNAME)
+
+shared-lib::
+ @echo shared-lib:LIBNAME:$(LIBNAME) ; \
+ $(RM) -f $(OSTYPE)/Makefile; \
+ $(CP) $(ARCHTEMPLATEDIR)/Makefile $(OSTYPE)/Makefile ; \
+ cd $(OSTYPE); \
+ $(MAKE) $(SHAREDLIB) CLASSNAME=$(CLASSNAME) OBJECTNAME=$(OBJECTNAME) WORLDNAME=$(WORLDNAME)
+
+ruby-lib::
+ @if [ -d Swig ]; then \
+ echo "--- Swig ---"; \
+ cd Swig; \
+ if [ -f extconf.rb ] ; then \
+ swig -ruby -I/usr/include -I$(EOS_HOME)/include *.i ; \
+ ruby extconf.rb --with-Eos-include=$(EOS_HOME)/include --with-Eos-lib=$(EOS_HOME)/lib/$(OSTYPE) --with-opt-lib=$LD_LIBRARY_PATH --with-opt-lib=$(EOS_HOME)/util/$(OSTYPE)/lib --with-GL-lib=/usr/lib ; \
+ make ; \
+ make sitearchdir=$(EOS_HOME)/lib/$(OSTYPE) install; \
+ fi ; \
+ fi
+
+debug-lib::
+ @cd $(OSTYPE); \
+ $(RM) -f Makefile; \
+ $(CP) $(ARCHTEMPLATEDIR)/Makefile Makefile ; \
+ $(MAKE) $(LIBNAMEDEBUG) CLASSNAME=$(CLASSNAME) OBJECTNAME=$(OBJECTNAME) WORLDNAME=$(WORLDNAME)
+
+clean:
+ rm -f *.[oa] *.debugo *.cudagdbo *.so *.sharedo *.linkinfo $(OSTYPE)/*.[ao] $(OSTYPE)/*.debugo $(OSTYPE)/*.cudagdbo $(OSTYPE)/*.linkinfo *.bak core $(OSTYPE)/*.sharedo $(OSTYPE)/*.so
+
+Makefile:
+ touch .Source
+ touch .CHeader
+ touch .CCHeader
+
+install: all install-static install-shared install-ascii
+ @echo "Installation has completed: $(LIBNAME)"
+
+install-static: $(DSTDIR)/$(LIBNAME)
+install-shared: $(DSTDIR)/$(SHAREDLIB)
+
+install-debug: debug $(DSTDIR)/$(LIBNAMEDEBUG) install-ascii
+ @echo "Installation has completed: $(LIBNAMEDEBUG)"
+
+install-ascii: h hh wish ruby
+
+h:
+ @if [ -n "$(CHeader)" ] ; \
+ then\
+ echo "C Header Install" ; \
+ for file in $(CHeader) dummy ; \
+ do \
+ if [ -f $${file} ] ; \
+ then\
+ echo $${file}; $(INSTALL) -m 444 $${file} $(DSTDIR)/../../include ; \
+ fi;\
+ done; \
+ fi
+
+hh:
+ @if [ -n "$(CCHeader)" ] ; \
+ then \
+ echo "C++ Header Install" ; \
+ for file in $(CCHeader) dummy ; \
+ do \
+ if [ -f $${file} ] ; \
+ then\
+ echo $${file}; $(INSTALL) -m 444 $${file} $(DSTDIR)/../../include ; \
+ fi;\
+ done; \
+ fi
+
+wish:
+ @if [ -n "$(Wish)" ] ; \
+ then \
+ echo "Wish Install" ; \
+ for file in $(Wish) dummy ; \
+ do \
+ if [ -f $${file} ] ; \
+ then\
+ echo $${file}; $(INSTALL) -m 444 $${file} $(DSTDIR)/../../lib ; \
+ fi;\
+ done; \
+ fi
+
+ruby:
+ @if [ -n "$(Ruby)" ] ; \
+ then \
+ echo "Ruby Install" ; \
+ for file in $(Ruby) dummy ; \
+ do \
+ if [ -f $${file} ] ; \
+ then\
+ echo $${file}; $(INSTALL) -m 444 $${file} $(DSTDIR)/../../lib ; \
+ fi;\
+ done; \
+ fi
+
+put:
+ @Files=`ls -l | grep $${USER} | grep rw | grep -e "\.c" ` ;\
+ for file in $${Files} dummy; \
+ do \
+ if [ -w $${file} ] ; \
+ then\
+ echo $${file}; sccsPut $${file} ; \
+ fi;\
+ done
+
+$(DSTDIR)/$(LIBNAME): static-lib
+ @echo Installing lib: $(LIBNAME)
+ @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
+ @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAME) ../$(DSTDIR)
+ @echo LIBNAME:$(LIBNAME)
+ @echo Link EosObjects
+ @OBJLIST=`ls $(OSTYPE)/*.o `;\
+ echo $${OBJLIST} | sed -f ../../../../Config/o2nl.sed > .tmp1 ; \
+ echo $(REALOBJ) | sed -f ../../../../Config/o2nl.sed > .tmp2 ; \
+ echo "#### Attention Uncompiled file ####";\
+ comm -13 .tmp1 .tmp2 ; \
+ echo "########";\
+ echo $(AR) r $(DSTDIR)/libEosObjects.a $${OBJLIST} ; \
+ $(AR) r $(DSTDIR)/libEosObjects.a $${OBJLIST}; \
+ echo $(AR) s $(DSTDIR)/libEosObjects.a ; \
+ $(AR) s $(DSTDIR)/libEosObjects.a \
+ chmod 660 $(DSTDIR)/libEosObjects.a
+ @rm .tmp1 .tmp2
+
+$(DSTDIR)/$(LIBNAMEDEBUG): debug
+ @echo Installing lib: $(LIBNAMEDEBUG)
+ @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
+ @cd $(OSTYPE); $(INSTALL) -m 444 $(LIBNAMEDEBUG) ../$(DSTDIR)
+ @echo LIBNAME:$(LIBNAMEDEBUG)
+ @echo Link EosObjects
+ @OBJLISTDEBUG=`ls $(OSTYPE)/*.debugo `;\
+ echo $${OBJLISTDEBUG} | sed -f ../../../../Config/o2nl.sed > .tmp1 ; \
+ echo $(REALOBJDEBUG) | sed -f ../../../../Config/o2nl.sed > .tmp2 ; \
+ echo "#### Attention Uncompiled file ####";\
+ comm -13 .tmp1 .tmp2 ; \
+ echo "########";\
+ echo $(AR) r $(DSTDIR)/libEosObjects.debug.a $${OBJLISTDEBUG} ; \
+ $(AR) r $(DSTDIR)/libEosObjects.debug.a $${OBJLISTDEBUG};
+ echo $(AR) s $(DSTDIR)/libEosObjects.debug.a ; \
+ $(AR) s $(DSTDIR)/libEosObjects.debug.a
+ chmod 660 $(DSTDIR)/libEosObjects.debug.a
+ @rm .tmp1 .tmp2
+
+$(DSTDIR)/$(SHAREDLIB): shared-lib
+ @echo Installing lib: $(SHAREDLIB)
+ @if [ ! -d $(DSTDIR) ] ; then mkdir $(DSTDIR) ; fi
+ @cd $(OSTYPE); $(INSTALL) -m 444 $(SHAREDLIB) ../$(DSTDIR)
+ @echo LIBNAME:$(SHAREDLIB)
+ @echo Link EosObjects
+ @OBJLIST=`ls $(OSTYPE)/*.sharedo `;\
+ echo $${OBJLIST} | sed -f ../../../../Config/o2nl.sed > .tmp1 ; \
+ echo $(REALSHAREDOBJ) | sed -f ../../../../Config/o2nl.sed > .tmp2 ; \
+ echo "#### Attention Uncompiled file ####";\
+ comm -13 .tmp1 .tmp2 ; \
+ echo "########"; \
+ if [ ! -d $(DSTDIR)/shared ] ; then \
+ mkdir $(DSTDIR)/shared; \
+ fi; \
+ $(CP) $${OBJLIST} $(DSTDIR)/shared ; \
+ echo "$(CP) $${OBJLIST} $(DSTDIR)/shared" ; \
+ $(SHARED) $(DSTDIR)/libEosObjects.so $(DSTDIR)/shared/*.sharedo ; \
+ echo "$(SHARED) $(DSTDIR)/libEosObjects.so $(DSTDIR)/shared/*.sharedo" ; \
+ chmod 660 $(DSTDIR)/libEosObjects.so
+ @rm .tmp1 .tmp2
+
+install-all:
+ @cd .. ; $(MAKE) install
+
+install-ruby: ruby-lib
+ cd $(OSTYPE); $(RUBY) -r ftools -e 'File::install(ARGV[0], ARGV[1], 0555, true)' $(SHAREDLIB) $(RUBYSHAREDLIB)/$(SHAREDLIB)
+
+depend:
+ @echo dependency checking now
+ @echo $(OSTYPE)
+ @echo SRC = \\ > $(SOURCE)
+ @ls -1 *.c | sed -e "s/\.c/.c \\\\/" >> $(SOURCE)
+ @ls -1 *.cc | sed -e "s/\.cc/.cc \\\\/" >> $(SOURCE)
+ @ls -1 *.ccm | sed -e "s/\.ccm/.ccm \\\\/" >> $(SOURCE)
+ @ls -1 *.idl | sed -e "s/\.idl/.idl \\\\/" >> $(SOURCE)
+ @ls -1 *.cu | sed -e "s/\.cu/.cu \\\\/" >> $(SOURCE)
+ @echo >> $(SOURCE)
+ @#
+ @echo OBJ = \\ >> $(SOURCE)
+ @ls -1 *.c | sed -e "s/\.c/.o \\\\/" >> $(SOURCE)
+ @ls -1 *.cc | sed -e "s/\.cc/.o \\\\/" >> $(SOURCE)
+ @ls -1 *.ccm | sed -e "s/\.ccm/.o \\\\/" >> $(SOURCE)
+ @ls -1 *.idl | sed -e "s/\.idl/.o \\\\/" >> $(SOURCE)
+ @ls -1 *.cu | sed -e "s/\.cu/.o \\\\/" >> $(SOURCE)
+ @echo >> $(SOURCE)
+ @#
+ @echo SHAREDOBJ = \\ >> $(SOURCE)
+ @ls -1 *.c | sed -e "s/\.c/.sharedo \\\\/" >> $(SOURCE)
+ @ls -1 *.cc | sed -e "s/\.cc/.sharedo \\\\/" >> $(SOURCE)
+ @ls -1 *.ccm | sed -e "s/\.ccm/.sharedo \\\\/" >> $(SOURCE)
+ @ls -1 *.idl | sed -e "s/\.idl/.sharedo \\\\/" >> $(SOURCE)
+ @ls -1 *.cu | sed -e "s/\.cu/.sharedo \\\\/" >> $(SOURCE)
+ @echo >> $(SOURCE)
+ @#
+ @echo REALOBJ = \\ >> $(SOURCE)
+ @ls -1 *.c | sed -e "s/^/\$(OSTYPE)\//" -e "s/\.c/.o \\\\/" >> $(SOURCE)
+ @ls -1 *.cc | sed -e "s/^/\$(OSTYPE)\//" -e "s/\.cc/.o \\\\/" >> $(SOURCE)
+ @ls -1 *.ccm | sed -e "s/^/\$(OSTYPE)\//" -e "s/\.ccm/.o \\\\/" >> $(SOURCE)
+ @ls -1 *.idl | sed -e "s/^/\$(OSTYPE)\//" -e "s/\.idl/.o \\\\/" >> $(SOURCE)
+ @ls -1 *.cu | sed -e "s/^/\$(OSTYPE)\//" -e "s/\.cu/.o \\\\/" >> $(SOURCE)
+ @echo >> $(SOURCE)
+ @echo REALSHAREDOBJ = \\ >> $(SOURCE)
+ @ls -1 *.c | sed -e "s/^/\$(OSTYPE)\//" -e "s/\.c/.sharedo \\\\/" >> $(SOURCE)
+ @ls -1 *.cc | sed -e "s/^/\$(OSTYPE)\//" -e "s/\.cc/.sharedo \\\\/" >> $(SOURCE)
+ @ls -1 *.ccm | sed -e "s/^/\$(OSTYPE)\//" -e "s/\.ccm/.sharedo \\\\/" >> $(SOURCE)
+ @ls -1 *.idl | sed -e "s/^/\$(OSTYPE)\//" -e "s/\.idl/.sharedo \\\\/" >> $(SOURCE)
+ @ls -1 *.cu | sed -e "s/^/\$(OSTYPE)\//" -e "s/\.cu/.sharedo \\\\/" >> $(SOURCE)
+ @echo >> $(SOURCE)
+ @echo OBJDEBUG = \\ >> $(SOURCE)
+ @ls -1 *.c | sed -e "s/\.c/.debugo \\\\/" >> $(SOURCE)
+ @ls -1 *.cc | sed -e "s/\.cc/.debugo \\\\/" >> $(SOURCE)
+ @ls -1 *.ccm | sed -e "s/\.ccm/.debugo \\\\/" >> $(SOURCE)
+ @ls -1 *.idl | sed -e "s/\.idl/.debugo \\\\/" >> $(SOURCE)
+ @echo >> $(SOURCE)
+ @#
+ @echo REALOBJDEBUG = \\ >> $(SOURCE)
+ @ls -1 *.c | sed -e "s/^/\$(OSTYPE)\//" -e "s/\.c/.debugo \\\\/" >> $(SOURCE)
+ @ls -1 *.cc | sed -e "s/^/\$(OSTYPE)\//" -e "s/\.cc/.debugo \\\\/" >> $(SOURCE)
+ @ls -1 *.ccm | sed -e "s/^/\$(OSTYPE)\//" -e "s/\.ccm/.debugo \\\\/" >> $(SOURCE)
+ @ls -1 *.idl | sed -e "s/^/\$(OSTYPE)\//" -e "s/\.idl/.debugo \\\\/" >> $(SOURCE)
+ @ls -1 *.cu | sed -e "s/^/\$(OSTYPE)\//" -e "s/\.cu/.debugo \\\\/" >> $(SOURCE)
+ @echo >> $(SOURCE)
+ @echo OBJCUDAGDB = \\ >> $(SOURCE)
+ @ls -1 *.c | sed -e "s/\.c/.cudagdb.o \\\\/" >> $(SOURCE)
+ @ls -1 *.cc | sed -e "s/\.cc/.cudagdb.o \\\\/" >> $(SOURCE)
+ @ls -1 *.cu | sed -e "s/\.cu/.cudagdb.o \\\\/" >> $(SOURCE)
+ @echo >> $(SOURCE)
+ @#
+ @echo REALOBJCUDAGDB = \\ >> $(SOURCE)
+ @ls -1 *.c | sed -e "s/^/\$(OSTYPE)\//" -e "s/\.c/.cudagdb.o \\\\/" >> $(SOURCE)
+ @ls -1 *.cc | sed -e "s/^/\$(OSTYPE)\//" -e "s/\.cc/.cudagdb.o \\\\/" >> $(SOURCE)
+ @ls -1 *.cu | sed -e "s/^/\$(OSTYPE)\//" -e "s/\.cu/.cudagdb.o \\\\/" >> $(SOURCE)
+ @echo >> $(SOURCE)
+ @#
+ @echo >> $(SOURCE)
+ @echo CCHeader = \\ > .CCHeader
+ @ls -1 *.hh | sed -e "s/\.hh/.hh \\\\/" >> .CCHeader
+ @echo >> .CCHeader
+ @#
+ @echo CHeader = \\ > .CHeader
+ @ls -1 *.h | sed -e "s/\.h/.h \\\\/" >> .CHeader
+ @echo >> .CHeader
+ @#
+ @echo Wish = \\ > .Wish
+ @ls -1 *.wish | sed -e "s/\.wish/.wish \\\\/" >> .Wish
+ @echo >> .Wish
+ @#
+ @echo Ruby = \\ > .Ruby
+ @ls -1 *.rb | sed -e "s/\.rb/.rb \\\\/" >> .Ruby
+ @echo >> .Ruby
+ @#
+ @ls -1 *.c *.cc *.ccm | \
+ awk -vHostType=$(OSTYPE) -f$(EOS_HOME)/sbin/awk/objectdependency.awk > $(OSTYPE)/.Depend
+ @#
+ @$(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) $(KHOROS_INCS) *.c *.cc *.ccm >> $(OSTYPE)/.Depend
+ @for file in $(SRC) dummy ; \
+ do \
+ if [ -f $${file} ] ; \
+ then \
+ echo $${file} ; \
+ ln -sf ../$${file} $(OSTYPE)/$${file}; \
+ fi ;\
+ done
+
+#
+#
+#
+test::
+ @if [ -d test ] ; then \
+ cd test; \
+ $(MAKE); \
+ else \
+ echo "No test directory: making test"; \
+ mkdir test; \
+ cd test; \
+ touch Makefile; \
+ fi
+
+#
+# cvs
+#
+cvsupdate::
+ cvs -d $(EOS_CVSROOT) update -d
+
+cvslogin::
+ cvs -d $(EOS_CVSROOT) login
+
+cvscommit::
+ @echo "cvs -d $(EOS_CVSROOT) commit -m @"message@" filename"
+
+cvsadd::
+ @echo "cvs -d $(EOS_CVSROOT) add filename|dirname"
+ @echo "Need Commit for filename"
+ @echo "make cvscommit"
+
+cvsremove::
+ @echo "cvs -d $(EOS_CVSROOT) remove filename"
+ @echo "Need Commit for filename"
+ @echo "make cvscommit"
+
+include $(OSTYPE)/.Depend
+include ../Config/Target.inc
--- /dev/null
+../../../../../hostdepend/X86MAC64/src/Objects/DataExpress/pngFile/src/X86MAC64
\ No newline at end of file
typedef struct lmrc2bildInfo {
float zoom;
float color[3];
+
// For Arrow
float r1;
float r2;
float rho;
+
+ // skip
+ int flagSkip;
+ int skipX;
+ int skipY;
+ int skipZ;
} lmrc2bildInfo;
/* struct end */
typedef struct lmrc2bildInfo {
float zoom;
float color[3];
+
// For Arrow
float r1;
float r2;
float rho;
+
+ // skip
+ int flagSkip;
+ int skipX;
+ int skipY;
+ int skipZ;
} lmrc2bildInfo;
/* struct end */
mrcImageParaTypeReal startx, starty, startz;
mrcImageParaTypeReal endx, endy, endz;
double d0, d1, d2;
+ int skipX, skipY, skipZ;
fprintf(fpt, ".color %g %g %g\n", linfo.color[0], linfo.color[1], linfo.color[2]);
- for(z=0; z<in[0].HeaderN.z; z++) {
- for(y=0; y<in[0].HeaderN.y; y++) {
- for(x=0; x<in[0].HeaderN.x; x++) {
+
+ if(linfo.flagSkip) {
+ skipX = linfo.skipX;
+ skipY = linfo.skipY;
+ skipZ = linfo.skipZ;
+ } else {
+ skipX = 1;
+ skipY = 1;
+ skipZ = 1;
+ }
+
+ for(z=0; z<in[0].HeaderN.z; z+=skipZ) {
+ for(y=0; y<in[0].HeaderN.y; y+=skipY) {
+ for(x=0; x<in[0].HeaderN.x; x+=skipX) {
mrcPixelDataGet(&in[0], x, y, z, &d0, mrcPixelRePart, mrcPixelHowNearest);
mrcPixelDataGet(&in[1], x, y, z, &d1, mrcPixelRePart, mrcPixelHowNearest);
mrcPixelDataGet(&in[2], x, y, z, &d2, mrcPixelRePart, mrcPixelHowNearest);
mrcImageParaTypeReal endx, endy, endz;
double d0, d1, d2;
+ int skipX, skipY, skipZ;
fprintf(fpt, ".color %g %g %g\n", linfo.color[0], linfo.color[1], linfo.color[2]);
- for(z=0; z<in[0].HeaderN.z; z++) {
- for(y=0; y<in[0].HeaderN.y; y++) {
- for(x=0; x<in[0].HeaderN.x; x++) {
+
+
+ if(linfo.flagSkip) {
+ skipX = linfo.skipX;
+ skipY = linfo.skipY;
+ skipZ = linfo.skipZ;
+ } else {
+ skipX = 1;
+ skipY = 1;
+ skipZ = 1;
+ }
+
+ for(z=0; z<in[0].HeaderN.z; z+=skipZ) {
+ for(y=0; y<in[0].HeaderN.y; y+=skipY) {
+ for(x=0; x<in[0].HeaderN.x; x+=skipX) {
mrcPixelDataGet(&in[0], x, y, z, &d0, mrcPixelRePart, mrcPixelHowNearest);
if(d0==0 && d1==0 && d2==0) {
} else {
}
}
-
WORLDNAME=Tools
WORLDNAME=Tools
WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
#puts [pwd]
set DEBUG 0
-option add *font {FixedSys 10}
+option add *font {FixedSys 11}
proc libraryLoad { program } {
global tcl_version
libraryLoad $program
+proc ctfDisplayDefault { f } {
+ set fpt [ open $f w 0600 ]
+ puts $fpt "option add font {{option } 10}"
+}
+defaultLoad ctfDisplay ~/.Eos ctfDisplayDefault
+
namespace eval CTF2D {
variable ctfInfo
variable fftPattern
+++ /dev/null
-include ../Config/Define.inc
-include Config/Define.inc
-include .Source
-
-include Config/Target.inc
--- /dev/null
+/Users/tacyas/Eos/src/Config/Template/ToolsHomeTemplate.Dir/Makefile
\ No newline at end of file
mrc2gif \
mrc2lattice \
mrc2mrc \
+mrc2png \
mrc2pov \
mrc2tiff \
mrc2viff \
"-color","-color","Color","Optional","3","1","Red","Real","1.0","2","Green","Real","1.0","3","Blue","Real","1.0"
"-zoom","-zoom","Zoom","Optional","1","1","Zoom","Real","1.0"
"-arrow","-arrow[Shape]","Arrow","Optional","3","1","R1","Real","0.1","2","R2","Real","0.4","3","Rho","Real","0.75"
+"-skip","-skip","SkipVoxel","Optional","3","1","skipX","Integer","1","2","skipY","Integer","1","3","skipZ","Integer","1"
"-c","-c[onfig]","ConfigurationFile","Optional","1","1","configFile","inFile","NULL"
"-m","-m[ode]","Mode","Optional","1","1","mode","Integer","0"
long flagRho;
float Rho;
+ long flagskipX;
+ long skipX;
+
+ long flagskipY;
+ long skipY;
+
+ long flagskipZ;
+ long skipZ;
+
long flagconfigFile;
char* configFile;
FILE* fptconfigFile;
}
SBREAK;
}
+ SCASE("skip") {
+ if(i+3<argc) {
+ info->skipX = stringGetNthIntegerData(argv[i+1], 1, " ,");
+ i++;
+ info->flagskipX++;
+ info->skipY = stringGetNthIntegerData(argv[i+1], 1, " ,");
+ i++;
+ info->flagskipY++;
+ info->skipZ = stringGetNthIntegerData(argv[i+1], 1, " ,");
+ i++;
+ info->flagskipZ++;
+ } else {
+ usage(argv[0]);
+ exit(EXIT_FAILURE);
+ }
+ SBREAK;
+ }
SCASE("c") {
if(i+1<argc) {
info->configFile = stringGetNthWord(argv[i+1], 1, " ,");
info->R1 = 0.1; info->flagR1 = 0;
info->R2 = 0.4; info->flagR2 = 0;
info->Rho = 0.75; info->flagRho = 0;
+ info->skipX = 1; info->flagskipX = 0;
+ info->skipY = 1; info->flagskipY = 0;
+ info->skipZ = 1; info->flagskipZ = 0;
info->fptconfigFile = NULL; info->flagconfigFile = 0;
info->mode = 0; info->flagmode = 0;
}
if(info->flagRho) {
}
+ if(info->flagskipX) {
+ }
+
+ if(info->flagskipY) {
+ }
+
+ if(info->flagskipZ) {
+ }
+
if(info->flagconfigFile) {
info->fptconfigFile = fileOpen(info->configFile, "r");
}
linfo.r1 = info.R1;
linfo.r2 = info.R2;
linfo.rho = info.Rho;
+ linfo.flagSkip = info.flagskipX;
+ linfo.skipX = info.skipX;
+ linfo.skipY = info.skipY;
+ linfo.skipZ = info.skipZ;
+
lmrc2bild(info.fptOut, in, linfo, info.mode);
[-arrow[Shape] R1 (0.1 ).as(Real )
R2 (0.4 ).as(Real )
Rho (0.75 ).as(Real ) ] :Optional :Arrow
+ [-skip skipX (1 ).as(Integer )
+ skipY (1 ).as(Integer )
+ skipZ (1 ).as(Integer ) ] :Optional :SkipVoxel
[-c[onfig] configFile (NULL ).as(inFile ) ] :Optional :ConfigurationFile
[-m[ode] mode (0 ).as(Integer ) ] :Optional :Mode
----- Additional Usage -----
-I 1 0 0 1 0 1 -1x1+1+6 ' ' '1.0' 'Red' Color
-f 1 0 1 0 0 -1x1+1+7.500000 0 0 1.000000 0 0 0 'Zoom' 'Zoom' zoom
-I 1 0 0 1 0 1 -1x1+1+9 ' ' '0.1' 'R1' Arrow
- -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
+ -I 1 0 0 1 0 1 -1x1+1+10 ' ' '1' 'skipX' SkipVoxel
+ -I 1 0 1 0 0 1 -1x1+1+12.000000 ' ' 'configFile' 'ConfigurationFile' c
+ -i 1 0 1 0 0 -1x1+1+13.500000 0 0 0 0 0 'mode' 'Mode' m
-E
-E
-E
exec:
@echo "----- Execution Check -----"
../$(OSTYPE)/$(OBJECTNAME) -i3 data/test.mrc3d data/test.mrc3d data/test.mrc3d -o data/test-arrow.bild -zoom 0.01
+ ../$(OSTYPE)/$(OBJECTNAME) -i3 data/test.mrc3d data/test.mrc3d data/test.mrc3d -o data/test-arrow2.bild -zoom 0.02 -skip 3 3 3
../$(OSTYPE)/$(OBJECTNAME) -i data/test.mrc3d -o data/test-sphere.bild -zoom 0.01 -m 1
+ ../$(OSTYPE)/$(OBJECTNAME) -i data/test.mrc3d -o data/test-sphere2.bild -zoom 0.02 -m 1 -skip 3 3 3
@echo "----- Calc check -----"
clean:
fprintf(stderr, " [-color Red (1.0 ).as(Real ) \n Green (1.0 ).as(Real ) \n Blue (1.0 ).as(Real ) ] :Optional :Color\n");
fprintf(stderr, " [-zoom Zoom (1.0 ).as(Real ) ] :Optional :Zoom\n");
fprintf(stderr, " [-arrow[Shape] R1 (0.1 ).as(Real ) \n R2 (0.4 ).as(Real ) \n Rho (0.75 ).as(Real ) ] :Optional :Arrow\n");
+ fprintf(stderr, " [-skip skipX (1 ).as(Integer ) \n skipY (1 ).as(Integer ) \n skipZ (1 ).as(Integer ) ] :Optional :SkipVoxel\n");
fprintf(stderr, " [-c[onfig] configFile (NULL ).as(inFile ) ] :Optional :ConfigurationFile\n");
fprintf(stderr, " [-m[ode] mode (0 ).as(Integer ) ] :Optional :Mode\n");
additionalUsage();
--- /dev/null
+OBJECTNAME = mrc2png
+EXTRA_LIB =
+EXTRA_CCOPTS =
+EXTRA_INC =
--- /dev/null
+# OptionControlFile
+# FileFormat
+"-i","-i[nput]","InputDataFile","Essential","1","1","In","inFile","NULL"
+"-o","-o[utput]","OutputDataFile","Essential","1","1","Out","outFile","NULL"
+"-c","-c[onfig]","ConfigurationFile","Optional","1","1","configFile","inFile","NULL"
+"-m","-m[ode]","Mode","Optional","1","1","mode","Integer","0"
--- /dev/null
+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
--- /dev/null
+install:
+ cd ../src; make install-doc; cd ../doc
--- /dev/null
+#ifndef CONFIG_H
+#define CONFIG_H
+
+#include "../inc/mrc2png.h"
+
+#endif /* CONFIG_H */
--- /dev/null
+#ifndef MRC2PNG_H
+#define MRC2PNG_H
+#include <stdio.h>
+#include <stdlib.h>
+
+#define OPTION_FLAG '-'
+#define OPTION_FLAG_POS (0)
+#define OPTION_POS (1)
+
+
+
+
+typedef struct mrc2pngInfo {
+ long flagRedirect;
+
+ long flagIn;
+ char* In;
+ FILE* fptIn;
+
+ long flagOut;
+ char* Out;
+ FILE* fptOut;
+
+ long flagconfigFile;
+ char* configFile;
+ FILE* fptconfigFile;
+
+ long flagmode;
+ long mode;
+
+} mrc2pngInfo;
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern void argCheck(mrc2pngInfo* info, int argc, char* avgv[]);
+extern void khorosInit(int argc, char* avgv[]);
+extern void init0(mrc2pngInfo* info);
+extern void init1(mrc2pngInfo* info);
+extern void usage(char* usage);
+extern void additionalUsage(void);
+extern void htmlBeforeUsage(char* usage);
+extern void htmlAfterUsage(char* usage);
+#ifdef __cplusplus
+};
+#endif
+#endif /* MRC2PNG_H */
--- /dev/null
+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
+
+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
--- /dev/null
+../../../../../hostdepend/X86MAC64/src/Tools/filter/mrc2png/src/X86MAC64
\ No newline at end of file
--- /dev/null
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+#include "../inc/config.h"
+#include "genUtil.h"
+#include "String.h"
+#include "File.h"
+#include "Memory.h"
+
+
+void
+argCheck(mrc2pngInfo* info, int argc, char* argv[])
+{
+ long i;
+ char s[1024];
+ FILE* fpt;
+
+ if(NULL==(fpt=fopen(".EosLog", "a+"))) {
+
+ } else {
+ for(i=0; i<argc; i++) {
+ fprintf(fpt, "%s ", argv[i]);
+ }
+ fprintf(fpt, "\n");
+ fclose(fpt);
+ }
+ for(i=1; i<argc; i++) {
+ if(OPTION_FLAG==argv[i][OPTION_FLAG_POS]) {
+ SSWITCH(argv[i]+OPTION_POS)
+ SCASE("i") {
+ if(i+1<argc) {
+ info->In = stringGetNthWord(argv[i+1], 1, " ,");
+ i++;
+ info->flagIn++;
+ } else {
+ usage(argv[0]);
+ exit(EXIT_FAILURE);
+ }
+ SBREAK;
+ }
+ SCASE("o") {
+ if(i+1<argc) {
+ info->Out = stringGetNthWord(argv[i+1], 1, " ,");
+ i++;
+ info->flagOut++;
+ } else {
+ usage(argv[0]);
+ exit(EXIT_FAILURE);
+ }
+ SBREAK;
+ }
+ SCASE("c") {
+ if(i+1<argc) {
+ info->configFile = stringGetNthWord(argv[i+1], 1, " ,");
+ i++;
+ info->flagconfigFile++;
+ } else {
+ usage(argv[0]);
+ exit(EXIT_FAILURE);
+ }
+ 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("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;
+ }
+ }
+}
--- /dev/null
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+#include "../inc/config.h"
+#include "genUtil.h"
+#include "String.h"
+#include "File.h"
+#include "Memory.h"
+
+
+void
+init0(mrc2pngInfo* info)
+{
+ info->fptIn = NULL; info->flagIn = 0;
+ info->fptOut = NULL; info->flagOut = 0;
+ info->fptconfigFile = NULL; info->flagconfigFile = 0;
+ info->mode = 0; info->flagmode = 0;
+}
+
+void
+init1(mrc2pngInfo* 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 <stdio.h>
+#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/mrc2png/src/mrc2png.pane", eospath);
+ khoros_initialize(argc, argv, "EOS");
+ fpt = fopen(panepath, "r"); if(NULL!=fpt) {
+ fclose(fpt);
+ kclui_initialize(panepath, KGEN_NONE, "EOS", "mrc2png",
+ func_usage_additions,
+ func_get_args,
+ func_free_args);
+ }
+}
+#endif /* KHOROS */
--- /dev/null
+/*
+# mrc2png : $Revision$
+# $Date$
+# Created by $Author$
+# Usage : mrc2png
+# Attention
+# $Loccker$
+# $State$
+#
+*/
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+#define GLOBAL_DECLARATION
+#include "../inc/config.h"
+
+#define DEBUG
+#include "genUtil.h"
+#include "mrcImage.h"
+
+/*
+Example:
+typedef struct lmrc2pngInfo {
+ float a;
+ int b;
+} lmrc2pngInfo;
+
+typedef enum lmrc2pngMode {
+ a=0,
+ b=1
+} lmrc2pngMode;
+*/
+
+int
+main(int argc, char* argv[])
+{
+ mrc2pngInfo info;
+
+ init0(&info);
+ argCheck(&info, argc, argv);
+ init1(&info);
+
+ DEBUGPRINT("Program Start\n");
+
+ exit(EXIT_SUCCESS);
+}
+
+void
+additionalUsage()
+{
+ fprintf(stderr, "----- Additional Usage -----\n");
+}
--- /dev/null
+-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 ' ' mrc2png
+ -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/mrc2png
+ -H 1 5x1+41+0 'Help' 'help page' $EOS/src/Tools/filter/mrc2png/doc/mrc2png.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
--- /dev/null
+#include <stdio.h>
+#include <stdlib.h>
+#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 (NULL ).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, "<HTML>\n");
+ fprintf(stderr, "<HEAD>\n");
+ fprintf(stderr, "<TITLE>%s</TITLE>\n", thisProgram);
+ fprintf(stderr, "</HEAD>\n");
+ fprintf(stderr, "<BODY>\n");
+ fprintf(stderr, "<H1>%s</H1>\n", thisProgram);
+ fprintf(stderr, "<H2>Usage</H2>\n");
+ fprintf(stderr, "<PRE>\n");
+}
+
+void
+htmlAfterUsage(char* thisProgram)
+{
+ fprintf(stderr, "</PRE>\n");
+ fprintf(stderr, "</BODY>\n");
+ fprintf(stderr, "</HTML>\n");
+}
--- /dev/null
+#include <stdio.h>
+#include <stdlib.h>
+#include "../inc/config.h"
+
"-l","-l[abel]","Output: mrcImage:labeling","Optional","1","1","Label","outFile::mrcImage","NULL"
"-OH","-O[utput]H[istgram]","Output: ASCII: area info","Optional","1","1","OutHist","outFile::ASCII","NULL"
"-H","-H[istgram]","Delta","Optional","1","1","DelHist","Real","1"
-"-N","-N[eighbor]","Neighbor","Optional","1","1","Neighbor","Real","0"
+"-N","-N[eighbor]","Neighbor[4(0)|8 or 6(0)|18|26]","Optional","1","1","Neighbor","Real","0"
"-c","-c[onfig]","ConfigurationFile","Optional","1","1","configFile","inFile","NULL"
"-m","-m[ode]","Mode","Optional","1","1","mode","Integer","0"
[-l[abel] Label (NULL ).as(outFile::mrcImage ) ] :Optional :Output: mrcImage:labeling
[-O[utput]H[istgram] OutHist (NULL ).as(outFile::ASCII ) ] :Optional :Output: ASCII: area info
[-H[istgram] DelHist (1 ).as(Real ) ] :Optional :Delta
- [-N[eighbor] Neighbor (0 ).as(Real ) ] :Optional :Neighbor
+ [-N[eighbor] Neighbor (0 ).as(Real ) ] :Optional :Neighbor[4(0)|8 or 6(0)|18|26]
[-c[onfig] configFile (NULL ).as(inFile ) ] :Optional :ConfigurationFile
[-m[ode] mode (0 ).as(Integer ) ] :Optional :Mode
----- Additional Usage -----
-O 1 0 1 0 0 1 -1x1+1+6.000000 ' ' 'Label' 'Output: mrcImage:labeling' l
-O 1 0 1 0 0 1 -1x1+1+7.500000 ' ' 'OutHist' 'Output: ASCII: area info' OH
-f 1 0 1 0 0 -1x1+1+9.000000 0 0 1.000000 0 0 0 'DelHist' 'Delta' H
- -f 1 0 1 0 0 -1x1+1+10.500000 0 0 0.000000 0 0 0 'Neighbor' 'Neighbor' N
+ -f 1 0 1 0 0 -1x1+1+10.500000 0 0 0.000000 0 0 0 'Neighbor' 'Neighbor[4(0)|8 or 6(0)|18|26]' N
-I 1 0 1 0 0 1 -1x1+1+12.000000 ' ' 'configFile' 'ConfigurationFile' c
-i 1 0 1 0 0 -1x1+1+13.500000 0 0 0 0 0 'mode' 'Mode' m
-E
fprintf(stderr, " [-l[abel] Label (NULL ).as(outFile::mrcImage ) ] :Optional :Output: mrcImage:labeling\n");
fprintf(stderr, " [-O[utput]H[istgram] OutHist (NULL ).as(outFile::ASCII ) ] :Optional :Output: ASCII: area info\n");
fprintf(stderr, " [-H[istgram] DelHist (1 ).as(Real ) ] :Optional :Delta\n");
- fprintf(stderr, " [-N[eighbor] Neighbor (0 ).as(Real ) ] :Optional :Neighbor\n");
+ fprintf(stderr, " [-N[eighbor] Neighbor (0 ).as(Real ) ] :Optional :Neighbor[4(0)|8 or 6(0)|18|26]\n");
fprintf(stderr, " [-c[onfig] configFile (NULL ).as(inFile ) ] :Optional :ConfigurationFile\n");
fprintf(stderr, " [-m[ode] mode (0 ).as(Integer ) ] :Optional :Mode\n");
additionalUsage();
OSDN Git Service
