src/ecoparasite/svg/SVGFactory.java

@@ -76,13 +76,9 @@ public class SVGFactory {
 
     }
 
-    public static HashMap< String ,HashSet<ValeursXY>> PointAXES(HashSet<ValeursXY> h){
+    public static HashMap< String ,HashSet<Double>> PointAXES(HashSet<ValeursXY> h){
 
-        //Définition initial
-        HashSet<ValeursXY> x = new HashSet<>();
-        HashSet<ValeursXY> y = new HashSet<>();
-        HashSet<ValeursXY> offset = new HashSet<>();
-        HashMap< String, HashSet<ValeursXY> > map = new HashMap<>();
+        HashMap< String, HashSet<Double> > map = new HashMap<>();
 
         //Définition des min et max
         double max_x = Double.MIN_VALUE;
@@ -120,11 +116,38 @@ public class SVGFactory {
         double nicemin_y = roundMin(min_y,step_y);
         double nicemax_y = roundMax(max_y,step_y);
 
-        HashSet<ValeursXY> axe_x = new HashSet<>();
-        HashSet<ValeursXY> axe_y = new HashSet<>();
+        // Compléter un Hashset de Double pour X et pour Y et Offset X et Y. TODO
+        HashSet<Double> axeX = new HashSet<>();
+        HashSet<Double> axeY = new HashSet<>();
+        HashSet<Double> OffsetX = new HashSet<>();
+        HashSet<Double> OffsetY = new HashSet<>();
 
+        Double ix = nicemin_x;
+        while ( ix <= nicemax_x ) {
+            axeX.add(ix);
+            ix+=step_x;
+        };
+        map.put("AxeX", axeX);
 
-        return null;
+        Double iy = nicemin_y;
+        while ( iy <= nicemax_y ) {
+            axeY.add(iy);
+            iy+=step_y;
+        }
+        map.put("AxeY",axeY);
+
+        double offsetX = min_x - nicemin_x;
+        double offsetY = min_y - nicemin_y;
+
+        HashSet<Double> offsetXHash = new HashSet<>();
+        offsetXHash.add(offsetX);
+        HashSet<Double> offsetYHash = new HashSet<>();
+        offsetYHash.add(offsetY);
+
+        map.put("OffsetX", offsetXHash);
+        map.put("OffsetY", offsetYHash);
+
+        return map;
     }
 
     /**