From 0da4419529a9332dd4846de1cc86f60a86e99d3d Mon Sep 17 00:00:00 2001
From: Andrey Ruzhanskiy <andrey.ruzhanskiy@tu-dresden.de>
Date: Thu, 5 Sep 2019 13:58:28 +0200
Subject: [PATCH] Test if deadlock
---
.../java/de/tudresden/inf/mci/brailleplot/App.java | 11 ++++++++---
src/main/resources/mapping/kurzschrift_DE.properties | 4 ++++
2 files changed, 12 insertions(+), 3 deletions(-)
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 27887867..959c9ad3 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 ccd3d856..8b114492 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
--
GitLab