diff --git a/src/main/java/com/cringe_studios/christmastreescanning/Homograph2.java b/src/main/java/com/cringe_studios/christmastreescanning/Homograph2.java index c3212c5..7586a95 100644 --- a/src/main/java/com/cringe_studios/christmastreescanning/Homograph2.java +++ b/src/main/java/com/cringe_studios/christmastreescanning/Homograph2.java @@ -56,7 +56,7 @@ public class Homograph2 implements Homograph{ @Override public void renormalize() { //After the points are merged, depending on the implementation of the merging algorithm, the points might need to be renormalized - //This specific Algorithm does not need to be remerged + //This specific Algorithm does not need to be renormalized //TODO double check that fact with a test } diff --git a/src/main/java/com/cringe_studios/christmastreescanning/TwoSidedScanner.java b/src/main/java/com/cringe_studios/christmastreescanning/TwoSidedScanner.java index 7759099..cd0bbf0 100644 --- a/src/main/java/com/cringe_studios/christmastreescanning/TwoSidedScanner.java +++ b/src/main/java/com/cringe_studios/christmastreescanning/TwoSidedScanner.java @@ -10,17 +10,20 @@ public class TwoSidedScanner extends SingleColorScanner { private SideScanner frontSideScanner; private SideScanner rightSideScanner; + BufferedImage frontSideImages[]; + BufferedImage rightSideImages[]; + public TwoSidedScanner(BufferedImage frontSideImages[], BufferedImage rightSideImages[]) { - + this.frontSideImages = frontSideImages; + this.rightSideImages = rightSideImages; //TODO - - frontSideScanner = new SingleColoredSideScanner(frontSideImages, this.gammaDelta, , , ); - rightSideScanner = new SingleColoredSideScanner(rightSideImages, this.gammaDelta, , , ); } @Override public Homograph scan() { - // TODO Auto-generated method stub + frontSideScanner = new SingleColoredSideScanner(frontSideImages, this.gammaDelta, , , ); + rightSideScanner = new SingleColoredSideScanner(rightSideImages, this.gammaDelta, , , ); + frontSideScanner.scan(); frontSideScanner.normalizePoints(); Point2D[] frontPoints = frontSideScanner.getPoints(); diff --git a/src/test/java/com/cringe_studios/cristmastreescanning/ExampleTest.java b/src/test/java/com/cringe_studios/cristmastreescanning/ExampleTest.java index f1c84e9..49e7746 100644 --- a/src/test/java/com/cringe_studios/cristmastreescanning/ExampleTest.java +++ b/src/test/java/com/cringe_studios/cristmastreescanning/ExampleTest.java @@ -14,6 +14,10 @@ import javax.imageio.ImageIO; import org.junit.jupiter.api.Test; +import com.cringe_studios.christmastreescanning.Homograph; +import com.cringe_studios.christmastreescanning.Point3D; +import com.cringe_studios.christmastreescanning.Scanner; +import com.cringe_studios.christmastreescanning.TwoSidedScanner; import com.cringe_studios.christmastreescanning.scanning.image_scanning.GrayscaleImageScanner; import com.cringe_studios.christmastreescanning.scanning.image_scanning.ImageScanner; @@ -23,6 +27,29 @@ public class ExampleTest { public void testSus() { assertEquals(1 + 1, 2); } + + @Test + public void scannerTest() { + try { + BufferedImage LED1Front = ImageIO.read(ExampleTest.class.getResourceAsStream("ScannerTest1_LED1_front.png")); + BufferedImage LED2Front = ImageIO.read(ExampleTest.class.getResourceAsStream("ScannerTest1_LED2_front.png")); + BufferedImage LED3Front = ImageIO.read(ExampleTest.class.getResourceAsStream("ScannerTest1_LED3_front.png")); + BufferedImage LED1Right = ImageIO.read(ExampleTest.class.getResourceAsStream("ScannerTest1_LED1_right.png")); + BufferedImage LED2Right = ImageIO.read(ExampleTest.class.getResourceAsStream("ScannerTest1_LED2_right.png")); + BufferedImage LED3Right = ImageIO.read(ExampleTest.class.getResourceAsStream("ScannerTest1_LED3_right.png")); + + Scanner scanner = new TwoSidedScanner(new BufferedImage[] {LED1Front, LED2Front, LED3Front}, new BufferedImage[] {LED1Right, LED2Right, LED3Right}); + scanner.setGammaDelta((byte)(0.1 * 255)); + Homograph homo = scanner.scan(); + homo.merge(); + homo.renormalize(); + Point3D points[] = homo.getPoints(); + + + } catch (IOException e) { + e.printStackTrace(); + } + } @Test diff --git a/src/test/resources/ScannerTest1_LED1_front.png b/src/test/resources/ScannerTest1_LED1_front.png new file mode 100644 index 0000000..5659c61 Binary files /dev/null and b/src/test/resources/ScannerTest1_LED1_front.png differ diff --git a/src/test/resources/ScannerTest1_LED1_right.png b/src/test/resources/ScannerTest1_LED1_right.png new file mode 100644 index 0000000..5e94315 Binary files /dev/null and b/src/test/resources/ScannerTest1_LED1_right.png differ diff --git a/src/test/resources/ScannerTest1_LED2_front.png b/src/test/resources/ScannerTest1_LED2_front.png new file mode 100644 index 0000000..b4e49f1 Binary files /dev/null and b/src/test/resources/ScannerTest1_LED2_front.png differ diff --git a/src/test/resources/ScannerTest1_LED2_right.png b/src/test/resources/ScannerTest1_LED2_right.png new file mode 100644 index 0000000..8d2c868 Binary files /dev/null and b/src/test/resources/ScannerTest1_LED2_right.png differ diff --git a/src/test/resources/ScannerTest1_LED3_front.png b/src/test/resources/ScannerTest1_LED3_front.png new file mode 100644 index 0000000..ca5faa1 Binary files /dev/null and b/src/test/resources/ScannerTest1_LED3_front.png differ diff --git a/src/test/resources/ScannerTest1_LED3_right.png b/src/test/resources/ScannerTest1_LED3_right.png new file mode 100644 index 0000000..58fa0fd Binary files /dev/null and b/src/test/resources/ScannerTest1_LED3_right.png differ