X-Git-Url: https://git.piment-noir.org/?p=TP_POO.git;a=blobdiff_plain;f=TP2%2FMain.java;h=e8a3ca51974038318a90820642b0c03014753bf1;hp=e05593a846aa509c54e65de24431230b355212ea;hb=009c5b1e63be46a50ba2c551c96369f461f44a93;hpb=14d4fd0d0d84e3b8a52ecde790d878fcb909ddd0

diff --git a/TP2/Main.java b/TP2/Main.java
index e05593a..e8a3ca5 100644
--- a/TP2/Main.java
+++ b/TP2/Main.java
@@ -1,41 +1,73 @@
 
-
 class Main {
 
-    public static void main(String[] args) {
-
+    private static void main1() {
         Point p1 = new Point(1, 2);
         Point p2 = new Point(2, 7);
-        Point p3 = p1.additionner(p2);
-
-        System.out.println(p1.toString());
-        System.out.println(p2.toString());
-        System.out.println(p3.toString());
-
-        Point p4 = new Point(4, 5);
-        Point p5 = new Point(2, 3);
-        Segment segment = new Segment(p4, p5);
-        Cercle cercle = new Cercle(p4, 5.2);
-
+        Segment segment = new Segment(p1, p2);
+        Point p3 = new Point(4, 5);
+        Cercle cercle = new Cercle(p3, 5.2);
+        Point p4 = new Point(2, 3);
         Piletransformations trans = new Piletransformations(10);
-        trans.display();
 
-        segment.dessiner(trans);
-        cercle.dessiner(trans);
-        boolean rt = trans.empiler(p1);
-        trans.display();
-        segment.dessiner(trans);
-        cercle.dessiner(trans);
-        rt = trans.empiler(p2);
-        trans.display();
-        segment.dessiner(trans);
-        cercle.dessiner(trans);
+        boolean rt = trans.empiler(p4);
+        if (!rt) {
+            System.out.println("Echec empilation");
+        }
 
-        segment.deplacer(p1);
-        cercle.deplacer(p1);
         segment.dessiner(trans);
         cercle.dessiner(trans);
 
+        Point p5 = new Point(3, 5);
+        segment.deplacer(p5);
+        cercle.deplacer(p5);
+
+        Image image = new Image();
+        image.ajouter(segment);
+        image.ajouter(cercle);
+        image.dessiner(trans);
+        image.deplacer(p5);
+        image.dessiner(trans);
+
+        trans.depiler();
+    }
+
+    private static void main2() {
+        Point p1 = new Point(1, 2);
+        Point p2 = new Point(2, 7);
+        Segment segment1 = new Segment(p1, p2);
+        Point p3 = new Point(1, 5);
+        Point p4 = new Point(3, 1);
+        Segment segment2 = new Segment(p3, p4);
+        Point p5 = new Point(4, 5);
+        Cercle cercle1 = new Cercle(p5, 5.2);
+        Point p6 = new Point(5, 4);
+        Cercle cercle2 = new Cercle(p6, 4.3);
+        Point point1 = new Point(8, -1.5);
+        Image image1 = new Image();
+        Image image2 = new Image();
+        Image image3 = new Image();
+        Piletransformations transformations = new Piletransformations(10);
+
+        transformations.empiler(point1);
+        image1.ajouter(segment1);
+        image1.ajouter(cercle1);
+        image2.ajouter(segment2);
+        image2.ajouter(cercle2);
+        image1.dessiner(transformations);
+        image2.dessiner(transformations);
+        Point point2 = new Point(0.5, 2.5);
+        image1.deplacer(point2);
+        image3.ajouter(image1);
+        image3.ajouter(image2);
+        image3.dessiner(transformations);
+        transformations.depiler();
+    }
+
+    public static void main(String[] args) {
+
+        main2();
+
     }
 
 }