diff --git a/src/main/java/de/tudresden/inf/mci/brailleplot/App.java b/src/main/java/de/tudresden/inf/mci/brailleplot/App.java index 9d92f132440886e41f3350686c6e51ab7c37b534..3ecd4c4bc3e958e0bb1f0e251ff04e333dcd4345 100644 --- a/src/main/java/de/tudresden/inf/mci/brailleplot/App.java +++ b/src/main/java/de/tudresden/inf/mci/brailleplot/App.java @@ -4,6 +4,7 @@ import de.tudresden.inf.mci.brailleplot.configparser.Format; import de.tudresden.inf.mci.brailleplot.configparser.JavaPropertiesConfigurationParser; import de.tudresden.inf.mci.brailleplot.configparser.Printer; +import de.tudresden.inf.mci.brailleplot.layout.RasterCanvas; import de.tudresden.inf.mci.brailleplot.printerbackend.PrintDirector; import de.tudresden.inf.mci.brailleplot.printerbackend.PrinterCapability; @@ -21,7 +22,6 @@ import de.tudresden.inf.mci.brailleplot.datacontainers.CategoricalPointListConta import de.tudresden.inf.mci.brailleplot.datacontainers.PointList; import de.tudresden.inf.mci.brailleplot.diagrams.BarChart; import de.tudresden.inf.mci.brailleplot.rendering.MasterRenderer; -import de.tudresden.inf.mci.brailleplot.rendering.RasterCanvas; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/de/tudresden/inf/mci/brailleplot/rendering/AbstractCanvas.java b/src/main/java/de/tudresden/inf/mci/brailleplot/layout/AbstractCanvas.java similarity index 99% rename from src/main/java/de/tudresden/inf/mci/brailleplot/rendering/AbstractCanvas.java rename to src/main/java/de/tudresden/inf/mci/brailleplot/layout/AbstractCanvas.java index caff397ccc1b53436f36b3a565b91b114aacae1c..0b4a84a9f7383f8de6f9c70456dd634fd86940c4 100644 --- a/src/main/java/de/tudresden/inf/mci/brailleplot/rendering/AbstractCanvas.java +++ b/src/main/java/de/tudresden/inf/mci/brailleplot/layout/AbstractCanvas.java @@ -1,4 +1,4 @@ -package de.tudresden.inf.mci.brailleplot.rendering; +package de.tudresden.inf.mci.brailleplot.layout; import de.tudresden.inf.mci.brailleplot.configparser.Format; import de.tudresden.inf.mci.brailleplot.configparser.Printer; diff --git a/src/main/java/de/tudresden/inf/mci/brailleplot/rendering/InsufficientRenderingAreaException.java b/src/main/java/de/tudresden/inf/mci/brailleplot/layout/InsufficientRenderingAreaException.java similarity index 94% rename from src/main/java/de/tudresden/inf/mci/brailleplot/rendering/InsufficientRenderingAreaException.java rename to src/main/java/de/tudresden/inf/mci/brailleplot/layout/InsufficientRenderingAreaException.java index a422a1c69aacc7ecbb2c7123466fbfc37fed55ce..1095a4536410e9c674f338d863c295f0ed514d9e 100644 --- a/src/main/java/de/tudresden/inf/mci/brailleplot/rendering/InsufficientRenderingAreaException.java +++ b/src/main/java/de/tudresden/inf/mci/brailleplot/layout/InsufficientRenderingAreaException.java @@ -1,4 +1,4 @@ -package de.tudresden.inf.mci.brailleplot.rendering; +package de.tudresden.inf.mci.brailleplot.layout; /** * Exception that indicates too few space available to display the amount of data contained in the given renderable representation. diff --git a/src/main/java/de/tudresden/inf/mci/brailleplot/rendering/RasterCanvas.java b/src/main/java/de/tudresden/inf/mci/brailleplot/layout/RasterCanvas.java similarity index 99% rename from src/main/java/de/tudresden/inf/mci/brailleplot/rendering/RasterCanvas.java rename to src/main/java/de/tudresden/inf/mci/brailleplot/layout/RasterCanvas.java index 57733279db96c7eed747339c58083100e226a4e0..f2c9385a9eecfb10ae8121b2e76b5165d1f6eb41 100644 --- a/src/main/java/de/tudresden/inf/mci/brailleplot/rendering/RasterCanvas.java +++ b/src/main/java/de/tudresden/inf/mci/brailleplot/layout/RasterCanvas.java @@ -1,4 +1,4 @@ -package de.tudresden.inf.mci.brailleplot.rendering; +package de.tudresden.inf.mci.brailleplot.layout; import de.tudresden.inf.mci.brailleplot.configparser.Format; import de.tudresden.inf.mci.brailleplot.configparser.Printer; diff --git a/src/main/java/de/tudresden/inf/mci/brailleplot/rendering/Rectangle.java b/src/main/java/de/tudresden/inf/mci/brailleplot/layout/Rectangle.java similarity index 99% rename from src/main/java/de/tudresden/inf/mci/brailleplot/rendering/Rectangle.java rename to src/main/java/de/tudresden/inf/mci/brailleplot/layout/Rectangle.java index 59b51ed645dea9baf598931d4e7866162527dde8..ef1b7723b243c72c5f8d985252d8416f24cf0eeb 100644 --- a/src/main/java/de/tudresden/inf/mci/brailleplot/rendering/Rectangle.java +++ b/src/main/java/de/tudresden/inf/mci/brailleplot/layout/Rectangle.java @@ -1,4 +1,4 @@ -package de.tudresden.inf.mci.brailleplot.rendering; +package de.tudresden.inf.mci.brailleplot.layout; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/de/tudresden/inf/mci/brailleplot/layout/SixDotBrailleRasterCanvas.java b/src/main/java/de/tudresden/inf/mci/brailleplot/layout/SixDotBrailleRasterCanvas.java new file mode 100644 index 0000000000000000000000000000000000000000..cb412f2071d0adbd0fcdf12458307fc9a44fb106 --- /dev/null +++ b/src/main/java/de/tudresden/inf/mci/brailleplot/layout/SixDotBrailleRasterCanvas.java @@ -0,0 +1,17 @@ +package de.tudresden.inf.mci.brailleplot.layout; + +import de.tudresden.inf.mci.brailleplot.configparser.Format; +import de.tudresden.inf.mci.brailleplot.configparser.Printer; +import de.tudresden.inf.mci.brailleplot.printabledata.BrailleCell6; + +/** + * Represents a raster consisting of 6-dot braille cells. (May be removed completely in favor of dynamic {@link RasterCanvas}) + * @author Leonard Kupper + * @version 2019.07.20 + */ +public class SixDotBrailleRasterCanvas extends RasterCanvas { + + public SixDotBrailleRasterCanvas(final Printer printer, final Format format) throws InsufficientRenderingAreaException { + super(printer, format, BrailleCell6.COLUMN_COUNT, BrailleCell6.ROW_COUNT); + } +} diff --git a/src/main/java/de/tudresden/inf/mci/brailleplot/layout/package-info.java b/src/main/java/de/tudresden/inf/mci/brailleplot/layout/package-info.java new file mode 100644 index 0000000000000000000000000000000000000000..99417b0c73b98e000943e432db2a25fdaf5fbbd9 --- /dev/null +++ b/src/main/java/de/tudresden/inf/mci/brailleplot/layout/package-info.java @@ -0,0 +1,4 @@ +/** + * Contains classes required for the layout of the rendered data. + */ +package de.tudresden.inf.mci.brailleplot.layout; diff --git a/src/main/java/de/tudresden/inf/mci/brailleplot/printabledata/BrailleCell6.java b/src/main/java/de/tudresden/inf/mci/brailleplot/printabledata/BrailleCell6.java index fc32e673cc68ab70fff1b92f8c4f30a89065441d..8f9bcdc6d8f73e2bc504f0bbe2f43ce8939cd5a3 100644 --- a/src/main/java/de/tudresden/inf/mci/brailleplot/printabledata/BrailleCell6.java +++ b/src/main/java/de/tudresden/inf/mci/brailleplot/printabledata/BrailleCell6.java @@ -16,9 +16,9 @@ package de.tudresden.inf.mci.brailleplot.printabledata; */ public final class BrailleCell6<T> { - static final int DOT_COUNT = 6; - static final int ROW_COUNT = 3; - static final int COLUMN_COUNT = 2; + public static final int DOT_COUNT = 6; + public static final int ROW_COUNT = 3; + public static final int COLUMN_COUNT = 2; private T[] mDots; diff --git a/src/main/java/de/tudresden/inf/mci/brailleplot/rendering/Axis.java b/src/main/java/de/tudresden/inf/mci/brailleplot/rendering/Axis.java index aa6ddc41ad0328221b7ff8981c40cd0d32e420bc..599262702397044b40ba0aedab15dde3e8e82a91 100644 --- a/src/main/java/de/tudresden/inf/mci/brailleplot/rendering/Axis.java +++ b/src/main/java/de/tudresden/inf/mci/brailleplot/rendering/Axis.java @@ -1,5 +1,7 @@ package de.tudresden.inf.mci.brailleplot.rendering; +import de.tudresden.inf.mci.brailleplot.layout.Rectangle; + import java.util.Map; import java.util.Objects; diff --git a/src/main/java/de/tudresden/inf/mci/brailleplot/rendering/BrailleText.java b/src/main/java/de/tudresden/inf/mci/brailleplot/rendering/BrailleText.java index afa027dec3057ae0c1f148e7a8f7a7ea52d2b037..b82855dc03032a8e2e1fb7f1b257bb969a159e3a 100644 --- a/src/main/java/de/tudresden/inf/mci/brailleplot/rendering/BrailleText.java +++ b/src/main/java/de/tudresden/inf/mci/brailleplot/rendering/BrailleText.java @@ -1,5 +1,7 @@ package de.tudresden.inf.mci.brailleplot.rendering; +import de.tudresden.inf.mci.brailleplot.layout.Rectangle; + import java.util.Objects; /** diff --git a/src/main/java/de/tudresden/inf/mci/brailleplot/rendering/BrailleTextRasterizer.java b/src/main/java/de/tudresden/inf/mci/brailleplot/rendering/BrailleTextRasterizer.java index eab684ebd70d05f39ec8d485a822d65996ab64b4..4c51958182cd32c3613900b1da13edbba8892006 100644 --- a/src/main/java/de/tudresden/inf/mci/brailleplot/rendering/BrailleTextRasterizer.java +++ b/src/main/java/de/tudresden/inf/mci/brailleplot/rendering/BrailleTextRasterizer.java @@ -1,5 +1,8 @@ package de.tudresden.inf.mci.brailleplot.rendering; +import de.tudresden.inf.mci.brailleplot.layout.InsufficientRenderingAreaException; +import de.tudresden.inf.mci.brailleplot.layout.RasterCanvas; + /** * A rasterizer for text on braille grids. This class is still a stub and must be implemented! * @version 2019.07.21 diff --git a/src/main/java/de/tudresden/inf/mci/brailleplot/rendering/FunctionalRasterizer.java b/src/main/java/de/tudresden/inf/mci/brailleplot/rendering/FunctionalRasterizer.java index 7793d99e0f356bbe14fe10a3a200167b4e6498f8..4d7fd2cb8f6817776155bad45e1fadf3c620bc33 100644 --- a/src/main/java/de/tudresden/inf/mci/brailleplot/rendering/FunctionalRasterizer.java +++ b/src/main/java/de/tudresden/inf/mci/brailleplot/rendering/FunctionalRasterizer.java @@ -1,5 +1,7 @@ package de.tudresden.inf.mci.brailleplot.rendering; +import de.tudresden.inf.mci.brailleplot.layout.InsufficientRenderingAreaException; +import de.tudresden.inf.mci.brailleplot.layout.RasterCanvas; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/de/tudresden/inf/mci/brailleplot/rendering/FunctionalRenderingBase.java b/src/main/java/de/tudresden/inf/mci/brailleplot/rendering/FunctionalRenderingBase.java index 67c79967e1a57c71853f501002a7032a279ed1c9..1dfe60a4570b11912791c6b9174a4a647b8366c6 100644 --- a/src/main/java/de/tudresden/inf/mci/brailleplot/rendering/FunctionalRenderingBase.java +++ b/src/main/java/de/tudresden/inf/mci/brailleplot/rendering/FunctionalRenderingBase.java @@ -1,5 +1,7 @@ package de.tudresden.inf.mci.brailleplot.rendering; +import de.tudresden.inf.mci.brailleplot.layout.InsufficientRenderingAreaException; +import de.tudresden.inf.mci.brailleplot.layout.RasterCanvas; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -81,7 +83,7 @@ public class FunctionalRenderingBase { * Sets a new canvas for any rasterizing operations performed by this rendering base. The rasterizing results are * 'drawn' on the currently selected canvas instance. There are no restrictions on the raster canvas. It is also * possible to pass a canvas which already contains data to 'overlay' the new data. - * @param raster The {@link AbstractCanvas} instance which will be used for all subsequent rasterizing operations. + * @param raster The {@link RasterCanvas} instance which will be used for all subsequent rasterizing operations. */ public void setRasterCanvas(final RasterCanvas raster) { mRaster = Objects.requireNonNull(raster); @@ -89,8 +91,8 @@ public class FunctionalRenderingBase { } /** - * Gets the currently set {@link AbstractCanvas} of the rendering base. - * @return An instance of {@link AbstractCanvas}. + * Gets the currently set {@link RasterCanvas} of the rendering base. + * @return An instance of {@link RasterCanvas}. */ public RasterCanvas getRaster() { return mRaster; diff --git a/src/main/java/de/tudresden/inf/mci/brailleplot/rendering/ImageRasterizer.java b/src/main/java/de/tudresden/inf/mci/brailleplot/rendering/ImageRasterizer.java index 4722df82beea2fab451fef6867e69be1a0a90e62..f266f95c117b97ac170e954206bc8609f15a05d2 100644 --- a/src/main/java/de/tudresden/inf/mci/brailleplot/rendering/ImageRasterizer.java +++ b/src/main/java/de/tudresden/inf/mci/brailleplot/rendering/ImageRasterizer.java @@ -1,5 +1,7 @@ package de.tudresden.inf.mci.brailleplot.rendering; +import de.tudresden.inf.mci.brailleplot.layout.RasterCanvas; +import de.tudresden.inf.mci.brailleplot.layout.Rectangle; import de.tudresden.inf.mci.brailleplot.printabledata.MatrixData; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/de/tudresden/inf/mci/brailleplot/rendering/LinearMappingAxisRasterizer.java b/src/main/java/de/tudresden/inf/mci/brailleplot/rendering/LinearMappingAxisRasterizer.java index 208fb2b0b0efc28cf9209c5dec05923c57c61e9a..268a9d25175262dd4a8da2436802516542d93ccf 100644 --- a/src/main/java/de/tudresden/inf/mci/brailleplot/rendering/LinearMappingAxisRasterizer.java +++ b/src/main/java/de/tudresden/inf/mci/brailleplot/rendering/LinearMappingAxisRasterizer.java @@ -1,5 +1,8 @@ package de.tudresden.inf.mci.brailleplot.rendering; +import de.tudresden.inf.mci.brailleplot.layout.InsufficientRenderingAreaException; +import de.tudresden.inf.mci.brailleplot.layout.RasterCanvas; +import de.tudresden.inf.mci.brailleplot.layout.Rectangle; import de.tudresden.inf.mci.brailleplot.printabledata.MatrixData; import static de.tudresden.inf.mci.brailleplot.rendering.Axis.Type.X_AXIS; diff --git a/src/main/java/de/tudresden/inf/mci/brailleplot/rendering/MasterRenderer.java b/src/main/java/de/tudresden/inf/mci/brailleplot/rendering/MasterRenderer.java index 3076b63da2149f7a940fcfdbfff05f0c923776de..23fe3546fe6eaed4ffacc5c948a9bcd5b1d02e9a 100644 --- a/src/main/java/de/tudresden/inf/mci/brailleplot/rendering/MasterRenderer.java +++ b/src/main/java/de/tudresden/inf/mci/brailleplot/rendering/MasterRenderer.java @@ -1,5 +1,8 @@ package de.tudresden.inf.mci.brailleplot.rendering; +import de.tudresden.inf.mci.brailleplot.layout.InsufficientRenderingAreaException; +import de.tudresden.inf.mci.brailleplot.layout.RasterCanvas; +import de.tudresden.inf.mci.brailleplot.layout.SixDotBrailleRasterCanvas; import de.tudresden.inf.mci.brailleplot.diagrams.BarChart; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/de/tudresden/inf/mci/brailleplot/rendering/Rasterizer.java b/src/main/java/de/tudresden/inf/mci/brailleplot/rendering/Rasterizer.java index 094f03a649868d9cc06171f2fd590351ff0a6909..286a7a4d21a1d2225c6bb69d9e8b7784bca10c00 100644 --- a/src/main/java/de/tudresden/inf/mci/brailleplot/rendering/Rasterizer.java +++ b/src/main/java/de/tudresden/inf/mci/brailleplot/rendering/Rasterizer.java @@ -1,6 +1,9 @@ package de.tudresden.inf.mci.brailleplot.rendering; +import de.tudresden.inf.mci.brailleplot.layout.InsufficientRenderingAreaException; +import de.tudresden.inf.mci.brailleplot.layout.RasterCanvas; +import de.tudresden.inf.mci.brailleplot.layout.Rectangle; import de.tudresden.inf.mci.brailleplot.printabledata.MatrixData; import static java.lang.Math.max; diff --git a/src/main/java/de/tudresden/inf/mci/brailleplot/rendering/SixDotBrailleRasterCanvas.java b/src/main/java/de/tudresden/inf/mci/brailleplot/rendering/SixDotBrailleRasterCanvas.java deleted file mode 100644 index 62b57a9468f1c18c4b966d1ac6d35f518935eb4b..0000000000000000000000000000000000000000 --- a/src/main/java/de/tudresden/inf/mci/brailleplot/rendering/SixDotBrailleRasterCanvas.java +++ /dev/null @@ -1,19 +0,0 @@ -package de.tudresden.inf.mci.brailleplot.rendering; - -import de.tudresden.inf.mci.brailleplot.configparser.Format; -import de.tudresden.inf.mci.brailleplot.configparser.Printer; - -/** - * Represents a raster consisting of 6-dot braille cells. (May be removed completely in favor of dynamic {@link RasterCanvas}) - * @author Leonard Kupper - * @version 2019.07.20 - */ -class SixDotBrailleRasterCanvas extends RasterCanvas { - - private static final int CELL_WIDTH = 2; - private static final int CELL_HEIGHT = 3; - - SixDotBrailleRasterCanvas(final Printer printer, final Format format) throws InsufficientRenderingAreaException { - super(printer, format, CELL_WIDTH, CELL_HEIGHT); - } -} diff --git a/src/main/java/de/tudresden/inf/mci/brailleplot/rendering/UniformTextureBarChartRasterizer.java b/src/main/java/de/tudresden/inf/mci/brailleplot/rendering/UniformTextureBarChartRasterizer.java index 8ed176c71febe33f66253b6658a1a80cd5e436f6..05eaadda4f8f09f7ce93b378b81562e3d27c596b 100644 --- a/src/main/java/de/tudresden/inf/mci/brailleplot/rendering/UniformTextureBarChartRasterizer.java +++ b/src/main/java/de/tudresden/inf/mci/brailleplot/rendering/UniformTextureBarChartRasterizer.java @@ -1,6 +1,9 @@ package de.tudresden.inf.mci.brailleplot.rendering; import de.tudresden.inf.mci.brailleplot.datacontainers.PointList; +import de.tudresden.inf.mci.brailleplot.layout.InsufficientRenderingAreaException; +import de.tudresden.inf.mci.brailleplot.layout.RasterCanvas; +import de.tudresden.inf.mci.brailleplot.layout.Rectangle; import de.tudresden.inf.mci.brailleplot.printabledata.MatrixData; import de.tudresden.inf.mci.brailleplot.diagrams.BarChart; diff --git a/src/test/java/de/tudresden/inf/mci/brailleplot/rendering/RasterCanvasTest.java b/src/test/java/de/tudresden/inf/mci/brailleplot/layout/RasterCanvasTest.java similarity index 96% rename from src/test/java/de/tudresden/inf/mci/brailleplot/rendering/RasterCanvasTest.java rename to src/test/java/de/tudresden/inf/mci/brailleplot/layout/RasterCanvasTest.java index 17d31b7376d62e331c9fa6042f7f57b6ddf0320c..f0cbc05ce550ce78ee1261c77801fb15da0c952c 100644 --- a/src/test/java/de/tudresden/inf/mci/brailleplot/rendering/RasterCanvasTest.java +++ b/src/test/java/de/tudresden/inf/mci/brailleplot/layout/RasterCanvasTest.java @@ -1,8 +1,13 @@ -package de.tudresden.inf.mci.brailleplot.rendering; +package de.tudresden.inf.mci.brailleplot.layout; import de.tudresden.inf.mci.brailleplot.configparser.ConfigurationParser; import de.tudresden.inf.mci.brailleplot.configparser.JavaPropertiesConfigurationParser; +import de.tudresden.inf.mci.brailleplot.layout.RasterCanvas; +import de.tudresden.inf.mci.brailleplot.layout.Rectangle; +import de.tudresden.inf.mci.brailleplot.layout.SixDotBrailleRasterCanvas; import de.tudresden.inf.mci.brailleplot.printabledata.MatrixData; +import de.tudresden.inf.mci.brailleplot.rendering.Image; +import de.tudresden.inf.mci.brailleplot.rendering.MasterRenderer; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/src/test/java/de/tudresden/inf/mci/brailleplot/rendering/RectangleTest.java b/src/test/java/de/tudresden/inf/mci/brailleplot/layout/RectangleTest.java similarity index 98% rename from src/test/java/de/tudresden/inf/mci/brailleplot/rendering/RectangleTest.java rename to src/test/java/de/tudresden/inf/mci/brailleplot/layout/RectangleTest.java index 126a146a38b45c8728986f5f325aca32530d0240..80cc12a8e337589e2998ee6f4c2b8185bdb619af 100644 --- a/src/test/java/de/tudresden/inf/mci/brailleplot/rendering/RectangleTest.java +++ b/src/test/java/de/tudresden/inf/mci/brailleplot/layout/RectangleTest.java @@ -1,5 +1,6 @@ -package de.tudresden.inf.mci.brailleplot.rendering; +package de.tudresden.inf.mci.brailleplot.layout; +import de.tudresden.inf.mci.brailleplot.layout.Rectangle; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/src/test/java/de/tudresden/inf/mci/brailleplot/rendering/FunctionalRasterizerTest.java b/src/test/java/de/tudresden/inf/mci/brailleplot/rendering/FunctionalRasterizerTest.java index 61c0cc354167439d77fc7c6e9c4fdc68432794c6..630419f330bc118d71d6add1be0aca3d023d82e3 100644 --- a/src/test/java/de/tudresden/inf/mci/brailleplot/rendering/FunctionalRasterizerTest.java +++ b/src/test/java/de/tudresden/inf/mci/brailleplot/rendering/FunctionalRasterizerTest.java @@ -4,6 +4,8 @@ import de.tudresden.inf.mci.brailleplot.configparser.ConfigurationParser; import de.tudresden.inf.mci.brailleplot.configparser.Format; import de.tudresden.inf.mci.brailleplot.configparser.JavaPropertiesConfigurationParser; import de.tudresden.inf.mci.brailleplot.configparser.Printer; +import de.tudresden.inf.mci.brailleplot.layout.RasterCanvas; +import de.tudresden.inf.mci.brailleplot.layout.SixDotBrailleRasterCanvas; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/src/test/java/de/tudresden/inf/mci/brailleplot/rendering/MasterRendererTest.java b/src/test/java/de/tudresden/inf/mci/brailleplot/rendering/MasterRendererTest.java index 5bf15320f9afa71d734b6e80f26de37e400efe7c..27a0db664751722ae32a3d1bdee76a04a745e46c 100644 --- a/src/test/java/de/tudresden/inf/mci/brailleplot/rendering/MasterRendererTest.java +++ b/src/test/java/de/tudresden/inf/mci/brailleplot/rendering/MasterRendererTest.java @@ -4,6 +4,8 @@ import de.tudresden.inf.mci.brailleplot.configparser.ConfigurationParser; import de.tudresden.inf.mci.brailleplot.configparser.Format; import de.tudresden.inf.mci.brailleplot.configparser.JavaPropertiesConfigurationParser; import de.tudresden.inf.mci.brailleplot.configparser.Printer; +import de.tudresden.inf.mci.brailleplot.layout.RasterCanvas; +import de.tudresden.inf.mci.brailleplot.layout.Rectangle; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test;