Merge pull request #4 from mdoube/testing

Tidy-up
mdoube · Oct 23, 2011 · 79f523c · 79f523c
2 parents f51aa77 + a8b586b
commit 79f523c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/org/doube/bonej/pqct/Distribution_Analysis.java b/src/org/doube/bonej/pqct/Distribution_Analysis.java
@@ -232,7 +232,7 @@ void writeHeader(TextPanel textPanel){
 			headings+=parameterNames[i]+"\t";
 		}
 		if(cOn){
-			String[] coHeadings = {"CoD [mg/cm3]","CoA [mm2]","SSI [mm3]","ToD [mg/cm3]","ToA[mm2]","BSId[g2/cm4]"};
+			String[] coHeadings = {"CoD [mg/cm³]","CoA [mm²]","SSI [mm³]","ToD [mg/cm³]","ToA[mm²]","BSId[g²/cm4]"};
 			for (int i = 0;i<coHeadings.length;++i){
 				headings+=coHeadings[i]+"\t";
 			}
@@ -250,13 +250,13 @@ void writeHeader(TextPanel textPanel){
 			}
 			//Cortex BMD values			
 			for (int i = 0;i<((int) 360/sectorWidth);++i){
-				headings+=i*sectorWidth+" - "+((i+1)*sectorWidth)+" endocortical vBMD [mg/cm3]\t";
+				headings+=i*sectorWidth+" - "+((i+1)*sectorWidth)+" endocortical vBMD [mg/cm³]\t";
 			}
 			for (int i = 0;i<((int) 360/sectorWidth);++i){
-				headings+=i*sectorWidth+" - "+((i+1)*sectorWidth)+" midcortical vBMD [mg/cm3]\t";
+				headings+=i*sectorWidth+" - "+((i+1)*sectorWidth)+" midcortical vBMD [mg/cm³]\t";
 			}
 			for (int i = 0;i<((int) 360/sectorWidth);++i){
-				headings+=i*sectorWidth+" - "+((i+1)*sectorWidth)+" pericortical vBMD [mg/cm3]\t";
+				headings+=i*sectorWidth+" - "+((i+1)*sectorWidth)+" pericortical vBMD [mg/cm³]\t";
 			}
 
 		}

diff --git a/src/org/doube/bonej/pqct/Read_Stratec_File.java b/src/org/doube/bonej/pqct/Read_Stratec_File.java
@@ -124,9 +124,11 @@ public void read(String directory){
 				}
 			}
 			this.setDisplayRange( min, max);
-			Calibration tempCalib = this.getCalibration();
-			tempCalib.setSigned16BitCalibration();
-			this.setCalibration(tempCalib);
+			Calibration cal = this.getCalibration();
+			cal.setSigned16BitCalibration();
+			cal.setValueUnit("mg/cm³");
+			cal.setUnit("mm");
+			cal.pixelWidth = cal.pixelHeight = cal.pixelDepth = VoxelSize;
 		}catch (Exception e) {
 			IJ.error("Stratec file read failed ", e.getMessage());
 			return;