Merge branch 'master' into feat/line_rasterizer-31 (0ee387fd) · Commits · Georg Graßnick / BraillePlot

Commit 0ee387fd authored 5 years ago by Andrey Ruzhanskiy

Merge branch 'master' into feat/line_rasterizer-31

 Conflicts:
	src/main/java/de/tudresden/inf/mci/brailleplot/App.java
	src/main/resources/config/standard_formats.properties

parents 7680eb07 5297d103

No related branches found

No related tags found

1 merge request!40feat/line rasterizer 31

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/de/tudresden/inf/mci/brailleplot/App.java 9 additions, 4 deletions

src/main/java/de/tudresden/inf/mci/brailleplot/App.java
src/main/java/de/tudresden/inf/mci/brailleplot/configparser/ConfigurationParser.java 31 additions, 6 deletions

...inf/mci/brailleplot/configparser/ConfigurationParser.java
src/main/java/de/tudresden/inf/mci/brailleplot/configparser/ConfigurationValidator.java 7 additions, 0 deletions

.../mci/brailleplot/configparser/ConfigurationValidator.java
src/main/java/de/tudresden/inf/mci/brailleplot/configparser/JavaPropertiesConfigurationParser.java 8 additions, 4 deletions

...eplot/configparser/JavaPropertiesConfigurationParser.java
src/main/java/de/tudresden/inf/mci/brailleplot/configparser/JavaPropertiesConfigurationValidator.java 57 additions, 4 deletions

...ot/configparser/JavaPropertiesConfigurationValidator.java
src/main/java/de/tudresden/inf/mci/brailleplot/configparser/Representation.java 27 additions, 0 deletions

...sden/inf/mci/brailleplot/configparser/Representation.java
src/main/java/de/tudresden/inf/mci/brailleplot/configparser/RepresentationProperty.java 20 additions, 0 deletions

.../mci/brailleplot/configparser/RepresentationProperty.java
src/main/java/de/tudresden/inf/mci/brailleplot/csvparser/CsvParser.java 3 additions, 2 deletions

...de/tudresden/inf/mci/brailleplot/csvparser/CsvParser.java
src/main/java/de/tudresden/inf/mci/brailleplot/layout/AbstractCanvas.java 20 additions, 1 deletion

.../tudresden/inf/mci/brailleplot/layout/AbstractCanvas.java
src/main/java/de/tudresden/inf/mci/brailleplot/layout/PlotCanvas.java 3 additions, 2 deletions

...a/de/tudresden/inf/mci/brailleplot/layout/PlotCanvas.java
src/main/java/de/tudresden/inf/mci/brailleplot/layout/RasterCanvas.java 4 additions, 2 deletions

...de/tudresden/inf/mci/brailleplot/layout/RasterCanvas.java
src/main/java/de/tudresden/inf/mci/brailleplot/layout/SixDotBrailleRasterCanvas.java 3 additions, 2 deletions

...inf/mci/brailleplot/layout/SixDotBrailleRasterCanvas.java
src/main/java/de/tudresden/inf/mci/brailleplot/rendering/BarChartRasterizer.java 59 additions, 32 deletions

...den/inf/mci/brailleplot/rendering/BarChartRasterizer.java
src/main/java/de/tudresden/inf/mci/brailleplot/rendering/BrailleText.java 15 additions, 0 deletions

.../tudresden/inf/mci/brailleplot/rendering/BrailleText.java
src/main/java/de/tudresden/inf/mci/brailleplot/rendering/FunctionalRenderingBase.java 1 addition, 1 deletion

...nf/mci/brailleplot/rendering/FunctionalRenderingBase.java
src/main/java/de/tudresden/inf/mci/brailleplot/rendering/LiblouisBrailleTextRasterizer.java 69 additions, 10 deletions

.../brailleplot/rendering/LiblouisBrailleTextRasterizer.java
src/main/java/de/tudresden/inf/mci/brailleplot/rendering/MasterRenderer.java 17 additions, 6 deletions

...dresden/inf/mci/brailleplot/rendering/MasterRenderer.java
src/main/java/de/tudresden/inf/mci/brailleplot/rendering/UniformTextureBarChartRasterizer.java 1 addition, 1 deletion

...ailleplot/rendering/UniformTextureBarChartRasterizer.java
src/main/java/de/tudresden/inf/mci/brailleplot/rendering/language/BrailleLanguage.java 34 additions, 0 deletions

...f/mci/brailleplot/rendering/language/BrailleLanguage.java
src/main/resources/config/default.properties 14 additions, 2 deletions

src/main/resources/config/default.properties

with 402 additions and 79 deletions

Please register or to comment