Bug fixed: mrc2map

	modified:   src/Objects/DataManip/mapFile/src/mapFileRead.c
	modified:   src/Tools/mrcImage/mrc2dsn6/src/mrc2dsn6.c
	modified:   src/Tools/mrcImage/mrc2map/src/mrc2map.c
	modified:   src/Tools/mrcImage/mrcImagePixelDataGet/src/test/Makefile

diff --git a/bin/wish/Display2/tclIndex b/bin/wish/Display2/tclIndex
index 75a715a..e727737 100644 (file)
--- a/bin/wish/Display2/tclIndex
+++ b/bin/wish/Display2/tclIndex
@@ -6,41 +6,38 @@
 # element name is the name of a command and the value is
 # a script that loads the command.
 
-set auto_index(display2BindingSet) [list source [file join $dir Display2Binding.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(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]]
@@ -49,14 +46,38 @@ 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]]
+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(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(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(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(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]]
@@ -74,54 +95,29 @@ 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(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(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(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(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(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(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]]
@@ -130,5 +126,9 @@ set auto_index(sectionCreate) [list source [file join $dir SectionUtil.wish]]
 set auto_index(sectionClearAll) [list source [file join $dir SectionUtil.wish]]
 set auto_index(sectionClear) [list source [file join $dir SectionUtil.wish]]
 set auto_index(sectionChange) [list source [file join $dir SectionUtil.wish]]
-set auto_index(unitCellRecreate) [list source [file join $dir UnitCell.wish]]
-set auto_index(fft2dCmd) [list source [file join $dir fft2dCmd.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(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]]

diff --git a/hostdepend/X86LINUX64/bin/X86LINUX64/mrc2map b/hostdepend/X86LINUX64/bin/X86LINUX64/mrc2map
index 6fbb8e1..e865723 100755 (executable)
Binary files a/hostdepend/X86LINUX64/bin/X86LINUX64/mrc2map and b/hostdepend/X86LINUX64/bin/X86LINUX64/mrc2map differ

diff --git a/hostdepend/X86LINUX64/lib/X86LINUX64/libEosObjects.a b/hostdepend/X86LINUX64/lib/X86LINUX64/libEosObjects.a
index c6205d9..efe6dcb 100644 (file)
Binary files a/hostdepend/X86LINUX64/lib/X86LINUX64/libEosObjects.a and b/hostdepend/X86LINUX64/lib/X86LINUX64/libEosObjects.a differ

diff --git a/hostdepend/X86LINUX64/lib/X86LINUX64/libEosObjects.so b/hostdepend/X86LINUX64/lib/X86LINUX64/libEosObjects.so
index 3807d61..0399cdb 100644 (file)
Binary files a/hostdepend/X86LINUX64/lib/X86LINUX64/libEosObjects.so and b/hostdepend/X86LINUX64/lib/X86LINUX64/libEosObjects.so differ

diff --git a/hostdepend/X86LINUX64/lib/X86LINUX64/libmapFile.a b/hostdepend/X86LINUX64/lib/X86LINUX64/libmapFile.a
new file mode 100644 (file)
index 0000000..f88333e
Binary files /dev/null and b/hostdepend/X86LINUX64/lib/X86LINUX64/libmapFile.a differ

diff --git a/hostdepend/X86LINUX64/lib/X86LINUX64/libmapFile.so b/hostdepend/X86LINUX64/lib/X86LINUX64/libmapFile.so
new file mode 100644 (file)
index 0000000..f3a4e93
Binary files /dev/null and b/hostdepend/X86LINUX64/lib/X86LINUX64/libmapFile.so differ

diff --git a/hostdepend/X86LINUX64/lib/X86LINUX64/shared/mapFileRead.sharedo b/hostdepend/X86LINUX64/lib/X86LINUX64/shared/mapFileRead.sharedo
new file mode 100644 (file)
index 0000000..c243758
Binary files /dev/null and b/hostdepend/X86LINUX64/lib/X86LINUX64/shared/mapFileRead.sharedo differ

diff --git a/hostdepend/X86LINUX64/src/Objects/DataManip/mapFile/src/X86LINUX64/libmapFile.a b/hostdepend/X86LINUX64/src/Objects/DataManip/mapFile/src/X86LINUX64/libmapFile.a
new file mode 100644 (file)
index 0000000..f88333e
Binary files /dev/null and b/hostdepend/X86LINUX64/src/Objects/DataManip/mapFile/src/X86LINUX64/libmapFile.a differ

diff --git a/hostdepend/X86LINUX64/src/Objects/DataManip/mapFile/src/X86LINUX64/libmapFile.debug.a b/hostdepend/X86LINUX64/src/Objects/DataManip/mapFile/src/X86LINUX64/libmapFile.debug.a
new file mode 100644 (file)
index 0000000..4bd7982
Binary files /dev/null and b/hostdepend/X86LINUX64/src/Objects/DataManip/mapFile/src/X86LINUX64/libmapFile.debug.a differ

diff --git a/hostdepend/X86LINUX64/src/Objects/DataManip/mapFile/src/X86LINUX64/libmapFile.so b/hostdepend/X86LINUX64/src/Objects/DataManip/mapFile/src/X86LINUX64/libmapFile.so
new file mode 100755 (executable)
index 0000000..f3a4e93
Binary files /dev/null and b/hostdepend/X86LINUX64/src/Objects/DataManip/mapFile/src/X86LINUX64/libmapFile.so differ

diff --git a/hostdepend/X86LINUX64/src/Objects/DataManip/mapFile/src/X86LINUX64/mapFileRead.sharedo b/hostdepend/X86LINUX64/src/Objects/DataManip/mapFile/src/X86LINUX64/mapFileRead.sharedo
new file mode 100644 (file)
index 0000000..c243758
Binary files /dev/null and b/hostdepend/X86LINUX64/src/Objects/DataManip/mapFile/src/X86LINUX64/mapFileRead.sharedo differ

diff --git a/hostdepend/X86LINUX64/src/Tools/mrcImage/mrc2map/src/X86LINUX64/mrc2map b/hostdepend/X86LINUX64/src/Tools/mrcImage/mrc2map/src/X86LINUX64/mrc2map
index 6fbb8e1..e865723 100755 (executable)
Binary files a/hostdepend/X86LINUX64/src/Tools/mrcImage/mrc2map/src/X86LINUX64/mrc2map and b/hostdepend/X86LINUX64/src/Tools/mrcImage/mrc2map/src/X86LINUX64/mrc2map differ

diff --git a/lib/tclIndex b/lib/tclIndex
index 31723a2..fc20b8b 100644 (file)
--- a/lib/tclIndex
+++ b/lib/tclIndex
@@ -6,6 +6,75 @@
 # element name is the name of a command and the value is
 # a script that loads the command.
 
+set auto_index(fileSaveSureWin) [list source [file join $dir fileSave.wish]]
+set auto_index(fileSaveSureOK) [list source [file join $dir fileSave.wish]]
+set auto_index(fileSaveSureCancel) [list source [file join $dir fileSave.wish]]
+set auto_index(fileSaveSureWinResources) [list source [file join $dir fileSave.wish]]
+set auto_index(fileSave) [list source [file join $dir fileSave.wish]]
+set auto_index(fileSaveResources) [list source [file join $dir fileSave.wish]]
+set auto_index(fileSaveBindings) [list source [file join $dir fileSave.wish]]
+set auto_index(fileSaveList) [list source [file join $dir fileSave.wish]]
+set auto_index(fileSaveOK) [list source [file join $dir fileSave.wish]]
+set auto_index(fileSaveCancel) [list source [file join $dir fileSave.wish]]
+set auto_index(fileSaveClick) [list source [file join $dir fileSave.wish]]
+set auto_index(fileSaveTake) [list source [file join $dir fileSave.wish]]
+set auto_index(fileSaveComplete) [list source [file join $dir fileSave.wish]]
+set auto_index(fileSelect) [list source [file join $dir fileSelect.wish]]
+set auto_index(fileSelectResources) [list source [file join $dir fileSelect.wish]]
+set auto_index(fileSelectBindings) [list source [file join $dir fileSelect.wish]]
+set auto_index(fileSelectList) [list source [file join $dir fileSelect.wish]]
+set auto_index(fileSelectOK) [list source [file join $dir fileSelect.wish]]
+set auto_index(fileSelectCancel) [list source [file join $dir fileSelect.wish]]
+set auto_index(fileSelectClick) [list source [file join $dir fileSelect.wish]]
+set auto_index(fileSelectTake) [list source [file join $dir fileSelect.wish]]
+set auto_index(fileSelectComplete) [list source [file join $dir fileSelect.wish]]
+set auto_index(colormapSet) [list source [file join $dir Colormap.wish]]
+set auto_index(seqFileTemplateChange) [list source [file join $dir seqFileSelect.wish]]
+set auto_index(seqFileSelect) [list source [file join $dir seqFileSelect.wish]]
+set auto_index(seqFileSelectBindings) [list source [file join $dir seqFileSelect.wish]]
+set auto_index(seqFileSelectList) [list source [file join $dir seqFileSelect.wish]]
+set auto_index(seqFileTemplateSelectOK) [list source [file join $dir seqFileSelect.wish]]
+set auto_index(seqFileTemplateSelectComplete) [list source [file join $dir seqFileSelect.wish]]
+set auto_index(seqFileSelectOK) [list source [file join $dir seqFileSelect.wish]]
+set auto_index(seqFileSelectComplete) [list source [file join $dir seqFileSelect.wish]]
+set auto_index(seqFileSelectPrev) [list source [file join $dir seqFileSelect.wish]]
+set auto_index(seqFileSelectNext) [list source [file join $dir seqFileSelect.wish]]
+set auto_index(seqFileSelectCancel) [list source [file join $dir seqFileSelect.wish]]
+set auto_index(seqFileSelectClick) [list source [file join $dir seqFileSelect.wish]]
+set auto_index(seqFileSelectTake) [list source [file join $dir seqFileSelect.wish]]
+set auto_index(CheckButtonsCreateWithPack) [list source [file join $dir VariousButton.wish]]
+set auto_index(RadioButtonsCreateWithPack) [list source [file join $dir VariousButton.wish]]
+set auto_index(RadioButtonsCreateWithPackWithCommand) [list source [file join $dir VariousButton.wish]]
+set auto_index(RadioButtonsCreate) [list source [file join $dir VariousButton.wish]]
+set auto_index(CheckButtonsCreate) [list source [file join $dir VariousButton.wish]]
+set auto_index(CommandEntry) [list source [file join $dir CommandEntry.wish]]
+set auto_index(CommandEntryWithSelection) [list source [file join $dir CommandEntry.wish]]
+set auto_index(CommandEntryWithSelectionEntrySet) [list source [file join $dir CommandEntry.wish]]
+set auto_index(CommandEntryWithUpDown) [list source [file join $dir CommandEntry.wish]]
+set auto_index(CommandEntryWithUpDownUp) [list source [file join $dir CommandEntry.wish]]
+set auto_index(CommandEntryWithUpDownDown) [list source [file join $dir CommandEntry.wish]]
+set auto_index(bltResetBindings) [list source [file join $dir graphFeature.wish]]
+set auto_index(bltActivateLegend) [list source [file join $dir graphFeature.wish]]
+set auto_index(SetActiveLegend) [list source [file join $dir graphFeature.wish]]
+set auto_index(SetCrosshairs) [list source [file join $dir graphFeature.wish]]
+set auto_index(bltFindElement) [list source [file join $dir graphFeature.wish]]
+set auto_index(bltFlashPoint) [list source [file join $dir graphFeature.wish]]
+set auto_index(SetClosestPoint) [list source [file join $dir graphFeature.wish]]
+set auto_index(bltGetCoords) [list source [file join $dir graphFeature.wish]]
+set auto_index(bltGetAnchor) [list source [file join $dir graphFeature.wish]]
+set auto_index(bltGetAnchorX) [list source [file join $dir graphFeature.wish]]
+set auto_index(bltBox) [list source [file join $dir graphFeature.wish]]
+set auto_index(bltBoxX) [list source [file join $dir graphFeature.wish]]
+set auto_index(bltScan) [list source [file join $dir graphFeature.wish]]
+set auto_index(bltScanX) [list source [file join $dir graphFeature.wish]]
+set auto_index(bltZoom) [list source [file join $dir graphFeature.wish]]
+set auto_index(bltZoomX) [list source [file join $dir graphFeature.wish]]
+set auto_index(SetZoom) [list source [file join $dir graphFeature.wish]]
+set auto_index(SetZoomX) [list source [file join $dir graphFeature.wish]]
+set auto_index(SetPrint) [list source [file join $dir graphFeature.wish]]
+set auto_index(NotSupportedCommand) [list source [file join $dir tclUtil.wish]]
+set auto_index(Canvas) [list source [file join $dir Canvas.wish]]
+set auto_index(scrolledCanvas) [list source [file join $dir Canvas.wish]]
 set auto_index(Blt_ActiveLegend) [list source [file join $dir bltGraph.wish]]
 set auto_index(Blt_Crosshairs) [list source [file join $dir bltGraph.wish]]
 set auto_index(Blt_ZoomStack) [list source [file join $dir bltGraph.wish]]
@@ -33,16 +102,8 @@ set auto_index(::blt::SetZoomPoint) [list source [file join $dir bltGraph.wish]]
 set auto_index(::blt::Box) [list source [file join $dir bltGraph.wish]]
 set auto_index(Blt_PostScriptDialog) [list source [file join $dir bltGraph.wish]]
 set auto_index(::blt::ResetPostScript) [list source [file join $dir bltGraph.wish]]
-set auto_index(Canvas) [list source [file join $dir Canvas.wish]]
-set auto_index(scrolledCanvas) [list source [file join $dir Canvas.wish]]
-set auto_index(colormapSet) [list source [file join $dir Colormap.wish]]
-set auto_index(CommandEntry) [list source [file join $dir CommandEntry.wish]]
-set auto_index(CommandEntryWithSelection) [list source [file join $dir CommandEntry.wish]]
-set auto_index(CommandEntryWithSelectionEntrySet) [list source [file join $dir CommandEntry.wish]]
-set auto_index(CommandEntryWithUpDown) [list source [file join $dir CommandEntry.wish]]
-set auto_index(CommandEntryWithUpDownUp) [list source [file join $dir CommandEntry.wish]]
-set auto_index(CommandEntryWithUpDownDown) [list source [file join $dir CommandEntry.wish]]
-set auto_index(eosCommandExecute) [list source [file join $dir commandUtil.wish]]
+set auto_index(fileCanBeOverwritten) [list source [file join $dir fileUtil.wish]]
+set auto_index(relativePathGet) [list source [file join $dir fileUtil.wish]]
 set auto_index(::CTF::Init) [list source [file join $dir ctfInfo.wish]]
 set auto_index(::CTF::Win) [list source [file join $dir ctfInfo.wish]]
 set auto_index(::CTF::ctfInfoGraphInfoFrameCreate) [list source [file join $dir ctfInfo.wish]]
@@ -74,65 +135,4 @@ set auto_index(::CTF::ctfInfoCTFCalculation) [list source [file join $dir ctfInf
 set auto_index(::CTF::ctfInfoScatteringCalc) [list source [file join $dir ctfInfo.wish]]
 set auto_index(::CTF::ctfInfoListGet) [list source [file join $dir ctfInfo.wish]]
 set auto_index(::CTF::ctfInfoAppend) [list source [file join $dir ctfInfo.wish]]
-set auto_index(fileSaveSureWin) [list source [file join $dir fileSave.wish]]
-set auto_index(fileSaveSureOK) [list source [file join $dir fileSave.wish]]
-set auto_index(fileSaveSureCancel) [list source [file join $dir fileSave.wish]]
-set auto_index(fileSaveSureWinResources) [list source [file join $dir fileSave.wish]]
-set auto_index(fileSave) [list source [file join $dir fileSave.wish]]
-set auto_index(fileSaveResources) [list source [file join $dir fileSave.wish]]
-set auto_index(fileSaveBindings) [list source [file join $dir fileSave.wish]]
-set auto_index(fileSaveList) [list source [file join $dir fileSave.wish]]
-set auto_index(fileSaveOK) [list source [file join $dir fileSave.wish]]
-set auto_index(fileSaveCancel) [list source [file join $dir fileSave.wish]]
-set auto_index(fileSaveClick) [list source [file join $dir fileSave.wish]]
-set auto_index(fileSaveTake) [list source [file join $dir fileSave.wish]]
-set auto_index(fileSaveComplete) [list source [file join $dir fileSave.wish]]
-set auto_index(fileSelect) [list source [file join $dir fileSelect.wish]]
-set auto_index(fileSelectResources) [list source [file join $dir fileSelect.wish]]
-set auto_index(fileSelectBindings) [list source [file join $dir fileSelect.wish]]
-set auto_index(fileSelectList) [list source [file join $dir fileSelect.wish]]
-set auto_index(fileSelectOK) [list source [file join $dir fileSelect.wish]]
-set auto_index(fileSelectCancel) [list source [file join $dir fileSelect.wish]]
-set auto_index(fileSelectClick) [list source [file join $dir fileSelect.wish]]
-set auto_index(fileSelectTake) [list source [file join $dir fileSelect.wish]]
-set auto_index(fileSelectComplete) [list source [file join $dir fileSelect.wish]]
-set auto_index(fileCanBeOverwritten) [list source [file join $dir fileUtil.wish]]
-set auto_index(relativePathGet) [list source [file join $dir fileUtil.wish]]
-set auto_index(bltResetBindings) [list source [file join $dir graphFeature.wish]]
-set auto_index(bltActivateLegend) [list source [file join $dir graphFeature.wish]]
-set auto_index(SetActiveLegend) [list source [file join $dir graphFeature.wish]]
-set auto_index(SetCrosshairs) [list source [file join $dir graphFeature.wish]]
-set auto_index(bltFindElement) [list source [file join $dir graphFeature.wish]]
-set auto_index(bltFlashPoint) [list source [file join $dir graphFeature.wish]]
-set auto_index(SetClosestPoint) [list source [file join $dir graphFeature.wish]]
-set auto_index(bltGetCoords) [list source [file join $dir graphFeature.wish]]
-set auto_index(bltGetAnchor) [list source [file join $dir graphFeature.wish]]
-set auto_index(bltGetAnchorX) [list source [file join $dir graphFeature.wish]]
-set auto_index(bltBox) [list source [file join $dir graphFeature.wish]]
-set auto_index(bltBoxX) [list source [file join $dir graphFeature.wish]]
-set auto_index(bltScan) [list source [file join $dir graphFeature.wish]]
-set auto_index(bltScanX) [list source [file join $dir graphFeature.wish]]
-set auto_index(bltZoom) [list source [file join $dir graphFeature.wish]]
-set auto_index(bltZoomX) [list source [file join $dir graphFeature.wish]]
-set auto_index(SetZoom) [list source [file join $dir graphFeature.wish]]
-set auto_index(SetZoomX) [list source [file join $dir graphFeature.wish]]
-set auto_index(SetPrint) [list source [file join $dir graphFeature.wish]]
-set auto_index(seqFileTemplateChange) [list source [file join $dir seqFileSelect.wish]]
-set auto_index(seqFileSelect) [list source [file join $dir seqFileSelect.wish]]
-set auto_index(seqFileSelectBindings) [list source [file join $dir seqFileSelect.wish]]
-set auto_index(seqFileSelectList) [list source [file join $dir seqFileSelect.wish]]
-set auto_index(seqFileTemplateSelectOK) [list source [file join $dir seqFileSelect.wish]]
-set auto_index(seqFileTemplateSelectComplete) [list source [file join $dir seqFileSelect.wish]]
-set auto_index(seqFileSelectOK) [list source [file join $dir seqFileSelect.wish]]
-set auto_index(seqFileSelectComplete) [list source [file join $dir seqFileSelect.wish]]
-set auto_index(seqFileSelectPrev) [list source [file join $dir seqFileSelect.wish]]
-set auto_index(seqFileSelectNext) [list source [file join $dir seqFileSelect.wish]]
-set auto_index(seqFileSelectCancel) [list source [file join $dir seqFileSelect.wish]]
-set auto_index(seqFileSelectClick) [list source [file join $dir seqFileSelect.wish]]
-set auto_index(seqFileSelectTake) [list source [file join $dir seqFileSelect.wish]]
-set auto_index(NotSupportedCommand) [list source [file join $dir tclUtil.wish]]
-set auto_index(CheckButtonsCreateWithPack) [list source [file join $dir VariousButton.wish]]
-set auto_index(RadioButtonsCreateWithPack) [list source [file join $dir VariousButton.wish]]
-set auto_index(RadioButtonsCreateWithPackWithCommand) [list source [file join $dir VariousButton.wish]]
-set auto_index(RadioButtonsCreate) [list source [file join $dir VariousButton.wish]]
-set auto_index(CheckButtonsCreate) [list source [file join $dir VariousButton.wish]]
+set auto_index(eosCommandExecute) [list source [file join $dir commandUtil.wish]]

diff --git a/src/Objects/DataManip/mapFile/src/mapFileRead.c b/src/Objects/DataManip/mapFile/src/mapFileRead.c
index 2f9ffed..3e83cf1 100755 (executable)
--- a/src/Objects/DataManip/mapFile/src/mapFileRead.c
+++ b/src/Objects/DataManip/mapFile/src/mapFileRead.c
@@ -11,6 +11,7 @@
 */
 static char __sccs_id[] = "%Z%mapFileRead ver%I%; Date:%D% %Z%";
 #include <stdio.h>
+#include "Memory.h"
 #include "../inc/mapFile.h"
 
 void
@@ -25,7 +26,7 @@ mapFileRead(FILE* fpt, mapFile* map, int mode)
        fread(&(map->Header), sizeof(mapFileHeader), 1, fpt); 
 #ifdef II
 #endif
-       map->Image = (unsigned char*)memoryAllocate(sizeof(unsigned char)*map->Header.N.x*map->HeaderN.y*map->HeaderN.z, "mapFileRead");
+       map->Image = (unsigned char*)memoryAllocate(sizeof(unsigned char)*map->Header.N.x*map->Header.N.y*map->Header.N.z, "mapFileRead");
        for(qz=0; qz<qnz; qz++) {
        }
 }

diff --git a/src/Tools/mrcImage/mrc2dsn6/src/mrc2dsn6.c b/src/Tools/mrcImage/mrc2dsn6/src/mrc2dsn6.c
index fceb0d2..33e0d69 100755 (executable)
--- a/src/Tools/mrcImage/mrc2dsn6/src/mrc2dsn6.c
+++ b/src/Tools/mrcImage/mrc2dsn6/src/mrc2dsn6.c
@@ -35,7 +35,7 @@ main(int argc, char* argv[])
     mrcFileRead(&img, info.In, "from Main Routine", 0);
        if(info.flagmul) {
                DEBUGPRINT1("MUL: %e\n", info.mul);
-               lmrcImageDevidedByReal(&img, 1.0/info.mul);
+               lmrcImageDividedByReal(&img, 1.0/info.mul);
                mrcStatDataSet(&img, 0);
        }
        lmrc2dsn6(&map, &img, linfo, info.mode);
@@ -50,7 +50,7 @@ additionalUsage()
 }
 
 void 
-lmrc2map(dsn6File* map, mrcImage* img, lmrc2mapInfo linfo, long mode)
+lmrc2dsn6(dsn6File* map, mrcImage* img, lmrc2mapInfo linfo, long mode)
 {
        int i, x, y, z, i1, i2;
        int qx, qy, qz, qx2, qy2, qz2, qnx, qny, qnz, n;

diff --git a/src/Tools/mrcImage/mrc2map/src/mrc2map.c b/src/Tools/mrcImage/mrc2map/src/mrc2map.c
index e12725b..7595515 100755 (executable)
--- a/src/Tools/mrcImage/mrc2map/src/mrc2map.c
+++ b/src/Tools/mrcImage/mrc2map/src/mrc2map.c
@@ -54,7 +54,7 @@ main(int argc, char* argv[])
     mrcFileRead(&img, info.In, "from Main Routine", 0);
        if(info.flagmul) {
                DEBUGPRINT1("MUL: %e\n", info.mul);
-               lmrcImageDevidedByReal(&img, 1.0/info.mul);
+               lmrcImageDividedByReal(&img, 1.0/info.mul);
                mrcStatDataSet(&img, 0);
        }
        lmrc2map(info.fptOut, &img, linfo, info.mode);

diff --git a/src/Tools/mrcImage/mrc2map/src/mrc2map.html b/src/Tools/mrcImage/mrc2map/src/mrc2map.html
index ebd2b9f..010afb8 100755 (executable)
--- a/src/Tools/mrcImage/mrc2map/src/mrc2map.html
+++ b/src/Tools/mrcImage/mrc2map/src/mrc2map.html
@@ -1 +1,26 @@
-/bin/bash: mrc2map: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>mrc2map</TITLE>
+</HEAD>
+<BODY>
+<H1>mrc2map</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: mrc2map
+Options:
+    [-i[nput]            In                  (NULL      )] :Essential :InputDataFile
+    [-o[utput]           Out                 (NULL      )] :Essential :OutputDataFile
+    [-c[onfig]           configFile          (NULL      )] :Optional  :ConfigurationFile
+    [-noswap             ] :Optional  : NO Byte Swapping 
+    [-shiftx             shiftx              (0.0       )] :Optional  :shiftx
+    [-shifty             shifty              (0.0       )] :Optional  :shifty
+    [-shiftz             shiftz              (0.0       )] :Optional  :shiftz
+    [-mul                mul                 (1.0       )] :Optional  :mrc*mul
+    [-m[ode]             mode                (0         )] :Optional  :Mode: 
+               0 : Same as mrc
+               1 : Helix(CentreIsOrigin)
+               2: BottomRight is Origin
+               3:Box Centre is a origin
+</PRE>
+</BODY>
+</HTML>

diff --git a/src/Tools/mrcImage/mrcImagePixelDataGet/src/test/Makefile b/src/Tools/mrcImage/mrcImagePixelDataGet/src/test/Makefile
index 4f18def..6e1fc5d 100755 (executable)
--- a/src/Tools/mrcImage/mrcImagePixelDataGet/src/test/Makefile
+++ b/src/Tools/mrcImage/mrcImagePixelDataGet/src/test/Makefile
@@ -11,12 +11,12 @@ help:
 
 exec:
        @echo "----- Execution Check -----"
-       ../$(OSTYPE)/$(OBJECTNAME)  -i data/test.in -o data/test.out1 -x 128   -y 128   -z 0 -m 0
-       ../$(OSTYPE)/$(OBJECTNAME)  -i data/test.in -o data/test.out2 -x 128.2 -y 128.2 -z 0 -m 1 
-       ../$(OSTYPE)/$(OBJECTNAME)  -i data/test.in -o data/test.out3 -In data/test.inCoord -m 0
-       ../$(OSTYPE)/$(OBJECTNAME)  -i data/test.in -o data/test.out4 -In data/test.inCoord -m 1
-       ../$(OSTYPE)/$(OBJECTNAME)  -i data/test.in -o data/test.out5 -In data/test.inCoord -m 0 -cuda 0
-       ../$(OSTYPE)/$(OBJECTNAME)  -i data/test.in -o data/test.out6 -In data/test.inCoord -m 1 -cuda 0 
+       time ../$(OSTYPE)/$(OBJECTNAME)  -i data/test.in -o data/test.out1 -x 128   -y 128   -z 0 -m 0
+       time ../$(OSTYPE)/$(OBJECTNAME)  -i data/test.in -o data/test.out2 -x 128.2 -y 128.2 -z 0 -m 1 
+       time ../$(OSTYPE)/$(OBJECTNAME)  -i data/test.in -o data/test.out3 -In data/test.inCoord -m 0
+       time ../$(OSTYPE)/$(OBJECTNAME)  -i data/test.in -o data/test.out4 -In data/test.inCoord -m 1
+       time ../$(OSTYPE)/$(OBJECTNAME)  -i data/test.in -o data/test.out5 -In data/test.inCoord -m 0 -cuda 0
+       time ../$(OSTYPE)/$(OBJECTNAME)  -i data/test.in -o data/test.out6 -In data/test.inCoord -m 1 -cuda 0 
        @echo "----- Calc check -----"          
 
 clean: