Merge branch 'master' of git.sourceforge.jp:/gitroot/eos/base

Conflicts:
	bin/wish/Display2/tclIndex

	modified:   env/Eos_env
	modified:   hostdepend/X86MAC64/*
	modified:   src/Config/x86Mac64.inc

diff --cc bin/wish/Display2/tclIndex
index e727737,75a715a..0000000
deleted file mode 100644,100644
--- 1/bin/wish/Display2/tclIndex
--- 2/bin/wish/Display2/tclIndex
+++ /dev/null
@@@ -1,134 -1,134 +1,0 @@@
--# Tcl autoload index file, version 2.0
--# This file is generated by the "auto_mkindex" command
--# and sourced to set up indexing information for one or
--# more commands.  Typically each line is a command that
--# sets an element in the auto_index array, where the
--# 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]]
--set auto_index(menuRoiSingleMultiTransform) [list source [file join $dir Display2MenuROI.wish]]
--set auto_index(menuMultiRoiOKCommand) [list source [file join $dir Display2MenuROI.wish]]
--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(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]]
--set auto_index(roiAreaAllRedraw) [list source [file join $dir RoiAreaCreate.wish]]
--set auto_index(roiAreaRedraw) [list source [file join $dir RoiAreaCreate.wish]]
--set auto_index(roiRectangleCreate) [list source [file join $dir RoiAreaCreate.wish]]
--set auto_index(numberCreate) [list source [file join $dir RoiAreaCreate.wish]]
--set auto_index(rectangleCreate) [list source [file join $dir RoiAreaCreate.wish]]
--set auto_index(roiLineCreate) [list source [file join $dir RoiAreaCreate.wish]]
--set auto_index(lineCreate) [list source [file join $dir RoiAreaCreate.wish]]
--set auto_index(roiSplineInit) [list source [file join $dir RoiAreaCreate.wish]]
--set auto_index(roiSplineBegin) [list source [file join $dir RoiAreaCreate.wish]]
--set auto_index(roiSplineStroke) [list source [file join $dir RoiAreaCreate.wish]]
--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]]
--set auto_index(sectionNextCreate) [list source [file join $dir SectionUtil.wish]]
--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(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]]
 -set auto_index(unitCellRecreate) [list source [file join $dir UnitCell.wish]]
 -set auto_index(fft2dCmd) [list source [file join $dir fft2dCmd.wish]]