Please enter the commit message for your changes. Lines starting

 with '#' will be ignored, and an empty message aborts the commit.

 On branch master
 Your branch and 'origin/master' have diverged,
 and have 1 and 1 different commits each, respectively.
   (use "git pull" to merge the remote branch into yours)

 Changes to be committed:
	modified:   include/eosString.h
	new file:   include/rigakuImage.h
	modified:   src/Objects/DataManip/.Source
	modified:   src/Objects/DataManip/Makefile
	new file:   src/Objects/DataManip/rigakuImage/.Source

diff --git a/include/eosString.h b/include/eosString.h
index 2da0485..241be43 100644 (file)
--- a/include/eosString.h
+++ b/include/eosString.h
@@ -39,6 +39,7 @@ extern long   stringGetIntegerDataFromField(char* s, long init, long end);
 
 extern long stringIsSame(String s1, String s2, long n);
 
+extern String stringDefinedValueGet(String s, String key, String separater);
 extern long stringLength(String s);
 extern long stringCopy(String dst, String src, long n);
 extern String stringDuplicate(String src);

diff --git a/include/rigakuImage.h b/include/rigakuImage.h
new file mode 100644 (file)
index 0000000..aec469a
--- /dev/null
+++ b/include/rigakuImage.h
@@ -0,0 +1,70 @@
+/*
+# rigakuImage.h : $Revision$  
+# $Date$ 
+# Created by $Author$
+# Usage : rigakuImage.h 
+# Attention
+#   $Loccker$
+#      $State$ 
+#
+*/
+/* $Log$ */
+#ifndef RIGAKU_IMAGE_H
+#define RIGAKU_IMAGE_H
+
+#include <stdio.h>
+#include "mrcImage.h"
+
+/* constant begin */
+
+
+/* constant end */
+
+/* struct begin */
+
+typedef struct riggkuTag rigakuTag;
+
+struct rigakuTag {
+    char* tag;
+    char* content;
+    rigakuTag* next;
+}
+
+typedef struct rigakuImage {
+    int   HeaderBytes;
+    char* HeaderAll; 
+    rigakuTag*  startHeader; 
+    rigakuTag*  currentHeader; 
+
+    int dim;
+    int size1;
+    int size2;
+    int size3;
+    int dataType;
+    
+    void*  Image;
+    unsigned char*    integer1Image;
+    unsigned short*   integer2Image;
+    int*    integer4Image;
+    float*  real4Image;
+    double* real8Image;
+
+} rigakuImgae;
+
+/* struct end */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* prototype begin */
+
+
+
+/* prototype end */
+
+#ifdef __cplusplus
+};
+#endif
+
+#endif  /* XXXX */ 

diff --git a/src/Objects/DataManip/.Source b/src/Objects/DataManip/.Source
index ae87920..f274481 100644 (file)
--- a/src/Objects/DataManip/.Source
+++ b/src/Objects/DataManip/.Source
@@ -17,6 +17,7 @@ mapFile \
 mrcImage \
 mrcImageShape \
 pdbFile \
+rigakuImage \
 simulation \
 tgaFile \
 transform \

diff --git a/src/Objects/DataManip/Makefile b/src/Objects/DataManip/Makefile
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/src/Objects/DataManip/rigakuImage/.Source b/src/Objects/DataManip/rigakuImage/.Source
new file mode 100644 (file)
index 0000000..4d801af
--- /dev/null
+++ b/src/Objects/DataManip/rigakuImage/.Source
@@ -0,0 +1,5 @@
+SOURCE=\
+doc \
+inc \
+src \
+#LastSource