diff --git a/src/main/java/Utilities/Counter3D.java b/src/main/java/Utilities/Counter3D.java index 9cddfc0..eb478da 100644 --- a/src/main/java/Utilities/Counter3D.java +++ b/src/main/java/Utilities/Counter3D.java @@ -726,7 +726,7 @@ public void showStatistics(boolean newRT){ float calXYZ=(float) (cal.pixelWidth*cal.pixelHeight*cal.pixelDepth); String unit=cal.getUnit(); - String[] header={"Volume ("+unit+"^3)", "Surface ("+unit+"^2)", "Nb of obj. voxels", "Nb of surf. voxels", "IntDen", "Mean", "StdDev", "Median", "Min", "Max", "X", "Y", "Z", "Mean dist. to surf. ("+unit+")", "SD dist. to surf. ("+unit+")", "Median dist. to surf. ("+unit+")", "XM", "YM", "ZM", "BX", "BY", "BZ", "B-width", "B-height", "B-depth"}; + String[] header={"ID", "Volume ("+unit+"^3)", "Surface ("+unit+"^2)", "Nb of obj. voxels", "Nb of surf. voxels", "IntDen", "Mean", "StdDev", "Median", "Min", "Max", "X", "Y", "Z", "Mean dist. to surf. ("+unit+")", "SD dist. to surf. ("+unit+")", "Median dist. to surf. ("+unit+")", "Min dist. to surf. ("+unit+")", "Max dist. to surf. ("+unit+")", "Max/Min dist. to surf. (Aspect ratio)", "XM", "YM", "ZM", "BX", "BY", "BZ", "B-width", "B-height", "B-depth"}; ResultsTable rt; if (newRT){ @@ -741,6 +741,7 @@ public void showStatistics(boolean newRT){ rt.incrementCounter(); Object3D currObj=(Object3D) obj.get(i); + rt.setValue("ID", i, i+1); if (Prefs.get("3D-OC-Options_volume.boolean", true)) rt.setValue("Volume ("+unit+"^3)", i, currObj.size*calXYZ); if (Prefs.get("3D-OC-Options_surface.boolean", true)) rt.setValue("Surface ("+unit+"^2)", i, currObj.surf_cal); if (Prefs.get("3D-OC-Options_objVox.boolean", true)) rt.setValue("Nb of obj. voxels", i, currObj.size); @@ -763,6 +764,9 @@ public void showStatistics(boolean newRT){ if (Prefs.get("3D-OC-Options_meanDist2Surf.boolean", true)) rt.setValue("Mean dist. to surf. ("+unit+")", i, currObj.mean_dist2surf); if (Prefs.get("3D-OC-Options_SDDist2Surf.boolean", true)) rt.setValue("SD dist. to surf. ("+unit+")", i, currObj.SD_dist2surf); if (Prefs.get("3D-OC-Options_medDist2Surf.boolean", true)) rt.setValue("Median dist. to surf. ("+unit+")", i, currObj.median_dist2surf); + if (Prefs.get("3D-OC-Options_minDist2Surf.boolean", true)) rt.setValue("Min dist. to surf. ("+unit+")", i, currObj.min_dist2surf); + if (Prefs.get("3D-OC-Options_maxDist2Surf.boolean", true)) rt.setValue("Max dist. to surf. ("+unit+")", i, currObj.max_dist2surf); + if (Prefs.get("3D-OC-Options_aspectDist2Surf.boolean", true)) rt.setValue("Max/Min dist. to surf. (Aspect ratio)", i, currObj.aspect_dist2surf); if (Prefs.get("3D-OC-Options_COM.boolean", true)){ float[] tmpArray=currObj.c_mass; diff --git a/src/main/java/Utilities/Object3D.java b/src/main/java/Utilities/Object3D.java index 2649fde..513016b 100644 --- a/src/main/java/Utilities/Object3D.java +++ b/src/main/java/Utilities/Object3D.java @@ -69,6 +69,15 @@ public class Object3D { /**SD of the distance to the surface (distance calibrated measure)*/ public float SD_dist2surf; + + /**Min distance to the surface (distance calibrated measure)*/ + public float min_dist2surf; + + /**Max distance to the surface (distance calibrated measure)*/ + public float max_dist2surf; + + /**Max/Min dist. to surf. (Aspect ratio)*/ + public float aspect_dist2surf; /**Object3D's size (in pixels or voxels)*/ public int size; @@ -230,6 +239,9 @@ private void calcStats(){ if (surf_size!=1){ for (int i=0; i