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 47ca8ae97b82459dac268a95fae2a380cc6d49c9..d6fe60d5d20d22488aa471e144c1e7d56bf54d05 100644 --- a/src/main/java/de/tudresden/inf/mci/brailleplot/App.java +++ b/src/main/java/de/tudresden/inf/mci/brailleplot/App.java @@ -151,16 +151,13 @@ public final class App { // Parse csv data ClassLoader classloader = Thread.currentThread().getContextClassLoader(); - InputStream csvStream = classloader.getResourceAsStream("examples/csv/0_bar_chart_categorical.csv"); + InputStream csvStream = classloader.getResourceAsStream("examples/csv/0_bar_chart.csv"); Reader csvReader = new BufferedReader(new InputStreamReader(csvStream)); CsvParser csvParser = new CsvParser(csvReader, ',', '\"'); - PointListContainer<PointList> container = csvParser.parse(CsvType.X_ALIGNED_CATEGORIES, CsvOrientation.HORIZONTAL); - System.out.print("mCscData: " + csvParser.mCsvData + "\n"); + PointListContainer<PointList> container = csvParser.parse(CsvType.X_ALIGNED, CsvOrientation.VERTICAL); mLogger.debug("Internal data representation:\n {}", container.toString()); BarChart barChart = new BarChart(container); - System.out.print("names: " + barChart.getCategoryNames() + "\n"); - System.out.print("amount: " + barChart.getCategoryCount() + "\n"); // Render diagram MasterRenderer renderer = new MasterRenderer(indexV4Printer, a4Format); diff --git a/src/main/java/de/tudresden/inf/mci/brailleplot/csvparser/CsvParser.java b/src/main/java/de/tudresden/inf/mci/brailleplot/csvparser/CsvParser.java index ee58343471ef5a9f81d3001d2dfeb253f2c18f34..d98a8345a553f4b31aa8613d6b4e51cae6807f02 100644 --- a/src/main/java/de/tudresden/inf/mci/brailleplot/csvparser/CsvParser.java +++ b/src/main/java/de/tudresden/inf/mci/brailleplot/csvparser/CsvParser.java @@ -24,7 +24,7 @@ public class CsvParser { private final Logger mLogger = LoggerFactory.getLogger(CsvParser.class); - public ArrayList<ArrayList<String>> mCsvData; + private ArrayList<ArrayList<String>> mCsvData; /** * Initiates the parser. The parser reads from the specified {@code reader} diff --git a/src/main/resources/examples/csv/0_bar_chart_categorical.csv b/src/main/resources/examples/csv/0_bar_chart_categorical.csv index 7517f01e07008604edce1bac0784601470c875bf..9804ec7a86ab4a6846f1343f90965280e5d5c688 100644 --- a/src/main/resources/examples/csv/0_bar_chart_categorical.csv +++ b/src/main/resources/examples/csv/0_bar_chart_categorical.csv @@ -1,4 +1,5 @@ -Reihe a,Reihe b,Reihe c,Reihe d -Kat.1,3,"2,5",1,3 -Kat.2,4,3,2,5 -Kat.3,"4,5",3,1,"0,2" +, Reihe a , Reihe b , Reihe c, Reihe d +Kat.1 ,3 ,"2,5" ,1 ,3 +Kat.2 ,4 ,3 ,2 ,5 +Kat.3 ,"4,5" ,3 ,1,"0,2" +Kat.4 ,"4,5" ,3 ,1,"0,2" diff --git a/src/main/resources/examples/csv/0_bar_chart_vertical.csv b/src/main/resources/examples/csv/0_bar_chart_categorical_horizontal.csv similarity index 100% rename from src/main/resources/examples/csv/0_bar_chart_vertical.csv rename to src/main/resources/examples/csv/0_bar_chart_categorical_horizontal.csv