From 18ea245109eb6d1c31e801de391d85785031f8f7 Mon Sep 17 00:00:00 2001
From: diane <diane@172.30.57.124>
Date: Wed, 15 Mar 2023 18:38:17 +0100
Subject: [PATCH] ouverture de la fenetre

---
 src/graphique/JPanelImage.java | 113 +++++++++++++++++++--------------
 src/graphique/MaJFrame.java    |  29 ++++-----
 2 files changed, 78 insertions(+), 64 deletions(-)

diff --git a/src/graphique/JPanelImage.java b/src/graphique/JPanelImage.java
index 87bb595..16438f6 100644
--- a/src/graphique/JPanelImage.java
+++ b/src/graphique/JPanelImage.java
@@ -1,55 +1,72 @@
 package graphique;
 
-import java.awt.Color;
-import java.awt.Graphics;
-import java.awt.GridLayout;
-import java.awt.Image;
-import java.io.File;
-import java.io.IOException;
-
-import javax.imageio.ImageIO;
-import javax.swing.JPanel;
+//import java.awt.Color;
+//import java.awt.Graphics;
+//import java.awt.GridLayout;
+//import java.awt.Image;
+//import java.io.File;
+//import java.io.IOException;
+//
+//import javax.imageio.ImageIO;
+//import javax.swing.JPanel;
+//
+//
+//public class JPanelImage extends JPanel {
+//	
+//	private static final long serialVersionUID = 3641337531772753865L;
+//	private String sNomImage;
+//	private Image image=null;
+//
+//	
+//	public JPanelImage() {
+//		super();
+//		sNomImage=null;
+//	}
+//	public JPanelImage(String sNom) {
+//		super();
+//		sNomImage=sNom;
+//		chargerImage();	
+//	}
+//	
+//	public void setImage(String sNom) {
+//		sNomImage=sNom;
+//		chargerImage();	
+//	}
+//	
+//	private void chargerImage(){
+//		if(sNomImage!=null) {
+//			String sNomFile=".\\images\\"+sNomImage;
+//			try {                
+//		          image = ImageIO.read(new File(sNomFile));
+//		       } catch (IOException ex) {
+//		    	   image=null;
+//		       }
+//		}	
+//		this.repaint();
+//	}
+//	
+//	public void paintComponent(Graphics g) {
+//		super.paintComponent(g);
+//		this.setBackground(Color.white);
+//		if(image!=null) {
+//			 g.drawImage(image, 0, 0, this.getWidth(),this.getHeight(), null);
+//		}
+//	}	
+//}
 
+import java.awt.*;
+import javax.swing.*;
 
 public class JPanelImage extends JPanel {
-	
-	private static final long serialVersionUID = 3641337531772753865L;
-	private String sNomImage;
-	private Image image=null;
+    private ImageIcon image;
 
-	
-	public JPanelImage() {
-		super();
-		sNomImage=null;
-	}
-	public JPanelImage(String sNom) {
-		super();
-		sNomImage=sNom;
-		chargerImage();	
-	}
-	
-	public void setImage(String sNom) {
-		sNomImage=sNom;
-		chargerImage();	
-	}
-	
-	private void chargerImage(){
-		if(sNomImage!=null) {
-			String sNomFile=".\\images\\"+sNomImage;
-			try {                
-		          image = ImageIO.read(new File(sNomFile));
-		       } catch (IOException ex) {
-		    	   image=null;
-		       }
-		}	
-		this.repaint();
-	}
-	
-	public void paintComponent(Graphics g) {
-		super.paintComponent(g);
-		this.setBackground(Color.white);
-		if(image!=null) {
-			 g.drawImage(image, 0, 0, this.getWidth(),this.getHeight(), null);
-		}
-	}	
+    public JPanelImage() {
+        image = new ImageIcon("map1.png");
+    }
+
+    @Override
+    protected void paintComponent(Graphics g) {
+        super.paintComponent(g);
+        g.drawImage(image.getImage(), 0, 0, this.getWidth(), this.getHeight(), this);
+    }
 }
diff --git a/src/graphique/MaJFrame.java b/src/graphique/MaJFrame.java
index adc3904..49b60e7 100644
--- a/src/graphique/MaJFrame.java
+++ b/src/graphique/MaJFrame.java
@@ -48,6 +48,7 @@ public class MaJFrame extends JFrame {
 	 * Create the frame.
 	 */
 	public MaJFrame() {
+		setTitle("Zombicide");
 		setIconImage(Toolkit.getDefaultToolkit().getImage(MaJFrame.class.getResource("/image/zombie.png")));
 		setBackground(new Color(128, 0, 0));
 		setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
@@ -62,33 +63,29 @@ public class MaJFrame extends JFrame {
 		JPanel panel = new JPanel();
 		panel.setBorder(null);
 		panel.setBackground(new Color(64, 0, 0));
-		contentPane.add(panel, "cell 10 10,grow");
+		contentPane.add(panel); //, "cell 10 10,grow"
 		contentPane.add(panel, BorderLayout.NORTH);
+		panel.setLayout(new BorderLayout(0, 0));
 		
 		JButton btnNewButton = new JButton("JOUER !");
 		panel.add(btnNewButton);
 		
 		panel_1 = new JPanelDessin();
-		panel_1.setBackground(new Color(255, 128, 0));
+		panel_1.setBackground(new Color(255, 128, 0)); //"map1.png"
 		panel_1.setBorder(null);
 		panel_1.setLayout(new GridLayout(11, 11, 0, 0));
-		panel_1.setOpaque(false);
+		panel_1.setOpaque(true);
+		contentPane.add(panel_1, BorderLayout.CENTER);
 		
-		
-		JPanelImage panel_2 = new JPanelImage();
-		panel_2.setImage("map1.png");
-		panel_2.setBorder(null);
-		panel_2.add(panel_1);
-		//JPanelImage panel_2 = new JPanelImage("map1.png");
-		contentPane.add(panel_2);
-		panel_2.setLayout(new GridLayout(1, 1, 0, 0));
-
+//		JPanelImage panel_2 = new JPanelImage();
+//		panel_2.JPanelImage();
+//		panel_2.setBorder(null);
+//		panel_2.add(panel_1);
+//		//JPanelImage panel_2 = new JPanelImage("map1.png");
+//		contentPane.add(panel_2);
+//		panel_2.setLayout(new GridLayout(1, 1, 0, 0));
 		
 		
 	}
 
 }
-
-
-
-