diff --git a/src/ecoparasite/Application.java b/src/ecoparasite/Application.java index f6fdb9c..902625d 100644 --- a/src/ecoparasite/Application.java +++ b/src/ecoparasite/Application.java @@ -66,7 +66,7 @@ public class Application { System.out.println("Veuillez rentrez le nom du fichier :"); name = sc.nextLine(); - for (int i = 0; i < 3; i++) { + for (int i = 0; i < VALID_FILES.length; i++) { if (name.contains(VALID_FILES[i])){ isValid = true; break; @@ -111,7 +111,7 @@ public class Application { // Sauvegarde pour plus tard. double[] ABCoef = Completion.getLinearCoef(mackerelSet, getLength, getInfes); - ArrayList SVGElements = axesInstance.buildAll( "Length", "Infestation", mackerelXY, ABCoef[0], ABCoef[1] ); + ArrayList SVGElements = axesInstance.buildAll( "Length (mm)", "Taux d'infestation", mackerelXY, ABCoef[0], ABCoef[1] ); SVGFactory.createSVG( SVGElements ); } @@ -149,7 +149,7 @@ public class Application { // Sauvegarde pour plus tard. double[] ABCoef = Completion.getLinearCoef(merluSet, getLength, getInfes); - ArrayList SVGElements = axesInstance.buildAll( "Length", "Infestation", merluXY, ABCoef[0], ABCoef[1] ); + ArrayList SVGElements = axesInstance.buildAll( "Length (mm)", "Taux d'infestation", merluXY, ABCoef[0], ABCoef[1] ); SVGFactory.createSVG( SVGElements ); } @@ -211,14 +211,9 @@ public class Application { return; } + double[] ABCoef = Completion.getLinearCoef(popSet, getLength, getInfes); - ArrayList elements = new ArrayList<>(); - - elements.addAll(axesInstance.buildAxes("Taille en mm", "Abondance")); - elements.addAll(axesInstance.buildXTicks()); - elements.addAll(axesInstance.buildYTicks()); - elements.addAll(axesInstance.buildPoints(popXY)); - + ArrayList elements = axesInstance.buildAll( "Taille en mm", "Abondance", popXY, ABCoef[0], ABCoef[1] ); SVGFactory.createSVG(elements); } @@ -280,7 +275,7 @@ public class Application { } else if (nameFile.contains("Peru")) { PopPeru(nameFile); } else if (nameFile.contains("test2")) { - + test2Render(nameFile); } } catch ( InputFileException e ){ System.out.println( e.getMessage() );