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 278878678e8e88268d4821d1da54a8bd748d93ec..959c9ad308fee224f90e2a79a93c135feca7b123 100644 --- a/src/main/java/de/tudresden/inf/mci/brailleplot/App.java +++ b/src/main/java/de/tudresden/inf/mci/brailleplot/App.java @@ -186,8 +186,8 @@ public final class App { RasterCanvas canvas = renderer.rasterize(barChart); //renderer.getRenderingBase().registerRasterizer(new FunctionalRasterizer<BrailleText>(BrailleText.class ,new BrailleTextRasterizer())); //RasterCanvas canvas = renderer.rasterize(new BrailleText("ABCDabcd23465/%",new Rectangle(0,0,1000,1000))); - SimpleMatrixDataImpl<Boolean> mat = (SimpleMatrixDataImpl<Boolean>) canvas.getCurrentPage(); - mLogger.debug("Render preview:\n" + mat.toBoolString()); + //SimpleMatrixDataImpl<Boolean> mat = (SimpleMatrixDataImpl<Boolean>) canvas.getCurrentPage(); + //mLogger.debug("Render preview:\n" + mat.toBoolString()); // SVG exporting SvgExporter<RasterCanvas> svgExporter = new BoolMatrixDataSvgExporter(canvas); @@ -214,13 +214,18 @@ public final class App { renderer.getRenderingBase().registerRasterizer(new FunctionalRasterizer<BrailleText>(BrailleText.class, textRasterizer)); RasterCanvas refCanvas = renderer.rasterize(new BrailleText(" ", new Rectangle(0, 0, 0, 0))); - String text = "()[]üÄß@`"; + //String text = "()[]üÄß@` "; + String text = " °^1234567890ß´!\"§$%&/()=?`@€öüäÖÜÄ\\*+~'#<>|,;.:-_"; + //String text = ""; int xpos = 0; int ypos = 0; int maxWidth = 20 * 2; int height = textRasterizer.calculateRequiredHeight(text, xpos, ypos, maxWidth, refCanvas); Rectangle textArea = new Rectangle(xpos, ypos, maxWidth, height); RasterCanvas mcanvas = renderer.rasterize(new BrailleText(text, textArea)); + // RasterCanvas m2canvas = renderer.rasterize(new BrailleText(text2, textArea)); + SimpleMatrixDataImpl<Boolean> mat = (SimpleMatrixDataImpl<Boolean>) mcanvas.getCurrentPage(); + mLogger.debug("Render preview:\n" + mat.toBoolString()); diff --git a/src/main/resources/mapping/kurzschrift_DE.properties b/src/main/resources/mapping/kurzschrift_DE.properties index ccd3d856c6baf3fa0c24f1b23a98153cf6094f67..8b1144921c7e42ab3f54ec42b8ac750b5358b0da 100644 --- a/src/main/resources/mapping/kurzschrift_DE.properties +++ b/src/main/resources/mapping/kurzschrift_DE.properties @@ -27,6 +27,7 @@ (=011011 \u0023=001111 +=000111 +=011010 ~=000010 "=000100 @@ -38,11 +39,14 @@ _=000111 ^=110111 \==011110 +/=010011 $=000101 |=001100 {=111011 }=011111 `=001110 +%=111111 +&=111101 # Numbers