Merge branch 'feat/bar_chart_update-46' into 'master' (b15fb375) · Commits · Georg Graßnick / BraillePlot

Commit b15fb375 authored 5 years ago by Georg Graßnick

Merge branch 'feat/bar_chart_update-46' into 'master'

Feat/bar chart update 46

See merge request !33

parents 3ac79a4d d219cc71

No related branches found

No related tags found

1 merge request!33Feat/bar chart update 46

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/de/tudresden/inf/mci/brailleplot/App.java 7 additions, 3 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/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 58 additions, 32 deletions

...den/inf/mci/brailleplot/rendering/BarChartRasterizer.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/MasterRenderer.java 17 additions, 6 deletions

...dresden/inf/mci/brailleplot/rendering/MasterRenderer.java
src/main/resources/config/default.properties 14 additions, 2 deletions

src/main/resources/config/default.properties
src/main/resources/config/standard_formats.properties 5 additions, 5 deletions

src/main/resources/config/standard_formats.properties
src/test/java/de/tudresden/inf/mci/brailleplot/layout/RasterCanvasTest.java 5 additions, 5 deletions

...udresden/inf/mci/brailleplot/layout/RasterCanvasTest.java
src/test/java/de/tudresden/inf/mci/brailleplot/rendering/FunctionalRasterizerTest.java 4 additions, 5 deletions

...f/mci/brailleplot/rendering/FunctionalRasterizerTest.java
src/test/java/de/tudresden/inf/mci/brailleplot/rendering/MasterRendererTest.java 5 additions, 6 deletions

...den/inf/mci/brailleplot/rendering/MasterRendererTest.java
src/test/resources/config/default.properties 13 additions, 1 deletion

src/test/resources/config/default.properties

with 309 additions and 87 deletions

Please register or to comment