- Ketones och Specific Gravity har nu uppdaterad relativ x och

  y-position.
- Uppdaterad testfall med nya parametrar för Specific Gravity i
  FieldFinderTest.
- Ketones har ytterliggare en färg i färgskalan för tillåtna färger i
  KETONES.csv samt i testfallet i FieldTypeTest.

src/diacheck/java/libs/imageTools/FieldType.java

@@ -16,10 +16,10 @@ public enum FieldType
 	WHITE_BALANCE(50, 0.53962, 0.68495),
 	CONTROL(25, 0.5, 0.5),
 	GLUCOSE(20, 0.75075, 0.49887),
-	KETONES(35,	0.9708214, 0.049887),
+	KETONES(35,	0.9446, 0.485714),
 	PH(25, 0.67251, 0.484962),
 	PROTEIN(35, 0.606241, 0.483459),
-	SPECIFIC_GRAVITY(20, 0.5, 0.5);
+	SPECIFIC_GRAVITY(60, 0.80575, 0.48722);
 
 	private final double xRatio;
 	private final double yRatio;

src/diacheck/java/libs/imageTools/permittedColors/KETONES.csv

@@ -2,4 +2,5 @@
 254, 221, 188
 223, 179, 196
 177, 87, 141
-81, 0, 77
+110, 95, 114
+81, 0, 77

test/diacheck/java/libs/imageTools/test/FieldFinderTest.java

@@ -30,12 +30,6 @@ public void setUp() throws Exception
 		fieldFinder = new FieldFinder(ImageIO.read(input));
 	}
 
-	@Test
-	public void test()
-	{
-		fail("Not yet implemented");
-	}
-
 	@Test
 	public void testFindFirstPixelOfFieldForWhiteBalance() throws IOException
 	{
@@ -91,7 +85,7 @@ public void testLocateProteinField() throws IOException
 	@Test
 	public void testLocateSpecificGravityField() throws IOException
 	{
-		testField(FieldType.SPECIFIC_GRAVITY, new Color(0, 0, 0));
+		testField(FieldType.SPECIFIC_GRAVITY, new Color(159, 132, 89));
 	}
 
 	public void testField(FieldType field, Color expectedColor) throws IOException

test/diacheck/java/libs/imageTools/test/FieldTypeTest.java

@@ -60,6 +60,7 @@ public void testKetones()
 				new Color(254, 221, 188),
 				new Color(223, 179, 196),
 				new Color(177, 87, 141),
+				new Color(110, 95, 114),
 				new Color(81, 0, 77));
 		assertEquals(35, FieldType.KETONES.getThreshold());
 	}