SamplingUnitChange -R option were added.

 Please enter the commit message for your changes. Lines starting
 with '#' will be ignored, and an empty message aborts the commit.

 On branch master
 Your branch is up to date with 'origin/master'.

 Changes to be committed:
	modified:   bin/wish/Display2/tclIndex
	modified:   bin/wish/ctfDisplay/tclIndex
	modified:   hostdepend/ARM64MAC64
	modified:   lib/tclIndex
	modified:   src/Config/arm64Mac64.inc
	modified:   src/Objects/DataManip/mrcImage/src/lmrcImageModeChange.c
	modified:   src/Objects/DataManip/mrcImage/src/lmrcImageSamplingUnitChange.c
	modified:   src/Objects/DataManip/mrcImage/src/lmrcImageSoftEdge.c
	modified:   src/Tools/Config/Define.inc
	modified:   src/Tools/mrcImage/mrcImageSamplingUnitChange/Config/OptionControlFile
	modified:   src/Tools/mrcImage/mrcImageSamplingUnitChange/inc/mrcImageSamplingUnitChange.h
	modified:   src/Tools/mrcImage/mrcImageSamplingUnitChange/src/argCheck.c
	modified:   src/Tools/mrcImage/mrcImageSamplingUnitChange/src/init.c
	modified:   src/Tools/mrcImage/mrcImageSamplingUnitChange/src/mrcImageSamplingUnitChange.c
	modified:   src/Tools/mrcImage/mrcImageSamplingUnitChange/src/mrcImageSamplingUnitChange.html
	modified:   src/Tools/mrcImage/mrcImageSamplingUnitChange/src/mrcImageSamplingUnitChange.pane
	modified:   src/Tools/mrcImage/mrcImageSamplingUnitChange/src/usage.c
	modified:   util/src/TclTk/Makefile

 Changes not staged for commit:
	modified:   hostdepend/ARM64MAC64 (new commits, untracked content)
	modified:   include/eosMATH.h

diff --git a/bin/wish/Display2/tclIndex b/bin/wish/Display2/tclIndex
index c4c3f5a..ddbd17b 100644 (file)
--- a/bin/wish/Display2/tclIndex
+++ b/bin/wish/Display2/tclIndex
@@ -54,7 +54,6 @@ 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(fft2dCmd) [list source [file join $dir fft2dCmd.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]]
@@ -137,3 +136,4 @@ 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]]

diff --git a/bin/wish/ctfDisplay/tclIndex b/bin/wish/ctfDisplay/tclIndex
index 7877a77..2acb816 100644 (file)
--- a/bin/wish/ctfDisplay/tclIndex
+++ b/bin/wish/ctfDisplay/tclIndex
@@ -7,6 +7,7 @@
 # a script that loads the command.
 
 set auto_index(libraryLoad) [list source [file join $dir ctfDisplay.wish]]
+set auto_index(ctfDisplayDefault) [list source [file join $dir ctfDisplay.wish]]
 set auto_index(::CTF2D::Init) [list source [file join $dir ctfDisplay.wish]]
 set auto_index(::CTF2D::ctfInfoSync) [list source [file join $dir ctfDisplay.wish]]
 set auto_index(::CTF2D::ctfInfoUpload) [list source [file join $dir ctfDisplay.wish]]
@@ -34,4 +35,7 @@ set auto_index(::CTF2D::CTFInformationSet) [list source [file join $dir ctfDispl
 set auto_index(::CTF2D::CTFCalculation) [list source [file join $dir ctfDisplay.wish]]
 set auto_index(::CTF2D::ScatteringCalc) [list source [file join $dir ctfDisplay.wish]]
 set auto_index(::CTF2D::ctfInfoSave) [list source [file join $dir ctfDisplay.wish]]
+set auto_index(::CTF2D::ctfInfoSaveDefaultDir) [list source [file join $dir ctfDisplay.wish]]
+set auto_index(::CTF2D::ctfInfoSaveDefault) [list source [file join $dir ctfDisplay.wish]]
 set auto_index(::CTF2D::ctfInfoLoad) [list source [file join $dir ctfDisplay.wish]]
+set auto_index(::CTF2D::dummyFunc) [list source [file join $dir ctfDisplay.wish]]

diff --git a/hostdepend/ARM64MAC64 b/hostdepend/ARM64MAC64
index 6d3d24d..92a934b 160000 (submodule)
--- a/hostdepend/ARM64MAC64
+++ b/hostdepend/ARM64MAC64
@@ -1 +1 @@
-Subproject commit 6d3d24da19cdb9041477469e7c3340567e3579af
+Subproject commit 92a934bf811f81116e570020ea58fb27ebc2b2f0

diff --git a/lib/tclIndex b/lib/tclIndex
index eae6c6a..81a765f 100755 (executable)
--- a/lib/tclIndex
+++ b/lib/tclIndex
@@ -6,25 +6,48 @@
 # element name is the name of a command and the value is
 # a script that loads the command.
 
-set auto_index(NotSupportedCommand) [list source [file join $dir tclUtil.wish]]
-set auto_index(debugPrint) [list source [file join $dir tclUtil.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(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(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(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]]
+set auto_index(Blt_PrintKey) [list source [file join $dir bltGraph.wish]]
+set auto_index(Blt_ClosestPoint) [list source [file join $dir bltGraph.wish]]
+set auto_index(::blt::ActivateLegend) [list source [file join $dir bltGraph.wish]]
+set auto_index(::blt::DeactivateLegend) [list source [file join $dir bltGraph.wish]]
+set auto_index(::blt::HighlightLegend) [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]]
+set auto_index(::blt::PrintKey) [list source [file join $dir bltGraph.wish]]
+set auto_index(::blt::ClosestPoint) [list source [file join $dir bltGraph.wish]]
+set auto_index(::blt::AddBindTag) [list source [file join $dir bltGraph.wish]]
+set auto_index(::blt::FindElement) [list source [file join $dir bltGraph.wish]]
+set auto_index(::blt::FlashPoint) [list source [file join $dir bltGraph.wish]]
+set auto_index(::blt::GetCoords) [list source [file join $dir bltGraph.wish]]
+set auto_index(::blt::MarkPoint) [list source [file join $dir bltGraph.wish]]
+set auto_index(::blt::DestroyZoomTitle) [list source [file join $dir bltGraph.wish]]
+set auto_index(::blt::PopZoom) [list source [file join $dir bltGraph.wish]]
+set auto_index(::blt::PushZoom) [list source [file join $dir bltGraph.wish]]
+set auto_index(::blt::ResetZoom) [list source [file join $dir bltGraph.wish]]
+set auto_index(::blt::ZoomTitleNext) [list source [file join $dir bltGraph.wish]]
+set auto_index(::blt::ZoomTitleLast) [list source [file join $dir bltGraph.wish]]
+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(eosCommandExecute) [list source [file join $dir commandUtil.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]]
@@ -56,19 +79,32 @@ 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(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(defaultLoad) [list source [file join $dir defaultLoad.wish]]
+set auto_index(defaultLoadProcTemplate) [list source [file join $dir defaultLoad.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]]
@@ -88,54 +124,18 @@ 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(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]]
-set auto_index(defaultLoad) [list source [file join $dir defaultLoad.wish]]
-set auto_index(defaultLoadProcTemplate) [list source [file join $dir defaultLoad.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(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]]
-set auto_index(Blt_PrintKey) [list source [file join $dir bltGraph.wish]]
-set auto_index(Blt_ClosestPoint) [list source [file join $dir bltGraph.wish]]
-set auto_index(::blt::ActivateLegend) [list source [file join $dir bltGraph.wish]]
-set auto_index(::blt::DeactivateLegend) [list source [file join $dir bltGraph.wish]]
-set auto_index(::blt::HighlightLegend) [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]]
-set auto_index(::blt::PrintKey) [list source [file join $dir bltGraph.wish]]
-set auto_index(::blt::ClosestPoint) [list source [file join $dir bltGraph.wish]]
-set auto_index(::blt::AddBindTag) [list source [file join $dir bltGraph.wish]]
-set auto_index(::blt::FindElement) [list source [file join $dir bltGraph.wish]]
-set auto_index(::blt::FlashPoint) [list source [file join $dir bltGraph.wish]]
-set auto_index(::blt::GetCoords) [list source [file join $dir bltGraph.wish]]
-set auto_index(::blt::MarkPoint) [list source [file join $dir bltGraph.wish]]
-set auto_index(::blt::DestroyZoomTitle) [list source [file join $dir bltGraph.wish]]
-set auto_index(::blt::PopZoom) [list source [file join $dir bltGraph.wish]]
-set auto_index(::blt::PushZoom) [list source [file join $dir bltGraph.wish]]
-set auto_index(::blt::ResetZoom) [list source [file join $dir bltGraph.wish]]
-set auto_index(::blt::ZoomTitleNext) [list source [file join $dir bltGraph.wish]]
-set auto_index(::blt::ZoomTitleLast) [list source [file join $dir bltGraph.wish]]
-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(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(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(debugPrint) [list source [file join $dir tclUtil.wish]]

diff --git a/src/Config/arm64Mac64.inc b/src/Config/arm64Mac64.inc
index de9ce34..0fe4935 100755 (executable)
--- a/src/Config/arm64Mac64.inc
+++ b/src/Config/arm64Mac64.inc
@@ -103,11 +103,20 @@ INCGL = -framework OpenGL -framework GLUT
                                -lBLT25 \
                                -ltk8.6 -ltcl8.6 -ldl -lpthread -framework CoreFoundation \
                                 $(LIBX11) 
+
 LIBTCLTK    = -L$(EOS_HOME)/util/$(OSTYPE)/lib \
                                -lBLT25 \
                                -ltk8.6 -ltcl8.6 -ldl -lpthread -framework CoreFoundation \
                                 $(LIBX11) 
 
+#LIBTCLTK    = \
+                               -L$(EOS_HOME)/util/$(OSTYPE)/lib/tkblt3.2 \
+                -ltkblt3.2 \
+                -L$(EOS_HOME)/util/$(OSTYPE)/lib \
+                -lBLT \
+                               -ltk8.6 -ltcl8.6 -ldl -lpthread -framework CoreFoundation \
+                                $(LIBX11) 
+
 #LIBTCLTK    = -L$(EOS_HOME)/util/$(OSTYPE)/lib \
                                -lBLT \
                                -ltk8.5 -ltcl8.5 -ldl -lpthread \

diff --git a/src/Objects/DataManip/mrcImage/src/lmrcImageModeChange.c b/src/Objects/DataManip/mrcImage/src/lmrcImageModeChange.c
index c66bc3c..00b1995 100755 (executable)
--- a/src/Objects/DataManip/mrcImage/src/lmrcImageModeChange.c
+++ b/src/Objects/DataManip/mrcImage/src/lmrcImageModeChange.c
@@ -42,10 +42,22 @@ lmrcImageModeChange(mrcImage* out, mrcImage* in, long mode)
                                                dataout = (datain - in->HeaderAMin)/(in->HeaderAMax - in->HeaderAMin)*255.0;
                                                break;
                                        }
+                                       case mrcShortImage: {
+                                               dataout = (signed short)datain;
+                                               break;
+                                       }
+                                       case mrcUShortImage: {
+                                               dataout = (unsigned short)datain;
+                                               break;
+                                       }
                                        case mrcFloatImage: {
                                                dataout = datain;
                                                break;
                                        }
+                                       case mrcDoubleImage: {
+                                               dataout = datain;
+                                               break;
+                                       }
                                        default: {
                                                fprintf(stderr, "Not supported mode chanage\n");
                                                exit(EXIT_FAILURE);

diff --git a/src/Objects/DataManip/mrcImage/src/lmrcImageSamplingUnitChange.c b/src/Objects/DataManip/mrcImage/src/lmrcImageSamplingUnitChange.c
index 3fe4bb5..c887e3e 100755 (executable)
--- a/src/Objects/DataManip/mrcImage/src/lmrcImageSamplingUnitChange.c
+++ b/src/Objects/DataManip/mrcImage/src/lmrcImageSamplingUnitChange.c
@@ -35,21 +35,33 @@ lmrcImageSamplingUnitChange(mrcImage* out, mrcImage* in, lmrcImageSamplingUnitCh
     ky = in->HeaderLength.y/out->HeaderLength.y;
     kz = in->HeaderLength.z/out->HeaderLength.z;
 
-    out->HeaderN.x = in->HeaderN.x*kx;
-    out->HeaderN.y = in->HeaderN.y*ky;
-    out->HeaderN.z = in->HeaderN.z*kz;
+    if(1<in->HeaderN.x) {
+        out->HeaderN.x = in->HeaderN.x*kx;
+    } else {
+        out->HeaderN.x = 1;
+    }
+    if(1<in->HeaderN.y) {
+        out->HeaderN.y = in->HeaderN.y*ky;
+    } else {
+        out->HeaderN.y = 1;
+    }
+    if(1<in->HeaderN.z) {
+        out->HeaderN.z = in->HeaderN.z*kz;
+    } else {
+        out->HeaderN.z = 1;
+    }
 
        out->HeaderStartN.x = in->HeaderStartN.x*in->HeaderLength.x/out->HeaderLength.x;
        out->HeaderStartN.y = in->HeaderStartN.y*in->HeaderLength.y/out->HeaderLength.y;
        out->HeaderStartN.z = in->HeaderStartN.z*in->HeaderLength.z/out->HeaderLength.z;
     mrcInit(out, NULL);
 
+    for(z=0; z<out->HeaderN.z; z++) {
+    for(y=0; y<out->HeaderN.y; y++) {
     for(x=0; x<out->HeaderN.x; x++) {
-        for(y=0; y<out->HeaderN.y; y++) {
-            for(z=0; z<out->HeaderN.z; z++) {
-                mrcPixelDataGet(in, x/kx, y/ky, z/kz, &data, mrcPixelRePart, info.SamplingMethodMode);
-                mrcPixelDataSet(out, x, y, z, data, mrcPixelRePart);
-            }
-        }   
+        mrcPixelDataGet(in, x/kx, y/ky, z/kz, &data, mrcPixelRePart, info.SamplingMethodMode);
+        mrcPixelDataSet(out, x, y, z, data, mrcPixelRePart);
+    }
+    }   
     }
 }

diff --git a/src/Objects/DataManip/mrcImage/src/lmrcImageSoftEdge.c b/src/Objects/DataManip/mrcImage/src/lmrcImageSoftEdge.c
index 4afe3a5..5c5d7a3 100644 (file)
--- a/src/Objects/DataManip/mrcImage/src/lmrcImageSoftEdge.c
+++ b/src/Objects/DataManip/mrcImage/src/lmrcImageSoftEdge.c
@@ -85,7 +85,7 @@ lmrcImageSoftEdge(mrcImage* out, mrcImage* in, lmrcImageSoftEdgeInfo linfo, int
             //DEBUGPRINT5("%f %f %f: %f %f\n", x, y, z, data0, data);
             near = max;
             dstData = 0;
-            flagNear=1;
+            flagNear=0;
             for(tmpWidth=1; tmpWidth<=width; tmpWidth++) { 
                 xmin = MAX(0, x-tmpWidth); xmax = MIN(x+tmpWidth, out->HeaderN.x - 1); 
                 ymin = MAX(0, y-tmpWidth); ymax = MIN(y+tmpWidth, out->HeaderN.y - 1);
@@ -103,7 +103,7 @@ lmrcImageSoftEdge(mrcImage* out, mrcImage* in, lmrcImageSoftEdgeInfo linfo, int
                                 neary = offsety;
                                 nearz = offsetz;
                                 dstData = data;
-                                flagNear+;
+                                flagNear++;
                             }
                         }
                     }

diff --git a/src/Tools/Config/Define.inc b/src/Tools/Config/Define.inc
index 510aea1..49cde0d 100644 (file)
--- a/src/Tools/Config/Define.inc
+++ b/src/Tools/Config/Define.inc
@@ -12,3 +12,8 @@ WORLDNAME=Tools
 WORLDNAME=Tools
 WORLDNAME=Tools
 WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools

diff --git a/src/Tools/mrcImage/mrcImageSamplingUnitChange/Config/OptionControlFile b/src/Tools/mrcImage/mrcImageSamplingUnitChange/Config/OptionControlFile
index 2524a12..6d0f4fe 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageSamplingUnitChange/Config/OptionControlFile
+++ b/src/Tools/mrcImage/mrcImageSamplingUnitChange/Config/OptionControlFile
@@ -4,5 +4,6 @@
 "-o","-o[utput]","OutputDataFile","Essential","1","1","Out","outFile","NULL"
 "-S","-S[amplingUnit]","SamplingUnit[A]","Optional","3","1","Sx","Real","0.0","2","Sy","Real","0.0","3","Sz","Real","0.0"
 "-N","-N","N[Integer]","Optional","3","1","Nx","Integer","0.0","2","Ny","Integer","0.0","3","Nz","Real","0.0"
+"-R","-R[atio]","R[Real]","Optional","1","1","Ratio","Real","1.0"
 "-c","-c[onfig]","ConfigurationFile","Optional","1","1","configFile","inFile","NULL"
 "-m","-m[ode]","Mode","Optional","1","1","mode","Integer","0"

diff --git a/src/Tools/mrcImage/mrcImageSamplingUnitChange/inc/mrcImageSamplingUnitChange.h b/src/Tools/mrcImage/mrcImageSamplingUnitChange/inc/mrcImageSamplingUnitChange.h
index 5c5bc3e..11569d2 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageSamplingUnitChange/inc/mrcImageSamplingUnitChange.h
+++ b/src/Tools/mrcImage/mrcImageSamplingUnitChange/inc/mrcImageSamplingUnitChange.h
@@ -39,6 +39,9 @@ typedef struct mrcImageSamplingUnitChangeInfo {
     long flagNz;
     float Nz;
     
+    long flagRatio;
+    float Ratio;
+    
     long flagconfigFile;
     char* configFile;
     FILE* fptconfigFile;

diff --git a/src/Tools/mrcImage/mrcImageSamplingUnitChange/src/argCheck.c b/src/Tools/mrcImage/mrcImageSamplingUnitChange/src/argCheck.c
index 5f6f561..c9b96cf 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageSamplingUnitChange/src/argCheck.c
+++ b/src/Tools/mrcImage/mrcImageSamplingUnitChange/src/argCheck.c
@@ -84,6 +84,17 @@ argCheck(mrcImageSamplingUnitChangeInfo* info, int argc, char* argv[])
                     }
                     SBREAK;
                 }
+                SCASE("R") {
+                    if(i+1<argc) {
+                        info->Ratio = stringGetNthRealData(argv[i+1], 1, " ,");
+                        i++;
+                        info->flagRatio++;
+                    } else {
+                        usage(argv[0]);
+                        exit(EXIT_FAILURE);
+                    }
+                    SBREAK;
+                }
                 SCASE("c") {
                     if(i+1<argc) {
                         info->configFile = stringGetNthWord(argv[i+1], 1, " ,");

diff --git a/src/Tools/mrcImage/mrcImageSamplingUnitChange/src/init.c b/src/Tools/mrcImage/mrcImageSamplingUnitChange/src/init.c
index 200542f..9a33aaa 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageSamplingUnitChange/src/init.c
+++ b/src/Tools/mrcImage/mrcImageSamplingUnitChange/src/init.c
@@ -20,6 +20,7 @@ init0(mrcImageSamplingUnitChangeInfo* info)
     info->Nx = 0.0;    info->flagNx = 0;
     info->Ny = 0.0;    info->flagNy = 0;
     info->Nz = 0.0;    info->flagNz = 0;
+    info->Ratio = 1.0;    info->flagRatio = 0;
     info->fptconfigFile = NULL;    info->flagconfigFile = 0;
     info->mode = 0;    info->flagmode = 0;
 }
@@ -65,6 +66,9 @@ init1(mrcImageSamplingUnitChangeInfo* info)
     if(info->flagNz) {
     }
     
+    if(info->flagRatio) {
+    }
+    
     if(info->flagconfigFile) {
         info->fptconfigFile = fileOpen(info->configFile, "r");
     }

diff --git a/src/Tools/mrcImage/mrcImageSamplingUnitChange/src/mrcImageSamplingUnitChange.c b/src/Tools/mrcImage/mrcImageSamplingUnitChange/src/mrcImageSamplingUnitChange.c
index 004e62c..5193fc2 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageSamplingUnitChange/src/mrcImageSamplingUnitChange.c
+++ b/src/Tools/mrcImage/mrcImageSamplingUnitChange/src/mrcImageSamplingUnitChange.c
@@ -33,10 +33,15 @@ main(int argc, char* argv[])
     init1(&info);
 
        mrcFileRead(&in, info.In, "in main", 0);
-
+    
        linfo.L.x = info.Sx;
        linfo.L.y = info.Sy;
        linfo.L.z = info.Sz;
+    if(info.flagRatio) {
+           linfo.L.x = info.Sx*info.Ratio;
+           linfo.L.y = info.Sy*info.Ratio;
+           linfo.L.z = info.Sz*info.Ratio;
+    }
        linfo.SamplingMethodMode = info.mode;
        lmrcImageSamplingUnitChange(&out, &in, linfo, info.mode);
        mrcFileWrite(&out, info.Out, "in main", 0);
@@ -46,7 +51,11 @@ main(int argc, char* argv[])
 void
 additionalUsage()
 {
+       fprintf(stderr, "---- Ratio ---- \n");
+    fprintf(stderr, "-R and -S\n");
+    fprintf(stderr, "   Ratio*Sx Ratio*Sy Ratio*Sy\n");
        fprintf(stderr, "---- Mode ---- \n");
        fprintf(stderr, "%d: Nearest\n", mrcPixelHowNearest);
        fprintf(stderr, "%d: Linear \n", mrcPixelHowLinear);
+       fprintf(stderr, "%d: Cubic \n", mrcPixelHowCubicConv);
 }

diff --git a/src/Tools/mrcImage/mrcImageSamplingUnitChange/src/mrcImageSamplingUnitChange.html b/src/Tools/mrcImage/mrcImageSamplingUnitChange/src/mrcImageSamplingUnitChange.html
index 5261325..b614d72 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageSamplingUnitChange/src/mrcImageSamplingUnitChange.html
+++ b/src/Tools/mrcImage/mrcImageSamplingUnitChange/src/mrcImageSamplingUnitChange.html
@@ -16,11 +16,16 @@ Options:
     [-N                  Nx                  (0.0       ).as(Integer             ) 
                          Ny                  (0.0       ).as(Integer             ) 
                          Nz                  (0.0       ).as(Real                ) ] :Optional  :N[Integer]
+    [-R[atio]            Ratio               (1.0       ).as(Real                ) ] :Optional  :R[Real]
     [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
     [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+---- Ratio ---- 
+-R and -S
+   Ratio*Sx Ratio*Sy Ratio*Sy
 ---- Mode ---- 
 0: Nearest
 1: Linear 
+2: Cubic 
 </PRE>
 </BODY>
 </HTML>

diff --git a/src/Tools/mrcImage/mrcImageSamplingUnitChange/src/mrcImageSamplingUnitChange.pane b/src/Tools/mrcImage/mrcImageSamplingUnitChange/src/mrcImageSamplingUnitChange.pane
index 8487427..7881200 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageSamplingUnitChange/src/mrcImageSamplingUnitChange.pane
+++ b/src/Tools/mrcImage/mrcImageSamplingUnitChange/src/mrcImageSamplingUnitChange.pane
@@ -11,8 +11,9 @@
         -O 1 0 1 1 0 1 -1x1+1+3.000000 ' ' 'Out' 'OutputDataFile' o
         -I  1 0 0 1 0 1 -1x1+1+4 ' ' '0.0' 'Sx' SamplingUnit[A]
         -I  1 0 0 1 0 1 -1x1+1+6 ' ' '0.0' 'Nx' N[Integer]
-        -I 1 0 1 0 0 1 -1x1+1+7.500000 ' ' 'configFile' 'ConfigurationFile' c
-        -i 1 0 1 0 0 -1x1+1+9.000000 0 0 0 0 0 'mode' 'Mode' m
+        -f 1 0 1 0 0 -1x1+1+7.500000 0 0 1.000000 0 0 0 'Ratio' 'R[Real]' R
+        -I 1 0 1 0 0 1 -1x1+1+9.000000 ' ' 'configFile' 'ConfigurationFile' c
+        -i 1 0 1 0 0 -1x1+1+10.500000 0 0 0 0 0 'mode' 'Mode' m
     -E
   -E
 -E

diff --git a/src/Tools/mrcImage/mrcImageSamplingUnitChange/src/usage.c b/src/Tools/mrcImage/mrcImageSamplingUnitChange/src/usage.c
index feddb90..3269b98 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageSamplingUnitChange/src/usage.c
+++ b/src/Tools/mrcImage/mrcImageSamplingUnitChange/src/usage.c
@@ -11,6 +11,7 @@ usage(char* thisProgram)
     fprintf(stderr, "    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Essential :OutputDataFile\n");
     fprintf(stderr, "    [-S[amplingUnit]     Sx                  (0.0       ).as(Real                ) \n                         Sy                  (0.0       ).as(Real                ) \n                         Sz                  (0.0       ).as(Real                ) ] :Optional  :SamplingUnit[A]\n");
     fprintf(stderr, "    [-N                  Nx                  (0.0       ).as(Integer             ) \n                         Ny                  (0.0       ).as(Integer             ) \n                         Nz                  (0.0       ).as(Real                ) ] :Optional  :N[Integer]\n");
+    fprintf(stderr, "    [-R[atio]            Ratio               (1.0       ).as(Real                ) ] :Optional  :R[Real]\n");
     fprintf(stderr, "    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile\n");
     fprintf(stderr, "    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode\n");
     additionalUsage();

diff --git a/util/src/TclTk/Makefile b/util/src/TclTk/Makefile
index 66dd3b4..6474fb9 100755 (executable)
--- a/util/src/TclTk/Makefile
+++ b/util/src/TclTk/Makefile
@@ -30,9 +30,13 @@ TCLLIBWHERE=http://sourceforge.net/projects/tcllib/files/tcllib/$(TCLLIBVERSION/
 
 ### BLT
 BLTVERSION=2.5.3
+#BLTVERSION=3.2.23
+#BLTNAME=blt-src-$(BLTVERSION)
 BLTNAME=blt-src-$(BLTVERSION)
 BLTNAMEDIR=blt2.5
+#BLTNAMEDIR=wjoye-tkblt-2c9ea39
 BLTWHERE=http://sourceforge.net/projects/wize/files/$(BLTNAME).zip/download
+#BLTWHERE=https://sourceforge.net/projects/tkblt/files/V$(BLTVERSION)/V$(BLTVERSION).tar.gz
 
 ### VTK
 #VTKVERSION1=Nighty
@@ -84,8 +88,8 @@ TkImgCheck::
 BLTCheck::
        #@ln -s ../../src/TclTk/BLT$(BLTVERSION).tar.gz .
        #@gzip -dc BLT$(BLTVERSION).tar.gz | tar xvf - 
-       curl -L $(BLTWHERE) > $(BLTNAME).zip
-       unzip $(BLTNAME).zip
+       curl -L $(BLTWHERE) > $(BLTNAME).tar.gz
+       tar xvzf $(BLTNAME).tar.gz
 
 TcllibCheck::
        curl -L $(TCLLIBWHERE) > $(TCLLIBNAME).zip
@@ -126,7 +130,6 @@ TkImgConfig::
 
 BLTConfig::
        cd $(BLTNAMEDIR); \
-       $(MAKE) clean; \
        ./configure --prefix=${EOS_HOME}/util/$(OSTYPE) \
                                --with-tcl=../tcl$(TCLVERSION)/unix \
                                --with-tk=../tk$(TKVERSION)/unix  \