Bugfixed: YAML-format

	for dmInfo

diff --git a/bin/wish/Display2/tclIndex b/bin/wish/Display2/tclIndex
index a17e635..8fd9302 100644 (file)
--- a/bin/wish/Display2/tclIndex
+++ b/bin/wish/Display2/tclIndex
@@ -6,38 +6,41 @@
 # element name is the name of a command and the value is
 # a script that loads the command.
 
-set auto_index(roiAreaRotateStart) [list source [file join $dir RoiAreaRotate.wish]]
-set auto_index(roiAreaRotateMotion) [list source [file join $dir RoiAreaRotate.wish]]
-set auto_index(roiAreaRotateEnd) [list source [file join $dir RoiAreaRotate.wish]]
-set auto_index(rectangleRotate) [list source [file join $dir RoiAreaRotate.wish]]
-set auto_index(rectangleRotateCalc) [list source [file join $dir RoiAreaRotate.wish]]
-set auto_index(lineRotate) [list source [file join $dir RoiAreaRotate.wish]]
-set auto_index(lineRotateCalc) [list source [file join $dir RoiAreaRotate.wish]]
-set auto_index(splineRotate) [list source [file join $dir RoiAreaRotate.wish]]
-set auto_index(splineRotateCalc) [list source [file join $dir RoiAreaRotate.wish]]
-set auto_index(roiAreaSelectStart) [list source [file join $dir RoiAreaSelect.wish]]
-set auto_index(roiAreaSelectMotion) [list source [file join $dir RoiAreaSelect.wish]]
-set auto_index(roiAreaSelectEnd) [list source [file join $dir RoiAreaSelect.wish]]
-set auto_index(roiAreaSelectOK) [list source [file join $dir RoiAreaSelect.wish]]
+set auto_index(display2BindingSet) [list source [file join $dir Display2Binding.wish]]
 set auto_index(colormapChange) [list source [file join $dir Display2Colormap.wish]]
+set auto_index(display2DesktopSet) [list source [file join $dir Display2Desktop.wish]]
+set auto_index(display2ETCSet) [list source [file join $dir Display2ETCSet.wish]]
+set auto_index(fileOpenWinCreate) [list source [file join $dir Display2File.wish]]
+set auto_index(fileNewWinCreate) [list source [file join $dir Display2File.wish]]
+set auto_index(seqFileOpenWinCreate) [list source [file join $dir Display2File.wish]]
+set auto_index(seqFileNewWinCreate) [list source [file join $dir Display2File.wish]]
+set auto_index(fileOpen) [list source [file join $dir Display2Image.wish]]
+set auto_index(mainImagePut) [list source [file join $dir Display2Image.wish]]
+set auto_index(overviewImagePut) [list source [file join $dir Display2Image.wish]]
+set auto_index(histgramGraphCreate) [list source [file join $dir Display2Info.wish]]
+set auto_index(display2InformationWinCreate) [list source [file join $dir Display2Info.wish]]
+set auto_index(fileReopen) [list source [file join $dir Display2Info.wish]]
+set auto_index(mrcImageInformationWinCreate) [list source [file join $dir Display2Info.wish]]
+set auto_index(imageInformationWinCreate) [list source [file join $dir Display2Info.wish]]
+set auto_index(layerLineInformationWinCreate) [list source [file join $dir Display2Info.wish]]
+set auto_index(projectionInformationWinCreate) [list source [file join $dir Display2Info.wish]]
+set auto_index(sectionInformationWinCreate) [list source [file join $dir Display2Info.wish]]
+set auto_index(ctfInformationWinCreate) [list source [file join $dir Display2Info.wish]]
+set auto_index(unitCellInformationWinCreate) [list source [file join $dir Display2Info.wish]]
+set auto_index(scaleInfoWinCreate) [list source [file join $dir Display2Info.wish]]
+set auto_index(roiInformationWinCreate) [list source [file join $dir Display2InfoROI.wish]]
+set auto_index(roiLineInfoFrameCreate) [list source [file join $dir Display2InfoROI.wish]]
+set auto_index(roiSplineInfoFrameCreate) [list source [file join $dir Display2InfoROI.wish]]
+set auto_index(roiRectangleInfoFrameCreate) [list source [file join $dir Display2InfoROI.wish]]
+set auto_index(roiAnalysisFrameCreate) [list source [file join $dir Display2InfoROI.wish]]
+set auto_index(display2Init) [list source [file join $dir Display2Init.wish]]
+set auto_index(display2MenuSet) [list source [file join $dir Display2Menu.wish]]
+set auto_index(menuFileCreate) [list source [file join $dir Display2Menu.wish]]
+set auto_index(menuSeqFileCreate) [list source [file join $dir Display2Menu.wish]]
+set auto_index(menuWindowCreate) [list source [file join $dir Display2Menu.wish]]
+set auto_index(menuInfoCreate) [list source [file join $dir Display2Menu.wish]]
+set auto_index(menuHelpCreate) [list source [file join $dir Display2Menu.wish]]
 set auto_index(display2MenuSet2) [list source [file join $dir Display2Menu2.wish]]
-set auto_index(fft2dCmd) [list source [file join $dir fft2dCmd.wish]]
-set auto_index(display2BindingSet) [list source [file join $dir Display2Binding.wish]]
-set auto_index(roiMultiAreaInfoSave) [list source [file join $dir RoiAreaFile.wish]]
-set auto_index(roiMultiAreaInfoLoad) [list source [file join $dir RoiAreaFile.wish]]
-set auto_index(roiAreaFileSave) [list source [file join $dir RoiAreaFile.wish]]
-set auto_index(roiAreaFFT) [list source [file join $dir RoiAreaUtil.wish]]
-set auto_index(splineNearPoint) [list source [file join $dir RoiAreaUtil.wish]]
-set auto_index(rectangleNearPoint) [list source [file join $dir RoiAreaUtil.wish]]
-set auto_index(lineNearPoint) [list source [file join $dir RoiAreaUtil.wish]]
-set auto_index(pointDistance) [list source [file join $dir RoiAreaUtil.wish]]
-set auto_index(pointDistance2) [list source [file join $dir RoiAreaUtil.wish]]
-set auto_index(vectorAngle) [list source [file join $dir RoiAreaUtil.wish]]
-set auto_index(coordGetInMainImageToReal) [list source [file join $dir RoiAreaUtil.wish]]
-set auto_index(coordGetInMainImageToCanvas) [list source [file join $dir RoiAreaUtil.wish]]
-set auto_index(dataGetInMainImageToReal) [list source [file join $dir RoiAreaUtil.wish]]
-set auto_index(dataGetInMainImageToCanvas) [list source [file join $dir RoiAreaUtil.wish]]
-set auto_index(pointSet) [list source [file join $dir RoiAreaUtil.wish]]
 set auto_index(roiRelatedObjectRecreate) [list source [file join $dir Display2MenuROI.wish]]
 set auto_index(menuRoiCreate) [list source [file join $dir Display2MenuROI.wish]]
 set auto_index(menuRoiCancelCommand) [list source [file join $dir Display2MenuROI.wish]]
@@ -46,42 +49,15 @@ set auto_index(menuMultiRoiOKCommand) [list source [file join $dir Display2MenuR
 set auto_index(menuMultiRoiAllDeleteCommand) [list source [file join $dir Display2MenuROI.wish]]
 set auto_index(menuMultiRoiDeleteCommand) [list source [file join $dir Display2MenuROI.wish]]
 set auto_index(menuEditCreate) [list source [file join $dir Display2MenuROI.wish]]
-<<<<<<< HEAD
-set auto_index(display2Init) [list source [file join $dir Display2Init.wish]]
-set auto_index(display2MenuSet) [list source [file join $dir Display2Menu.wish]]
-set auto_index(menuFileCreate) [list source [file join $dir Display2Menu.wish]]
-set auto_index(menuSeqFileCreate) [list source [file join $dir Display2Menu.wish]]
-set auto_index(menuWindowCreate) [list source [file join $dir Display2Menu.wish]]
-set auto_index(menuInfoCreate) [list source [file join $dir Display2Menu.wish]]
-set auto_index(menuHelpCreate) [list source [file join $dir Display2Menu.wish]]
-set auto_index(roiAreaResizeStart) [list source [file join $dir RoiAreaResize.wish]]
-set auto_index(roiAreaResizeMotion) [list source [file join $dir RoiAreaResize.wish]]
-set auto_index(roiAreaResizeEnd) [list source [file join $dir RoiAreaResize.wish]]
-set auto_index(rectangleResize) [list source [file join $dir RoiAreaResize.wish]]
-set auto_index(rectangleResizeCalc) [list source [file join $dir RoiAreaResize.wish]]
-set auto_index(lineResize) [list source [file join $dir RoiAreaResize.wish]]
-set auto_index(splineResize) [list source [file join $dir RoiAreaResize.wish]]
-=======
 set auto_index(fft2dCmd) [list source [file join $dir fft2dCmd.wish]]
->>>>>>> FETCH_HEAD
 set auto_index(layerLineRecreate) [list source [file join $dir LayerLineUtil.wish]]
 set auto_index(layerLineCreate) [list source [file join $dir LayerLineUtil.wish]]
 set auto_index(layerLineClear) [list source [file join $dir LayerLineUtil.wish]]
 set auto_index(layerLineChange) [list source [file join $dir LayerLineUtil.wish]]
-set auto_index(histgramGraphCreate) [list source [file join $dir Display2Info.wish]]
-set auto_index(display2InformationWinCreate) [list source [file join $dir Display2Info.wish]]
-set auto_index(fileReopen) [list source [file join $dir Display2Info.wish]]
-set auto_index(mrcImageInformationWinCreate) [list source [file join $dir Display2Info.wish]]
-set auto_index(imageInformationWinCreate) [list source [file join $dir Display2Info.wish]]
-set auto_index(layerLineInformationWinCreate) [list source [file join $dir Display2Info.wish]]
-set auto_index(projectionInformationWinCreate) [list source [file join $dir Display2Info.wish]]
-set auto_index(sectionInformationWinCreate) [list source [file join $dir Display2Info.wish]]
-set auto_index(ctfInformationWinCreate) [list source [file join $dir Display2Info.wish]]
-set auto_index(unitCellInformationWinCreate) [list source [file join $dir Display2Info.wish]]
-set auto_index(scaleInfoWinCreate) [list source [file join $dir Display2Info.wish]]
-set auto_index(roiAreaZoomIn) [list source [file join $dir RoiAreaZoom.wish]]
-set auto_index(roiAreaZoomOut) [list source [file join $dir RoiAreaZoom.wish]]
-set auto_index(roiAreaZoom) [list source [file join $dir RoiAreaZoom.wish]]
+set auto_index(projectionRecreate) [list source [file join $dir ProjectionUtil.wish]]
+set auto_index(projectionCreate) [list source [file join $dir ProjectionUtil.wish]]
+set auto_index(projectionClear) [list source [file join $dir ProjectionUtil.wish]]
+set auto_index(projectionChange) [list source [file join $dir ProjectionUtil.wish]]
 set auto_index(roiAreaCreateStart) [list source [file join $dir RoiAreaCreate.wish]]
 set auto_index(roiAreaCreateMotion) [list source [file join $dir RoiAreaCreate.wish]]
 set auto_index(roiAreaCreateEnd) [list source [file join $dir RoiAreaCreate.wish]]
@@ -99,29 +75,54 @@ set auto_index(roiSplineEnd) [list source [file join $dir RoiAreaCreate.wish]]
 set auto_index(splineCreate) [list source [file join $dir RoiAreaCreate.wish]]
 set auto_index(knobShow) [list source [file join $dir RoiAreaCreate.wish]]
 set auto_index(knobHide) [list source [file join $dir RoiAreaCreate.wish]]
-set auto_index(fileOpenWinCreate) [list source [file join $dir Display2File.wish]]
-set auto_index(fileNewWinCreate) [list source [file join $dir Display2File.wish]]
-set auto_index(seqFileOpenWinCreate) [list source [file join $dir Display2File.wish]]
-set auto_index(seqFileNewWinCreate) [list source [file join $dir Display2File.wish]]
-set auto_index(ScaleRecreate) [list source [file join $dir ScaleUtil.wish]]
-set auto_index(ScaleCreate) [list source [file join $dir ScaleUtil.wish]]
-set auto_index(ScaleClear) [list source [file join $dir ScaleUtil.wish]]
-set auto_index(ScaleChange) [list source [file join $dir ScaleUtil.wish]]
-set auto_index(unitCellRecreate) [list source [file join $dir UnitCell.wish]]
-set auto_index(fileOpen) [list source [file join $dir Display2Image.wish]]
-set auto_index(mainImagePut) [list source [file join $dir Display2Image.wish]]
-set auto_index(overviewImagePut) [list source [file join $dir Display2Image.wish]]
+set auto_index(roiMultiAreaInfoSave) [list source [file join $dir RoiAreaFile.wish]]
+set auto_index(roiMultiAreaInfoLoad) [list source [file join $dir RoiAreaFile.wish]]
+set auto_index(roiAreaFileSave) [list source [file join $dir RoiAreaFile.wish]]
 set auto_index(roiAreaMoveStart) [list source [file join $dir RoiAreaMove.wish]]
 set auto_index(roiAreaMoveMotion) [list source [file join $dir RoiAreaMove.wish]]
 set auto_index(roiAreaMoveEnd) [list source [file join $dir RoiAreaMove.wish]]
 set auto_index(rectangleMove) [list source [file join $dir RoiAreaMove.wish]]
 set auto_index(lineMove) [list source [file join $dir RoiAreaMove.wish]]
 set auto_index(splineMove) [list source [file join $dir RoiAreaMove.wish]]
-set auto_index(roiInformationWinCreate) [list source [file join $dir Display2InfoROI.wish]]
-set auto_index(roiLineInfoFrameCreate) [list source [file join $dir Display2InfoROI.wish]]
-set auto_index(roiSplineInfoFrameCreate) [list source [file join $dir Display2InfoROI.wish]]
-set auto_index(roiRectangleInfoFrameCreate) [list source [file join $dir Display2InfoROI.wish]]
-set auto_index(roiAnalysisFrameCreate) [list source [file join $dir Display2InfoROI.wish]]
+set auto_index(roiAreaResizeStart) [list source [file join $dir RoiAreaResize.wish]]
+set auto_index(roiAreaResizeMotion) [list source [file join $dir RoiAreaResize.wish]]
+set auto_index(roiAreaResizeEnd) [list source [file join $dir RoiAreaResize.wish]]
+set auto_index(rectangleResize) [list source [file join $dir RoiAreaResize.wish]]
+set auto_index(rectangleResizeCalc) [list source [file join $dir RoiAreaResize.wish]]
+set auto_index(lineResize) [list source [file join $dir RoiAreaResize.wish]]
+set auto_index(splineResize) [list source [file join $dir RoiAreaResize.wish]]
+set auto_index(roiAreaRotateStart) [list source [file join $dir RoiAreaRotate.wish]]
+set auto_index(roiAreaRotateMotion) [list source [file join $dir RoiAreaRotate.wish]]
+set auto_index(roiAreaRotateEnd) [list source [file join $dir RoiAreaRotate.wish]]
+set auto_index(rectangleRotate) [list source [file join $dir RoiAreaRotate.wish]]
+set auto_index(rectangleRotateCalc) [list source [file join $dir RoiAreaRotate.wish]]
+set auto_index(lineRotate) [list source [file join $dir RoiAreaRotate.wish]]
+set auto_index(lineRotateCalc) [list source [file join $dir RoiAreaRotate.wish]]
+set auto_index(splineRotate) [list source [file join $dir RoiAreaRotate.wish]]
+set auto_index(splineRotateCalc) [list source [file join $dir RoiAreaRotate.wish]]
+set auto_index(roiAreaSelectStart) [list source [file join $dir RoiAreaSelect.wish]]
+set auto_index(roiAreaSelectMotion) [list source [file join $dir RoiAreaSelect.wish]]
+set auto_index(roiAreaSelectEnd) [list source [file join $dir RoiAreaSelect.wish]]
+set auto_index(roiAreaSelectOK) [list source [file join $dir RoiAreaSelect.wish]]
+set auto_index(roiAreaFFT) [list source [file join $dir RoiAreaUtil.wish]]
+set auto_index(splineNearPoint) [list source [file join $dir RoiAreaUtil.wish]]
+set auto_index(rectangleNearPoint) [list source [file join $dir RoiAreaUtil.wish]]
+set auto_index(lineNearPoint) [list source [file join $dir RoiAreaUtil.wish]]
+set auto_index(pointDistance) [list source [file join $dir RoiAreaUtil.wish]]
+set auto_index(pointDistance2) [list source [file join $dir RoiAreaUtil.wish]]
+set auto_index(vectorAngle) [list source [file join $dir RoiAreaUtil.wish]]
+set auto_index(coordGetInMainImageToReal) [list source [file join $dir RoiAreaUtil.wish]]
+set auto_index(coordGetInMainImageToCanvas) [list source [file join $dir RoiAreaUtil.wish]]
+set auto_index(dataGetInMainImageToReal) [list source [file join $dir RoiAreaUtil.wish]]
+set auto_index(dataGetInMainImageToCanvas) [list source [file join $dir RoiAreaUtil.wish]]
+set auto_index(pointSet) [list source [file join $dir RoiAreaUtil.wish]]
+set auto_index(roiAreaZoomIn) [list source [file join $dir RoiAreaZoom.wish]]
+set auto_index(roiAreaZoomOut) [list source [file join $dir RoiAreaZoom.wish]]
+set auto_index(roiAreaZoom) [list source [file join $dir RoiAreaZoom.wish]]
+set auto_index(ScaleRecreate) [list source [file join $dir ScaleUtil.wish]]
+set auto_index(ScaleCreate) [list source [file join $dir ScaleUtil.wish]]
+set auto_index(ScaleClear) [list source [file join $dir ScaleUtil.wish]]
+set auto_index(ScaleChange) [list source [file join $dir ScaleUtil.wish]]
 set auto_index(sectionInit) [list source [file join $dir SectionUtil.wish]]
 set auto_index(sectionRecreateAll) [list source [file join $dir SectionUtil.wish]]
 set auto_index(sectionRecreate) [list source [file join $dir SectionUtil.wish]]

diff --git a/include/dmFile.h b/include/dmFile.h
index 5d0391c..c68ef96 100644 (file)
--- a/include/dmFile.h
+++ b/include/dmFile.h
@@ -115,13 +115,13 @@ typedef struct dmFile3Header {
        dmFileInteger4 version;
        dmFileInteger4 rootLength;
        dmFileInteger4 byteOrder;
-} dmFile3Header;
+} __attribute__((__packed__)) dmFile3Header;
 
 typedef struct dmFile4Header {
        dmFileInteger4 version;
        dmFileInteger8 rootLength;
        dmFileInteger4 byteOrder;
-} dmFile4Header;
+} __attribute__((__packed__)) dmFile4Header;
 
 typedef struct dmFile3TagDirectory dmFile3TagDirectory;
 typedef struct dmFile4TagDirectory dmFile4TagDirectory; 
@@ -132,7 +132,7 @@ typedef struct dmFile3Tag {
        dmFileInteger2 tagNameLength; // Bytes
        char*          tagName;
        // Tag
-       dmFileInteger1 seperator[4];
+       char           seperator[4];
        dmFileInteger4 ninfo; 
        dmFileInteger4* info; 
        void*           value;  // Array or value 
@@ -148,7 +148,7 @@ typedef struct dmFile4Tag {
        char*          tagName;
        dmFileInteger8 tagLength;
        // Tag
-       dmFileInteger1 seperator[4];
+       char           seperator[4];
        dmFileInteger8 ninfo; 
        dmFileInteger8* info; 
        void*           value;  // Array or value 
@@ -183,6 +183,10 @@ typedef struct dmFile {
        dmFile4TagDirectory RootTag4;
        // Tail
        dmFileInteger8 Tail;
+
+       // 
+       mrcImage thumnail;
+       mrcImage image;
 } dmFile;
 
 /* struct end */
@@ -228,6 +232,11 @@ extern void dmFileValuePrint(FILE* fpt, void* value, dmFileTagDataType valueType
 
 // in dm2mrc.c 
 extern void ldm2mrc(mrcImage* mrc, dmFile* dm, int mode);
+extern void dmFile3TagDirectory2mrc(dmFile* fpt, dmFile3TagDirectory tagDir, int layer, int mode);
+extern void dmFile4TagDirectory2mrc(dmFile* fpt, dmFile4TagDirectory tagDir, int layer, int mode);
+
+// in dmFileInit.c
+extern void dmFileInit(dmFile* dm, int mode);
 
 /* prototype end */
 

diff --git a/src/Objects/DataManip/dmFile/doc/dmFile.html b/src/Objects/DataManip/dmFile/doc/dmFile.html
index 4084632..95ecc93 100644 (file)
--- a/src/Objects/DataManip/dmFile/doc/dmFile.html
+++ b/src/Objects/DataManip/dmFile/doc/dmFile.html
@@ -3,13 +3,6 @@
 <H2>Information from source codes</H2>
 </A>
 <PRE>
-../src/dmFileInfo.c:
-
-../src/dmFileRead.c:
-
-../src/dmFileUtil.c:
-
-../src/ldm2mrc.c:
 </PRE>
 <HR>
 <A NAME="include">
@@ -133,13 +126,13 @@ typedef struct dmFile3Header {
        dmFileInteger4 version;
        dmFileInteger4 rootLength;
        dmFileInteger4 byteOrder;
-} dmFile3Header;
+} __attribute__((__packed__)) dmFile3Header;
 
 typedef struct dmFile4Header {
        dmFileInteger4 version;
        dmFileInteger8 rootLength;
        dmFileInteger4 byteOrder;
-} dmFile4Header;
+} __attribute__((__packed__)) dmFile4Header;
 
 typedef struct dmFile3TagDirectory dmFile3TagDirectory;
 typedef struct dmFile4TagDirectory dmFile4TagDirectory; 
@@ -150,7 +143,7 @@ typedef struct dmFile3Tag {
        dmFileInteger2 tagNameLength; // Bytes
        char*          tagName;
        // Tag
-       dmFileInteger1 seperator[4];
+       char           seperator[4];
        dmFileInteger4 ninfo; 
        dmFileInteger4* info; 
        void*           value;  // Array or value 
@@ -166,7 +159,7 @@ typedef struct dmFile4Tag {
        char*          tagName;
        dmFileInteger8 tagLength;
        // Tag
-       dmFileInteger1 seperator[4];
+       char           seperator[4];
        dmFileInteger8 ninfo; 
        dmFileInteger8* info; 
        void*           value;  // Array or value 
@@ -201,6 +194,10 @@ typedef struct dmFile {
        dmFile4TagDirectory RootTag4;
        // Tail
        dmFileInteger8 Tail;
+
+       // 
+       mrcImage thumnail;
+       mrcImage image;
 } dmFile;
 
 /* struct end */
@@ -246,6 +243,11 @@ extern void dmFileValuePrint(FILE* fpt, void* value, dmFileTagDataType valueType
 
 // in dm2mrc.c 
 extern void ldm2mrc(mrcImage* mrc, dmFile* dm, int mode);
+extern void dmFile3TagDirectory2mrc(dmFile* fpt, dmFile3TagDirectory tagDir, int layer, int mode);
+extern void dmFile4TagDirectory2mrc(dmFile* fpt, dmFile4TagDirectory tagDir, int layer, int mode);
+
+// in dmFileInit.c
+extern void dmFileInit(dmFile* dm, int mode);
 
 /* prototype end */
 

diff --git a/src/Objects/DataManip/dmFile/inc/dmFile.h b/src/Objects/DataManip/dmFile/inc/dmFile.h
index 5d0391c..c68ef96 100644 (file)
--- a/src/Objects/DataManip/dmFile/inc/dmFile.h
+++ b/src/Objects/DataManip/dmFile/inc/dmFile.h
@@ -115,13 +115,13 @@ typedef struct dmFile3Header {
        dmFileInteger4 version;
        dmFileInteger4 rootLength;
        dmFileInteger4 byteOrder;
-} dmFile3Header;
+} __attribute__((__packed__)) dmFile3Header;
 
 typedef struct dmFile4Header {
        dmFileInteger4 version;
        dmFileInteger8 rootLength;
        dmFileInteger4 byteOrder;
-} dmFile4Header;
+} __attribute__((__packed__)) dmFile4Header;
 
 typedef struct dmFile3TagDirectory dmFile3TagDirectory;
 typedef struct dmFile4TagDirectory dmFile4TagDirectory; 
@@ -132,7 +132,7 @@ typedef struct dmFile3Tag {
        dmFileInteger2 tagNameLength; // Bytes
        char*          tagName;
        // Tag
-       dmFileInteger1 seperator[4];
+       char           seperator[4];
        dmFileInteger4 ninfo; 
        dmFileInteger4* info; 
        void*           value;  // Array or value 
@@ -148,7 +148,7 @@ typedef struct dmFile4Tag {
        char*          tagName;
        dmFileInteger8 tagLength;
        // Tag
-       dmFileInteger1 seperator[4];
+       char           seperator[4];
        dmFileInteger8 ninfo; 
        dmFileInteger8* info; 
        void*           value;  // Array or value 
@@ -183,6 +183,10 @@ typedef struct dmFile {
        dmFile4TagDirectory RootTag4;
        // Tail
        dmFileInteger8 Tail;
+
+       // 
+       mrcImage thumnail;
+       mrcImage image;
 } dmFile;
 
 /* struct end */
@@ -228,6 +232,11 @@ extern void dmFileValuePrint(FILE* fpt, void* value, dmFileTagDataType valueType
 
 // in dm2mrc.c 
 extern void ldm2mrc(mrcImage* mrc, dmFile* dm, int mode);
+extern void dmFile3TagDirectory2mrc(dmFile* fpt, dmFile3TagDirectory tagDir, int layer, int mode);
+extern void dmFile4TagDirectory2mrc(dmFile* fpt, dmFile4TagDirectory tagDir, int layer, int mode);
+
+// in dmFileInit.c
+extern void dmFileInit(dmFile* dm, int mode);
 
 /* prototype end */
 

diff --git a/src/Objects/DataManip/dmFile/src/dmFileInfo.c b/src/Objects/DataManip/dmFile/src/dmFileInfo.c
index 3868b13..f8a0a25 100644 (file)
--- a/src/Objects/DataManip/dmFile/src/dmFileInfo.c
+++ b/src/Objects/DataManip/dmFile/src/dmFileInfo.c
@@ -44,18 +44,18 @@ dmFileInfo(FILE* fpt, dmFile dm, int mode)
 void
 dmFileHeaderInfo(FILE* fpt, dmFile dm, int mode)
 {
-
+       fprintf(fpt, "header: \n");
        switch(dm.version) {
                case 3: {
-                       fprintf(fpt, "version: %d\n", dm.Header3.version);
-                       fprintf(fpt, "RootLength: %d\n", dm.Header3.rootLength);
-                       fprintf(fpt, "ByteOrder: %d\n", dm.Header3.byteOrder);
+                       fprintf(fpt, " version: %d\n", dm.Header3.version);
+                       fprintf(fpt, " RootLength: %d\n", dm.Header3.rootLength);
+                       fprintf(fpt, " ByteOrder: %d\n", dm.Header3.byteOrder);
                        break;
                }
                case 4: {
-                       fprintf(fpt, "version: %d\n", dm.Header4.version);
-                       fprintf(fpt, "RootLength: %lld\n", dm.Header4.rootLength);
-                       fprintf(fpt, "ByteOrder: %d\n", dm.Header4.byteOrder);
+                       fprintf(fpt, " version: %d\n", dm.Header4.version);
+                       fprintf(fpt, " RootLength: %lld\n", dm.Header4.rootLength);
+                       fprintf(fpt, " ByteOrder: %d\n", dm.Header4.byteOrder);
                        break;
                }
                default: {
@@ -83,19 +83,19 @@ dmFile3TagDirectoryInfo(FILE* fpt, dmFile3TagDirectory tagDir, int layer, int mo
                        fprintf(fpt, "%sclosef: %d\n", nest, tagDir.closef);
                        fprintf(fpt, "%snumberOfTags: %d\n", nest, tagDir.numberOfTags);
                        for(i=0; i<tagDir.numberOfTags; i++) {
-                               fprintf(fpt, "%s- %d\n", nest, i); 
-                               fprintf(fpt, "%stagID: %s \n",  nest, __dmFileTagDirTypeChar[tagDir.Tags[i].tagID]);
+                               fprintf(fpt, "%s%d: \n", nest, i); 
+                               fprintf(fpt, "%s tagID: %s \n",  nest, __dmFileTagDirTypeChar[tagDir.Tags[i].tagID]);
                                if(0<tagDir.Tags[i].tagNameLength) {
-                                       fprintf(fpt, "%stagName: %s\n", nest, tagDir.Tags[i].tagName);
+                                       fprintf(fpt, "%s tagName: %s\n", nest, tagDir.Tags[i].tagName);
                                }
                                switch(tagDir.Tags[i].tagID) {
                                        case dmFileTagDirTypeTagDir: {
-                                               fprintf(fpt, "%s- \n", nest); 
-                                               dmFile3TagDirectoryInfo(fpt, *(tagDir.Tags[i].tagDir), layer+1, mode);
+                                               fprintf(fpt, "%s TagDir: \n", nest); 
+                                               dmFile3TagDirectoryInfo(fpt, *(tagDir.Tags[i].tagDir), layer+2, mode);
                                                break;
                                        }
                                        case dmFileTagDirTypeTag: {
-                                               dmFile3TagInfo(fpt, tagDir.Tags[i], layer, mode);
+                                               dmFile3TagInfo(fpt, tagDir.Tags[i], layer+1, mode);
                                                break;
                                        }
                                        case dmFileTagDirTypeFileEnd: {
@@ -113,18 +113,18 @@ dmFile3TagDirectoryInfo(FILE* fpt, dmFile3TagDirectory tagDir, int layer, int mo
                case 1: {
                        fprintf(fpt, "%snumberOfTags: %d\n", nest, tagDir.numberOfTags);
                        for(i=0; i<tagDir.numberOfTags; i++) {
-                               fprintf(fpt, "%s- %d\n", nest, i); 
+                               fprintf(fpt, "%s%d: \n", nest, i); 
                                if(0<tagDir.Tags[i].tagNameLength) {
-                                       fprintf(fpt, "%s%s: %s\n", nest, __dmFileTagDirTypeChar[tagDir.Tags[i].tagID], tagDir.Tags[i].tagName);
+                                       fprintf(fpt, "%s %s: %s\n", nest, __dmFileTagDirTypeChar[tagDir.Tags[i].tagID], tagDir.Tags[i].tagName);
                                }
                                switch(tagDir.Tags[i].tagID) {
                                        case dmFileTagDirTypeTagDir: {
-                                               fprintf(fpt, "%s- \n", nest); 
-                                               dmFile3TagDirectoryInfo(fpt, *(tagDir.Tags[i].tagDir), layer+1, mode);
+                                               fprintf(fpt, "%s TagDir: \n", nest); 
+                                               dmFile3TagDirectoryInfo(fpt, *(tagDir.Tags[i].tagDir), layer+2, mode);
                                                break;
                                        }
                                        case dmFileTagDirTypeTag: {
-                                               dmFile3TagInfo(fpt, tagDir.Tags[i], layer, mode);
+                                               dmFile3TagInfo(fpt, tagDir.Tags[i], layer+1, mode);
                                                break;
                                        }
                                        case dmFileTagDirTypeFileEnd: {

diff --git a/src/Objects/DataManip/dmFile/src/dmFileInit.c b/src/Objects/DataManip/dmFile/src/dmFileInit.c
new file mode 100644 (file)
index 0000000..f2258e2
--- /dev/null
+++ b/src/Objects/DataManip/dmFile/src/dmFileInit.c
@@ -0,0 +1,20 @@
+/*
+# %M% %Y% %I%
+# The latest update : %G% at %U%
+#
+#%Z% dmFileInit ver %I%
+#%Z% Created by 
+#%Z%
+#%Z% Usage : dmFileInit 
+#%Z% Attention
+#%Z%
+*/
+static char __sccs_id[] = "%Z%dmFileInit ver%I%; Date:%D% %Z%";
+
+#include "../inc/dmFile.h"
+void
+dmFileInit(dmFile* dm, int mode)
+{
+       mrcDefaultHeaderValueSet(&dm->thumnail);
+       mrcDefaultHeaderValueSet(&dm->image);
+}

diff --git a/src/Objects/DataManip/dmFile/src/dmFileRead.c b/src/Objects/DataManip/dmFile/src/dmFileRead.c
index 66cbe4b..da4eaba 100644 (file)
--- a/src/Objects/DataManip/dmFile/src/dmFileRead.c
+++ b/src/Objects/DataManip/dmFile/src/dmFileRead.c
@@ -23,6 +23,7 @@ dmFileRead(FILE* fpt, dmFile* dm, char* message, int mode)
        dmFile3Tag* dmTag3;
        dmFile4Tag* dmTag4;
 
+       dmFileInit(dm, 0);
        dmFileHeaderTailRead(fpt, dm, message, mode);
 
        switch(dm->version) {
@@ -381,7 +382,7 @@ dmFile3TagRead(FILE* fpt, dmFile3Tag* dmTag, char* message, int mode)
                                //memoryByteSwap(dmTag->value2[j], __dmFileTagDataTypeSize[dmTag->info[2*j+4]], 1);             
 #endif 
 #ifdef DEBUG2
-                               dmFileValuePrint(stderr, dmTag->value2[j], __dmFileTagDataTypeSize[dmTag->info[2*j+4]], 1); 
+                               //dmFileValuePrint(stderr, dmTag->value2[j], __dmFileTagDataTypeSize[dmTag->info[2*j+4]], 1); 
 #endif
                        }
                        break;
@@ -408,7 +409,7 @@ dmFile3TagRead(FILE* fpt, dmFile3Tag* dmTag, char* message, int mode)
                                                //memoryByteSwap(dmTag->value3[j], __dmFileTagDataTypeSize[dmTag->info[2*j+5]], dmTag->info[2*dmTag->info[3] + 4]);             
 #endif 
 #ifdef DEBUG2
-                                               dmFileValuePrint(stderr, &(dmTag->value3[j]), dmTag->info[2*j+5], MIN(16,dmTag->info[2*dmTag->info[3] + 4])); 
+                                               //dmFileValuePrint(stderr, &(dmTag->value3[j]), dmTag->info[2*j+5], MIN(16,dmTag->info[2*dmTag->info[3] + 4])); 
 #endif
                                        }
                                        break;
@@ -425,10 +426,10 @@ dmFile3TagRead(FILE* fpt, dmFile3Tag* dmTag, char* message, int mode)
                                                //memoryByteSwap(dmTag->value, __dmFileTagDataTypeSize[dmTag->info[1]], dmTag->info[2]);                
 #endif 
 #ifdef DEBUG2
-                                               dmFileValuePrint(stderr, dmTag->value, dmTag->info[1], MIN(16,dmTag->info[2])); 
+                                               //dmFileValuePrint(stderr, dmTag->value, dmTag->info[1], MIN(16,dmTag->info[2])); 
 #endif
                                        } else {
-                                               fprintf(stderr, "Not supported array size: %d\n", dmTag->info[2]);
+                                               fprintf(stderr, "Array size is less than 1: %d\n", dmTag->info[2]);
                                        }
                                        break;
                                }
@@ -441,7 +442,7 @@ dmFile3TagRead(FILE* fpt, dmFile3Tag* dmTag, char* message, int mode)
 #ifdef II
                        //memoryByteSwap(dmTag->value, __dmFileTagDataTypeSize[dmTag->info[0]], 1);             
 #endif 
-                       dmFileValuePrint(stderr, dmTag->value, dmTag->info[0], 1); 
+                       //dmFileValuePrint(stderr, dmTag->value, dmTag->info[0], 1); 
                        //fprintf(stderr, "Not supported tagType: %d\n", dmTag->info[j]);
                        break;
                }
@@ -555,8 +556,10 @@ dmFile4TagRead(FILE* fpt, dmFile4Tag* dmTag, char* message, int mode)
 #ifdef II
                        //memoryByteSwap(dmTag->value, __dmFileTagDataTypeSize[dmTag->info[0]], 1);             
 #endif 
+#ifdef DEBUG2
                        dmFileValuePrint(stderr, dmTag->value, dmTag->info[0], 1); 
                        //fprintf(stderr, "Not supported tagType: %d\n", dmTag->info[j]);
+#endif
                        break;
                }
        }

diff --git a/src/Objects/DataManip/dmFile/src/dmFileUtil.c b/src/Objects/DataManip/dmFile/src/dmFileUtil.c
index 2043bc3..432deb8 100644 (file)
--- a/src/Objects/DataManip/dmFile/src/dmFileUtil.c
+++ b/src/Objects/DataManip/dmFile/src/dmFileUtil.c
@@ -14,7 +14,7 @@ static char __sccs_id[] = "%Z%dmFileUtil ver%I%; Date:%D% %Z%";
 #include <wchar.h>
 #include <stdlib.h>
 
-#define DEBUG
+#undef DEBUG
 
 #include "genUtil.h"
 #include "../inc/dmFile.h"

diff --git a/src/Objects/DataManip/dmFile/src/ldm2mrc.c b/src/Objects/DataManip/dmFile/src/ldm2mrc.c
index e5ceea0..c5d1461 100644 (file)
--- a/src/Objects/DataManip/dmFile/src/ldm2mrc.c
+++ b/src/Objects/DataManip/dmFile/src/ldm2mrc.c
@@ -10,10 +10,118 @@
 #%Z%
 */
 static char __sccs_id[] = "%Z%ldm2mrc ver%I%; Date:%D% %Z%";
-
+#include <stdio.h>
+#include <stdlib.h>
+#define DEBUG
+#include "genUtil.h"
 #include "../inc/dmFile.h"
 
 void
-dm2mrc(mrcImage* mrc, dmFile* dm, int mode)
+ldm2mrc(mrcImage* mrc, dmFile* dm, int mode)
+{
+       switch(dm->version) {
+               case 3: {
+                       dmFile3TagDirectory2mrc(dm, dm->RootTag3, 0, mode);
+                       break;
+               }
+               case 4: {
+                       dmFile4TagDirectory2mrc(dm, dm->RootTag4, 0, mode);
+                       break;
+               }
+               default: {
+                       fprintf(stderr, "%d: Not supported version\n", dm->version);
+                       break;
+               }
+
+       }
+}
+
+void
+dmFile3TagDirectory2mrc(dmFile* dm, dmFile3TagDirectory tagDir, int layer, int mode)
+{
+       int i, j, k;
+       char nest[1024];
+       dmFile3TagDirectory* curDir; 
+       mrcImage* curImage;
+
+       //fprintf(fpt, "%snumberOfTags: %lld\n", nest, tagDir.numberOfTags);
+       for(i=0; i<tagDir.numberOfTags; i++) {
+               if(0<tagDir.Tags[i].tagNameLength) {
+                       // ImageList
+                       if(0==strncmp("ImageList", tagDir.Tags[i].tagName, tagDir.Tags[i].tagNameLength)) {
+                               for(j=0; j<tagDir.Tags[i].tagDir->numberOfTags; j++) { 
+                                       fprintf(stderr, "-%d: %s\n", j, tagDir.Tags[i].tagDir->Tags[j].tagName); 
+                                       for(k=0; k<tagDir.Tags[i].tagDir->Tags[j].tagDir->numberOfTags; k++) { 
+                                               fprintf(stderr, "--%d: %s\n", j, tagDir.Tags[i].tagDir->Tags[j].tagDir->Tags[k].tagName); 
+                                       }
+                               }
+                               // ImageData    
+                               switch(mode) {
+                                       case 0: { // Raw Images
+                                               if(0==strncmp("ImageData", tagDir.Tags[i].tagDir->Tags[1].tagDir->Tags[0].tagName, tagDir.Tags[i].tagDir->Tags[1].tagDir->Tags[0].tagNameLength)) {
+                                                       curDir = tagDir.Tags[i].tagDir->Tags[1].tagDir->Tags[0].tagDir;
+                                                       curImage = &dm->image;
+                                               } else {
+                                                       fprintf(stderr, "Something wrong\n");
+                                                       exit(EXIT_FAILURE);
+                                               }
+                                               break;
+                                       }
+                                       case 1: { // Thumnail
+                                               if(0==strncmp("ImageData", tagDir.Tags[i].tagDir->Tags[0].tagDir->Tags[0].tagName, tagDir.Tags[i].tagDir->Tags[0].tagDir->Tags[0].tagNameLength)) {
+                                                       curDir = tagDir.Tags[i].tagDir->Tags[0].tagDir->Tags[0].tagDir;
+                                                       curImage = &dm->thumnail;
+                                               } else {
+                                                       fprintf(stderr, "Something wrong\n");
+                                                       exit(EXIT_FAILURE);
+                                               }
+                                               break;
+                                       }
+                               }
+                               for(j=0; j<curDir->numberOfTags; j++) {                         
+                                       DEBUGPRINT2("%d: %s\n", j, curDir->Tags[j].tagName);
+                                       SSWITCH(curDir->Tags[j].tagName)
+                                               SCASE("Dimensions") {
+                                                       //curImage->HeaderN.x = curDir->Tags[j].tagDir->Tags[0];                        
+                                                       //curImage->HeaderN.y = curDir->Tags[j].tagDir->Tags[1];                                
+                                                       //curImage->HeaderN.z = 1;                              
+                                                       SBREAK;
+                                               }
+                                               SDEFAULT {
+                                               }
+                                       SSWITCHEND      
+
+                                       //curImage->HeaderN.x =                                 
+                                       //curImage->HeaderN.y =                                 
+                                       //curImage->HeaderN.z =                                 
+
+                               }       
+                               return;
+                       }
+               }
+       }
+}
+
+void
+dmFile4TagDirectory2mrc(dmFile* dm, dmFile4TagDirectory tagDir, int layer, int mode)
 {
+
+       int i;
+       char nest[1024];
+
+       //fprintf(fpt, "%snumberOfTags: %lld\n", nest, tagDir.numberOfTags);
+
+       for(i=0; i<tagDir.numberOfTags; i++) {
+               if(0<tagDir.Tags[i].tagNameLength) {
+                       if(0==strncmp("ImageList", tagDir.Tags[i].tagName, tagDir.Tags[i].tagNameLength)) {
+                               // Thumnail
+                               fprintf(stderr, "%s\n", tagDir.Tags[i].tagDir->Tags[0].tagDir->Tags[0].tagName);
+
+                               // Raw Images
+                               fprintf(stderr, "%s\n", tagDir.Tags[i].tagDir->Tags[1].tagDir->Tags[0].tagName);
+                               return;
+                       }
+               }
+       }
 }
+

diff --git a/src/Tools/Config/Define.inc b/src/Tools/Config/Define.inc
index 3870150..bdf30d0 100755 (executable)
--- a/src/Tools/Config/Define.inc
+++ b/src/Tools/Config/Define.inc
@@ -582,3 +582,4 @@ WORLDNAME=Tools
 WORLDNAME=Tools
 WORLDNAME=Tools
 WORLDNAME=Tools
+WORLDNAME=Tools

diff --git a/src/Tools/Makefile b/src/Tools/Makefile
deleted file mode 100755 (executable)
index ad841104b1b4aa83ce554496adb2d2476544f988..0000000000000000000000000000000000000000
--- a/src/Tools/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-include ../Config/Define.inc
-include Config/Define.inc
-include .Source
-
-include Config/Target.inc

diff --git a/src/Tools/Makefile b/src/Tools/Makefile
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..80a2401a7dc3d8e1cdc121c22208bd28b6887cf3
--- /dev/null
+++ b/src/Tools/Makefile
@@ -0,0 +1 @@
+/Users/tacyas/Eos/src/Config/Template/ToolsHomeTemplate.Dir/Makefile
\ No newline at end of file

diff --git a/src/Tools/filter/dm2mrc/src/dm2mrc.c b/src/Tools/filter/dm2mrc/src/dm2mrc.c
index 67d1b89..52efd7b 100755 (executable)
--- a/src/Tools/filter/dm2mrc/src/dm2mrc.c
+++ b/src/Tools/filter/dm2mrc/src/dm2mrc.c
@@ -36,13 +36,20 @@ typedef enum ldm2mrcMode {
 int
 main(int argc, char* argv[]) 
 {
+       dmFile dm;
        dm2mrcInfo info;
+       mrcImage out;
+       mrcImage thumnail;
 
        init0(&info);
     argCheck(&info, argc, argv);
     init1(&info);
 
        DEBUGPRINT("Program Start\n");
+       
+       dmFileRead(info.fptIn, &dm, "in main", 0);
+       ldm2mrc(&out, &dm, 0);
+       ldm2mrc(&thumnail, &dm, 1);
 
        exit(EXIT_SUCCESS);
 }

diff --git a/src/Tools/filter/dmInfo/src/dmInfo.c b/src/Tools/filter/dmInfo/src/dmInfo.c
index 00c6e3f..b374e48 100755 (executable)
--- a/src/Tools/filter/dmInfo/src/dmInfo.c
+++ b/src/Tools/filter/dmInfo/src/dmInfo.c
@@ -15,7 +15,7 @@
 #define GLOBAL_DECLARATION
 #include "../inc/config.h"
 
-#define DEBUG
+#undef DEBUG
 #include "genUtil.h"
 #include "dmFile.h"
 
@@ -53,4 +53,6 @@ void
 additionalUsage()
 {
        fprintf(stderr, "----- Additional Usage -----\n");
+       fprintf(stderr, " -m 0 ; tagTerm: tagName/tagValue/.. etc \n");
+       fprintf(stderr, " -m 1 ; tagName: tagValue etc\n");
 }

diff --git a/src/Tools/filter/dmInfo/src/dmInfo.html b/src/Tools/filter/dmInfo/src/dmInfo.html
index d8c4247..241c430 100755 (executable)
--- a/src/Tools/filter/dmInfo/src/dmInfo.html
+++ b/src/Tools/filter/dmInfo/src/dmInfo.html
@@ -13,6 +13,8 @@ Options:
     [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
     [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
 ----- Additional Usage -----
+ -m 0 ; tagTerm: tagName/tagValue/.. etc 
+ -m 1 ; tagName: tagValue etc
 </PRE>
 </BODY>
 </HTML>

diff --git a/src/Tools/mrcImage/mrcImageShapeSearch/src/mrcImageShapeSearch.c b/src/Tools/mrcImage/mrcImageShapeSearch/src/mrcImageShapeSearch.c
index 935eeb1..890eff2 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageShapeSearch/src/mrcImageShapeSearch.c
+++ b/src/Tools/mrcImage/mrcImageShapeSearch/src/mrcImageShapeSearch.c
@@ -179,7 +179,7 @@ lmrcImageShapeSearch(mrcImage* out, mrcImage* in, lmrcImageShapeSearchInfo* linf
        }
 }
 
-
+// Sylindar
 void
 lmrcImageShapeSearchCalc0(mrcImage* out, mrcImage* in, lmrcImageShapeSearchInfo* linfo, int mode)
 {