Merge branch 'master' into feat/scatterplot_rasterizer-34 (c7a94dbd) · Commits · Georg Graßnick / BraillePlot

Commit c7a94dbd authored 5 years ago by Georg Graßnick

Merge branch 'master' into feat/scatterplot_rasterizer-34

 Conflicts:
	src/main/java/de/tudresden/inf/mci/brailleplot/App.java
	src/main/java/de/tudresden/inf/mci/brailleplot/rendering/MasterRenderer.java

parents 71dd23e7 9be5380a

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/de/tudresden/inf/mci/brailleplot/App.java 123 additions, 88 deletions

src/main/java/de/tudresden/inf/mci/brailleplot/App.java
src/main/java/de/tudresden/inf/mci/brailleplot/commandline/CommandLineParser.java 50 additions, 7 deletions

...en/inf/mci/brailleplot/commandline/CommandLineParser.java
src/main/java/de/tudresden/inf/mci/brailleplot/commandline/SettingType.java 33 additions, 5 deletions

...udresden/inf/mci/brailleplot/commandline/SettingType.java
src/main/java/de/tudresden/inf/mci/brailleplot/configparser/JavaPropertiesConfigurationValidator.java 6 additions, 0 deletions

...ot/configparser/JavaPropertiesConfigurationValidator.java
src/main/java/de/tudresden/inf/mci/brailleplot/datacontainers/PointList.java 9 additions, 2 deletions

...dresden/inf/mci/brailleplot/datacontainers/PointList.java
src/main/java/de/tudresden/inf/mci/brailleplot/datacontainers/SimplePointListImpl.java 18 additions, 2 deletions

...f/mci/brailleplot/datacontainers/SimplePointListImpl.java
src/main/java/de/tudresden/inf/mci/brailleplot/diagrams/LineChart.java 66 additions, 0 deletions

.../de/tudresden/inf/mci/brailleplot/diagrams/LineChart.java
src/main/java/de/tudresden/inf/mci/brailleplot/printerbackend/AbstractDocumentBuilder.java 6 additions, 5 deletions

...i/brailleplot/printerbackend/AbstractDocumentBuilder.java
src/main/java/de/tudresden/inf/mci/brailleplot/printerbackend/AbstractIndexV4Builder.java 8 additions, 1 deletion

...ci/brailleplot/printerbackend/AbstractIndexV4Builder.java
src/main/java/de/tudresden/inf/mci/brailleplot/printerbackend/FloatingDotAreaBuilder.java 46 additions, 6 deletions

...ci/brailleplot/printerbackend/FloatingDotAreaBuilder.java
src/main/java/de/tudresden/inf/mci/brailleplot/printerbackend/GraphicPrintBuilder.java 1 addition, 1 deletion

...f/mci/brailleplot/printerbackend/GraphicPrintBuilder.java
src/main/java/de/tudresden/inf/mci/brailleplot/printerbackend/NormalBuilder.java 1 addition, 1 deletion

...den/inf/mci/brailleplot/printerbackend/NormalBuilder.java
src/main/java/de/tudresden/inf/mci/brailleplot/printerbackend/PrintDirector.java 116 additions, 6 deletions

...den/inf/mci/brailleplot/printerbackend/PrintDirector.java
src/main/java/de/tudresden/inf/mci/brailleplot/rendering/Axis.java 1 addition, 1 deletion

...java/de/tudresden/inf/mci/brailleplot/rendering/Axis.java
src/main/java/de/tudresden/inf/mci/brailleplot/rendering/BarChartRasterizer.java 8 additions, 5 deletions

...den/inf/mci/brailleplot/rendering/BarChartRasterizer.java
src/main/java/de/tudresden/inf/mci/brailleplot/rendering/BrailleText.java 5 additions, 1 deletion

.../tudresden/inf/mci/brailleplot/rendering/BrailleText.java
src/main/java/de/tudresden/inf/mci/brailleplot/rendering/BrailleTextRasterizer.java 0 additions, 1 deletion

.../inf/mci/brailleplot/rendering/BrailleTextRasterizer.java
src/main/java/de/tudresden/inf/mci/brailleplot/rendering/Legend.java 70 additions, 3 deletions

...va/de/tudresden/inf/mci/brailleplot/rendering/Legend.java
src/main/java/de/tudresden/inf/mci/brailleplot/rendering/LegendRasterizer.java 74 additions, 20 deletions

...esden/inf/mci/brailleplot/rendering/LegendRasterizer.java
src/main/java/de/tudresden/inf/mci/brailleplot/rendering/LiblouisBrailleTextRasterizer.java 1 addition, 3 deletions

.../brailleplot/rendering/LiblouisBrailleTextRasterizer.java

with 642 additions and 158 deletions

Please register or to comment