joerg/graphics
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cosmetic changes

Browse source
This commit is contained in:
Jörg Prante 2021-12-13 21:21:39 +01:00
parent 21030c24f0
commit 17a613541a
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
graphics-chart/src/main/java/org/xbib/graphics/chart/io/CSVImporter.java
View file

@ -7,7 +7,7 @@ import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.nio.charset.Charset; import java.nio.charset.StandardCharsets;
import java.nio.file.FileVisitOption; import java.nio.file.FileVisitOption;
import java.nio.file.FileVisitResult; import java.nio.file.FileVisitResult;
import java.nio.file.Files; import java.nio.file.Files;
@ -35,7 +35,7 @@ public class CSVImporter {
Theme theme) throws IOException { Theme theme) throws IOException {
XYChart chart = new XYChart(width, height, theme); XYChart chart = new XYChart(width, height, theme);
final PathMatcher pathMatcher = path.getFileSystem().getPathMatcher("glob:*.csv"); final PathMatcher pathMatcher = path.getFileSystem().getPathMatcher("glob:*.csv");
Files.walkFileTree(path, EnumSet.of(FileVisitOption.FOLLOW_LINKS), Integer.MAX_VALUE, new SimpleFileVisitor<Path>() { Files.walkFileTree(path, EnumSet.of(FileVisitOption.FOLLOW_LINKS), Integer.MAX_VALUE, new SimpleFileVisitor<>() {
@Override @Override
public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException { public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
if (pathMatcher.matches(file.getFileName())) { if (pathMatcher.matches(file.getFileName())) {
@ -45,12 +45,11 @@ public class CSVImporter {
} else { } else {
xAndYData = getSeriesDataFromCSVColumns(Files.newInputStream(file)); xAndYData = getSeriesDataFromCSVColumns(Files.newInputStream(file));
} }
String base = file.toString().substring(0, file.toString().indexOf(".csv"));
if (xAndYData[2] == null || xAndYData[2].trim().equalsIgnoreCase("")) { if (xAndYData[2] == null || xAndYData[2].trim().equalsIgnoreCase("")) {
chart.addSeries(file.toString().substring(0, file.toString().indexOf(".csv")), chart.addSeries(base, getAxisData(xAndYData[0]), getAxisData(xAndYData[1]));
getAxisData(xAndYData[0]), getAxisData(xAndYData[1]));
} else { } else {
chart.addSeries(file.toString().substring(0, file.toString().indexOf(".csv")), chart.addSeries(base, getAxisData(xAndYData[0]), getAxisData(xAndYData[1]), getAxisData(xAndYData[2]));
getAxisData(xAndYData[0]), getAxisData(xAndYData[1]), getAxisData(xAndYData[2]));
} }
} }
return FileVisitResult.CONTINUE; return FileVisitResult.CONTINUE;
@ -62,7 +61,7 @@ public class CSVImporter {
private static String[] getSeriesDataFromCSVRows(InputStream inputStream) throws IOException { private static String[] getSeriesDataFromCSVRows(InputStream inputStream) throws IOException {
String[] xAndYData = new String[3]; String[] xAndYData = new String[3];
try (BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream, try (BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream,
Charset.forName("UTF-8")))) { StandardCharsets.UTF_8))) {
int counter = 0; int counter = 0;
String line = null; String line = null;
while ((line = bufferedReader.readLine()) != null) { while ((line = bufferedReader.readLine()) != null) {
@ -78,7 +77,7 @@ public class CSVImporter {
xAndYData[1] = ""; xAndYData[1] = "";
xAndYData[2] = ""; xAndYData[2] = "";
try (BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream, try (BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream,
Charset.forName("UTF-8")))) { StandardCharsets.UTF_8))) {
String line = null; String line = null;
while ((line = bufferedReader.readLine()) != null) { while ((line = bufferedReader.readLine()) != null) {
String[] dataArray = line.split(","); String[] dataArray = line.split(",");

2
graphics-pdfbox-layout/build.gradle
View file

@ -1,8 +1,8 @@
dependencies { dependencies {
api project(':graphics-pdfbox') api project(':graphics-pdfbox')
api project(':graphics-barcode') api project(':graphics-barcode')
api project(':graphics-chart')
api "org.xbib:settings-datastructures:${project.property('xbib-content.version')}" api "org.xbib:settings-datastructures:${project.property('xbib-content.version')}"
//api "io.sf.carte:echosvg-bridge:${project.property('echosvg.version')}"
runtimeOnly "org.xbib:settings-datastructures-json:${project.property('xbib-content.version')}" runtimeOnly "org.xbib:settings-datastructures-json:${project.property('xbib-content.version')}"
runtimeOnly "org.xbib:settings-datastructures-yaml:${project.property('xbib-content.version')}" runtimeOnly "org.xbib:settings-datastructures-yaml:${project.property('xbib-content.version')}"
} }