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:   include/lmrcImageFeatureCalc.h
	modified:   include/lmrcImageModelCreate.h
	modified:   lib/ARM64MAC64/libEosObjects.a
	modified:   lib/ARM64MAC64/shared/lmrcImageModelCreate.sharedo
	modified:   src/Objects/DataManip/mrcImage/src/lmrcImageFeatureCalc.h
	modified:   src/Objects/DataManip/mrcImage/src/lmrcImageModelCreate.c
	modified:   src/Objects/DataManip/mrcImage/src/lmrcImageModelCreate.h
	modified:   src/Tools/Config/Define.inc
	modified:   src/Tools/mrcImage/mrcImageFeatureCalc/src/mrcImageFeatureCalc.html
	modified:   src/Tools/mrcImage/mrcImageModelCreate/Config/OptionControlFile
	modified:   src/Tools/mrcImage/mrcImageModelCreate/inc/mrcImageModelCreate.h
	modified:   src/Tools/mrcImage/mrcImageModelCreate/src/argCheck.c
	modified:   src/Tools/mrcImage/mrcImageModelCreate/src/init.c
	modified:   src/Tools/mrcImage/mrcImageModelCreate/src/mrcImageModelCreate.c
	modified:   src/Tools/mrcImage/mrcImageModelCreate/src/mrcImageModelCreate.html
	modified:   src/Tools/mrcImage/mrcImageModelCreate/src/mrcImageModelCreate.pane
	modified:   src/Tools/mrcImage/mrcImageModelCreate/src/test/Makefile
	modified:   src/Tools/mrcImage/mrcImageModelCreate/src/usage.c

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

diff --git a/bin/wish/Display2/tclIndex b/bin/wish/Display2/tclIndex
index 03796f9..c4c3f5a 100644 (file)
--- a/bin/wish/Display2/tclIndex
+++ b/bin/wish/Display2/tclIndex
@@ -6,43 +6,17 @@
 # element name is the name of a command and the value is
 # a script that loads the command.
 
-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(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(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(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(colormapChange) [list source [file join $dir Display2Colormap.wish]]
-set auto_index(display2SetVar) [list source [file join $dir Display2Init.wish]]
-set auto_index(display2InitVar) [list source [file join $dir Display2Init.wish]]
-set auto_index(display2InitVarSet) [list source [file join $dir Display2Init.wish]]
-set auto_index(diplay2CanvasInit) [list source [file join $dir Display2Init.wish]]
-set auto_index(display2Init) [list source [file join $dir Display2Init.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(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]]
@@ -54,7 +28,41 @@ set auto_index(sectionInformationWinCreate) [list source [file join $dir Display
 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(display2SetVar) [list source [file join $dir Display2Init.wish]]
+set auto_index(display2InitVar) [list source [file join $dir Display2Init.wish]]
+set auto_index(display2InitVarSet) [list source [file join $dir Display2Init.wish]]
+set auto_index(diplay2CanvasInit) [list source [file join $dir Display2Init.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(menuExitCreate) [list source [file join $dir Display2Menu.wish]]
+set auto_index(display2MenuSet2) [list source [file join $dir Display2Menu2.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(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]]
+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(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]]
@@ -72,22 +80,15 @@ 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(display2BindingSet) [list source [file join $dir Display2Binding.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(menuExitCreate) [list source [file join $dir Display2Menu.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(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(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]]
@@ -104,18 +105,29 @@ 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(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(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(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(display2DesktopSet) [list source [file join $dir Display2Desktop.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]]
@@ -124,16 +136,4 @@ 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(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(display2MenuSet2) [list source [file join $dir Display2Menu2.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(display2ETCSet) [list source [file join $dir Display2ETCSet.wish]]

diff --git a/include/lmrcImageFeatureCalc.h b/include/lmrcImageFeatureCalc.h
index 9767789..7570d3f 100644 (file)
--- a/include/lmrcImageFeatureCalc.h
+++ b/include/lmrcImageFeatureCalc.h
@@ -110,6 +110,7 @@ typedef struct lmrcImageFeatureList {
        int flagEachAllocation;
        lmrcImageFeatureEach* each;
 
+    mrcImage* density;
        //
 
 } lmrcImageFeatureList;

diff --git a/include/lmrcImageModelCreate.h b/include/lmrcImageModelCreate.h
index de2877d..b46f327 100644 (file)
--- a/include/lmrcImageModelCreate.h
+++ b/include/lmrcImageModelCreate.h
@@ -29,6 +29,8 @@ extern void _lmrcImageModelCreateMode5(mrcImage* out);
 extern void _lmrcImageModelCreateSheppLogan2D(mrcImage* out); // Mode: 6
 extern void _lmrcImageModelCreateSheppLogan3D(mrcImage* out); // Mode: 7
 extern void _lmrcImageModelCreateCylinder(mrcImage* out, mrcImageParaTypeReal radius,  mrcImageParaTypeReal length); // Mode: 8 
+extern void _lmrcImageModelCreateGradientBarX(mrcImage* out, float min, float max);
+
 /* prototype end */
 
 #endif

diff --git a/lib/ARM64MAC64/libEosObjects.a b/lib/ARM64MAC64/libEosObjects.a
index b4d1717..89b71d0 100644 (file)
Binary files a/lib/ARM64MAC64/libEosObjects.a and b/lib/ARM64MAC64/libEosObjects.a differ

diff --git a/lib/ARM64MAC64/shared/lmrcImageModelCreate.sharedo b/lib/ARM64MAC64/shared/lmrcImageModelCreate.sharedo
index 31905fe..43896a2 100644 (file)
Binary files a/lib/ARM64MAC64/shared/lmrcImageModelCreate.sharedo and b/lib/ARM64MAC64/shared/lmrcImageModelCreate.sharedo differ

diff --git a/src/Objects/DataManip/mrcImage/src/lmrcImageFeatureCalc.h b/src/Objects/DataManip/mrcImage/src/lmrcImageFeatureCalc.h
index 9767789..7570d3f 100644 (file)
--- a/src/Objects/DataManip/mrcImage/src/lmrcImageFeatureCalc.h
+++ b/src/Objects/DataManip/mrcImage/src/lmrcImageFeatureCalc.h
@@ -110,6 +110,7 @@ typedef struct lmrcImageFeatureList {
        int flagEachAllocation;
        lmrcImageFeatureEach* each;
 
+    mrcImage* density;
        //
 
 } lmrcImageFeatureList;

diff --git a/src/Objects/DataManip/mrcImage/src/lmrcImageModelCreate.c b/src/Objects/DataManip/mrcImage/src/lmrcImageModelCreate.c
index 6f67ed3..5ebc52a 100755 (executable)
--- a/src/Objects/DataManip/mrcImage/src/lmrcImageModelCreate.c
+++ b/src/Objects/DataManip/mrcImage/src/lmrcImageModelCreate.c
@@ -720,3 +720,20 @@ _lmrcImageModelCreateSheppLogan3D(mrcImage* out)
        }
        }
 }
+
+void
+_lmrcImageModelCreateGradientBarX(mrcImage* out, float min, float max)
+{
+    float x, y, z;
+    double gain;
+    double data;
+    gain = (max - min)/(out->HeaderN.x-1);
+       for(z=0; z<out->HeaderN.z; z++) {
+       for(y=0; y<out->HeaderN.y; y++) {
+       for(x=0; x<out->HeaderN.x; x++) {
+        data = x*gain+min; 
+        mrcPixelDataSet(out, x, y, z, data, mrcPixelRePart); 
+    }
+    }
+    }
+}

diff --git a/src/Objects/DataManip/mrcImage/src/lmrcImageModelCreate.h b/src/Objects/DataManip/mrcImage/src/lmrcImageModelCreate.h
index de2877d..b46f327 100755 (executable)
--- a/src/Objects/DataManip/mrcImage/src/lmrcImageModelCreate.h
+++ b/src/Objects/DataManip/mrcImage/src/lmrcImageModelCreate.h
@@ -29,6 +29,8 @@ extern void _lmrcImageModelCreateMode5(mrcImage* out);
 extern void _lmrcImageModelCreateSheppLogan2D(mrcImage* out); // Mode: 6
 extern void _lmrcImageModelCreateSheppLogan3D(mrcImage* out); // Mode: 7
 extern void _lmrcImageModelCreateCylinder(mrcImage* out, mrcImageParaTypeReal radius,  mrcImageParaTypeReal length); // Mode: 8 
+extern void _lmrcImageModelCreateGradientBarX(mrcImage* out, float min, float max);
+
 /* prototype end */
 
 #endif

diff --git a/src/Tools/Config/Define.inc b/src/Tools/Config/Define.inc
index 773ef99..2b24bf8 100644 (file)
--- a/src/Tools/Config/Define.inc
+++ b/src/Tools/Config/Define.inc
@@ -2,3 +2,4 @@ WORLDNAME=Tools
 WORLDNAME=Tools
 WORLDNAME=Tools
 WORLDNAME=Tools
+WORLDNAME=Tools

diff --git a/src/Tools/mrcImage/mrcImageFeatureCalc/src/mrcImageFeatureCalc.html b/src/Tools/mrcImage/mrcImageFeatureCalc/src/mrcImageFeatureCalc.html
index 2728356..115bff5 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageFeatureCalc/src/mrcImageFeatureCalc.html
+++ b/src/Tools/mrcImage/mrcImageFeatureCalc/src/mrcImageFeatureCalc.html
@@ -1 +1,28 @@
-/bin/bash: mrcImageFeatureCalc: No such file or directory
+<HTML>
+<HEAD>
+<TITLE>mrcImageFeatureCalc</TITLE>
+</HEAD>
+<BODY>
+<H1>mrcImageFeatureCalc</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: mrcImageFeatureCalc
+Options:
+    [-i[nput]            In                  (NULL      ).as(inFile::mrcImage    ) ] :Essential :Input:binary(BandW)
+    [-r[erencence]       Ref                 (NULL      ).as(inFile::mrcImage    ) ] :Optional  :Input:reference(density)
+    [-o[utput]           Out                 (stdout    ).as(outFile::ASCII      ) ] :Optional  :Output:
+    [-o[utput]GC         OutGC               (NULL      ).as(outFile::mrcImage   ) ] :Optional  :Output:gc
+    [-o[utput]L[abel]    OutLabel            (NULL      ).as(outFile::mrcImage   ) ] :Optional  :Output:Label
+    [-o[utput]P[eprimeter]OutPerimeter        (NULL      ).as(outFile::mrcImage   ) ] :Optional  :Output:Perimeter
+    [-o[utput]C[hainID]  OutChain            (NULL      ).as(outFile::mrcImage   ) ] :Optional  :Output:ChainID
+    [-o[utput]S[urfaceArea]OutSurfaceArea      (NULL      ).as(outFile::mrcImage   ) ] :Optional  :Output:SurfaceArea
+    [-o[utput]D[ensityWeightedArea]OutDensityWeightedArea(NULL      ).as(outFile::mrcImage   ) ] :Optional  :Output:DensityWeightedArea
+    [-n[eighbor]         neighbor            (0         ).as(Integer             ) ] :Optional  :Neighbor: [4(0)|8 or 6(0)|18|26]
+    [-d[ensity]          InDensity           (NULL      ).as(inFile::mrcImage    ) ] :Optional  :Input:density
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+----- Additional Usage -----
+Mode
+</PRE>
+</BODY>
+</HTML>

diff --git a/src/Tools/mrcImage/mrcImageModelCreate/Config/OptionControlFile b/src/Tools/mrcImage/mrcImageModelCreate/Config/OptionControlFile
index 27b002a..23cdec5 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageModelCreate/Config/OptionControlFile
+++ b/src/Tools/mrcImage/mrcImageModelCreate/Config/OptionControlFile
@@ -22,5 +22,6 @@
 "-inMode","-inMode","inMode","Optional","1","1","inMode","Integer","0"
 "-units","-units","units number","Optional","1","1","units","Integer","9"
 "-fm","-fm","formation","Optional","1","1","fm","Integer","0"
+"-range","-range","value-range","Optional","2","1","min","Real","0","2","max","Real","10"
 "-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/mrcImageModelCreate/inc/mrcImageModelCreate.h b/src/Tools/mrcImage/mrcImageModelCreate/inc/mrcImageModelCreate.h
index 6491dd2..73f8704 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageModelCreate/inc/mrcImageModelCreate.h
+++ b/src/Tools/mrcImage/mrcImageModelCreate/inc/mrcImageModelCreate.h
@@ -81,6 +81,12 @@ typedef struct mrcImageModelCreateInfo {
     long flagfm;
     long fm;
     
+    long flagmin;
+    float min;
+    
+    long flagmax;
+    float max;
+    
     long flagconfigFile;
     char* configFile;
     FILE* fptconfigFile;

diff --git a/src/Tools/mrcImage/mrcImageModelCreate/src/argCheck.c b/src/Tools/mrcImage/mrcImageModelCreate/src/argCheck.c
index f64f22d..8a31596 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageModelCreate/src/argCheck.c
+++ b/src/Tools/mrcImage/mrcImageModelCreate/src/argCheck.c
@@ -270,6 +270,20 @@ argCheck(mrcImageModelCreateInfo* info, int argc, char* argv[])
                     }
                     SBREAK;
                 }
+                SCASE("range") {
+                    if(i+2<argc) {
+                        info->min = stringGetNthRealData(argv[i+1], 1, " ,");
+                        i++;
+                        info->flagmin++;
+                        info->max = stringGetNthRealData(argv[i+1], 1, " ,");
+                        i++;
+                        info->flagmax++;
+                    } 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/mrcImageModelCreate/src/init.c b/src/Tools/mrcImage/mrcImageModelCreate/src/init.c
index 7c44105..c0cd65b 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageModelCreate/src/init.c
+++ b/src/Tools/mrcImage/mrcImageModelCreate/src/init.c
@@ -34,6 +34,8 @@ init0(mrcImageModelCreateInfo* info)
     info->inMode = 0;    info->flaginMode = 0;
     info->units = 9;    info->flagunits = 0;
     info->fm = 0;    info->flagfm = 0;
+    info->min = 0;    info->flagmin = 0;
+    info->max = 10;    info->flagmax = 0;
     info->fptconfigFile = NULL;    info->flagconfigFile = 0;
     info->mode = 0;    info->flagmode = 0;
 }
@@ -116,6 +118,12 @@ init1(mrcImageModelCreateInfo* info)
     if(info->flagfm) {
     }
     
+    if(info->flagmin) {
+    }
+    
+    if(info->flagmax) {
+    }
+    
     if(info->flagconfigFile) {
         info->fptconfigFile = fileOpen(info->configFile, "r");
     }

diff --git a/src/Tools/mrcImage/mrcImageModelCreate/src/mrcImageModelCreate.c b/src/Tools/mrcImage/mrcImageModelCreate/src/mrcImageModelCreate.c
index 881ab99..eecbb65 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageModelCreate/src/mrcImageModelCreate.c
+++ b/src/Tools/mrcImage/mrcImageModelCreate/src/mrcImageModelCreate.c
@@ -108,6 +108,10 @@ main(int argc, char* argv[])
                        _lmrcImageModelCreateCylinder(&out, info.r, info.l);
                        break;
                }
+               case 9: {
+                       _lmrcImageModelCreateGradientBarX(&out, info.min, info.max);
+                       break;
+               }
                default: {
                                                fprintf(stderr, "Not supported\n");
                }
@@ -173,4 +177,6 @@ additionalUsage()
        fprintf(stderr, "       Optional argument : -nx -ny -nz  \n");
        fprintf(stderr, "8: Cylinder 3D \n");
        fprintf(stderr, "       Optional argument : -nx -ny -nz -r -l \n");
+       fprintf(stderr, "9: Gradient Bar along x\n");
+       fprintf(stderr, "       Optional argument : -nx -ny -nz -l -range\n");
 }

diff --git a/src/Tools/mrcImage/mrcImageModelCreate/src/mrcImageModelCreate.html b/src/Tools/mrcImage/mrcImageModelCreate/src/mrcImageModelCreate.html
index 08b2639..528de93 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageModelCreate/src/mrcImageModelCreate.html
+++ b/src/Tools/mrcImage/mrcImageModelCreate/src/mrcImageModelCreate.html
@@ -30,6 +30,8 @@ Options:
     [-inMode             inMode              (0         ).as(Integer             ) ] :Optional  :inMode
     [-units              units               (9         ).as(Integer             ) ] :Optional  :units number
     [-fm                 fm                  (0         ).as(Integer             ) ] :Optional  :formation
+    [-range              min                 (0         ).as(Real                ) 
+                         max                 (10        ).as(Real                ) ] :Optional  :value-range
     [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
     [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
 >>>> 
@@ -85,6 +87,8 @@ Options:
        Optional argument : -nx -ny -nz  
 8: Cylinder 3D 
        Optional argument : -nx -ny -nz -r -l 
+9: Gradient Bar along x
+       Optional argument : -nx -ny -nz -l -range
 </PRE>
 </BODY>
 </HTML>

diff --git a/src/Tools/mrcImage/mrcImageModelCreate/src/mrcImageModelCreate.pane b/src/Tools/mrcImage/mrcImageModelCreate/src/mrcImageModelCreate.pane
index 8943aee..4d24f7b 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageModelCreate/src/mrcImageModelCreate.pane
+++ b/src/Tools/mrcImage/mrcImageModelCreate/src/mrcImageModelCreate.pane
@@ -29,8 +29,9 @@
         -i 1 0 1 0 0 -1x1+1+30.000000 0 0 0 0 0 'inMode' 'inMode' inMode
         -i 1 0 1 0 0 -1x1+1+31.500000 0 0 9 0 0 'units' 'units number' units
         -i 1 0 1 0 0 -1x1+1+33.000000 0 0 0 0 0 'fm' 'formation' fm
-        -I 1 0 1 0 0 1 -1x1+1+34.500000 ' ' 'configFile' 'ConfigurationFile' c
-        -i 1 0 1 0 0 -1x1+1+36.000000 0 0 0 0 0 'mode' 'Mode' m
+        -I  1 0 0 1 0 1 -1x1+1+34 ' ' '0' 'min' value-range
+        -I 1 0 1 0 0 1 -1x1+1+36.000000 ' ' 'configFile' 'ConfigurationFile' c
+        -i 1 0 1 0 0 -1x1+1+37.500000 0 0 0 0 0 'mode' 'Mode' m
     -E
   -E
 -E

diff --git a/src/Tools/mrcImage/mrcImageModelCreate/src/test/Makefile b/src/Tools/mrcImage/mrcImageModelCreate/src/test/Makefile
index 3183ebf..9951b64 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageModelCreate/src/test/Makefile
+++ b/src/Tools/mrcImage/mrcImageModelCreate/src/test/Makefile
@@ -9,11 +9,16 @@ help:
        @echo "----- Help Message Check -----"
        @../$(OSTYPE)/$(OBJECTNAME)      -h
 
-exec: exec-8
+exec: data/test-8.mrc data/test-9.mrc
 
-exec-8:
+data/test-8.mrc:../$(OSTYPE)/$(OBJECTNAME)
        @echo "----- Execution Check : 8-----"
        ../$(OSTYPE)/$(OBJECTNAME) -m 8 -o data/test-8.mrc -nx 32 -ny 32 -nz 32 -lx 2 -ly 2 -lz 2 -l 16 -r 4 
        @echo "----- Calc check -----"          
 
+data/test-9.mrc:../$(OSTYPE)/$(OBJECTNAME)
+       @echo "----- Execution Check : 9-----"
+       ../$(OSTYPE)/$(OBJECTNAME) -m 9 -o data/test-9.mrc -nx 256 -ny 32 -nz 1 -lx 1 -ly 1 -lz 1 -range 0 20 
+       @echo "----- Calc check -----"          
+
 clean:

diff --git a/src/Tools/mrcImage/mrcImageModelCreate/src/usage.c b/src/Tools/mrcImage/mrcImageModelCreate/src/usage.c
index b12ec23..a6ff019 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageModelCreate/src/usage.c
+++ b/src/Tools/mrcImage/mrcImageModelCreate/src/usage.c
@@ -29,6 +29,7 @@ usage(char* thisProgram)
     fprintf(stderr, "    [-inMode             inMode              (0         ).as(Integer             ) ] :Optional  :inMode\n");
     fprintf(stderr, "    [-units              units               (9         ).as(Integer             ) ] :Optional  :units number\n");
     fprintf(stderr, "    [-fm                 fm                  (0         ).as(Integer             ) ] :Optional  :formation\n");
+    fprintf(stderr, "    [-range              min                 (0         ).as(Real                ) \n                         max                 (10        ).as(Real                ) ] :Optional  :value-range\n");
     fprintf(stderr, "    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile\n");
     fprintf(stderr, "    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode\n");
     additionalUsage();