Merge pull request #87 from ValgulNecron/dev

Commit
ValgulNecron · Feb 10, 2023 · f1c99a7 · f1c99a7
2 parents 2a3aa60 + 3ee75ba
commit f1c99a7
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 21 deletions.
diff --git a/CarteAccesLib/Chemin.cs b/CarteAccesLib/Chemin.cs
@@ -10,6 +10,8 @@ public static class Chemin
         public static string CheminEdtClassique { get; set; } = "./data/FichierEdtClasse";
         public static string CheminFaceCarte { get; set; } = "./data/FichierCartesFace/";
 
+        public static string CheminEdtPerso { get; set; } = "";
+
         public static string CheminEdt { get; set; } = "";
 
         public static string setCheminImportationFaceCarte()

diff --git a/CarteAccesLib/Edt.cs b/CarteAccesLib/Edt.cs
@@ -26,23 +26,34 @@ public static void afficheEmploiDuTemps(ComboBox cbbClasse, PictureBox pbCarteAr
             }
         }
 
-        public static void ajouterEdtPerso(PictureBox pbCarteArriere)
+        public static void ajouterEdtPerso(PictureBox pbCarteArriere, Button btnSelect)
         {
-            // -- Parcours des fichiers...
-            var opf = new OpenFileDialog();
+            try
+            {
+                // -- Parcours des fichiers...
+                var opf = new OpenFileDialog();
+
+                var opfPath = "";
 
-            var opfPath = "";
+                opf.InitialDirectory = "./data/ElevesEdt/";
+                opf.Filter = "Images (*.png, *.jpg) | *.png; *.jpg";
+                opf.FilterIndex = 1;
+                opf.RestoreDirectory = true;
+                Chemin.CheminEdtPerso = "";
 
-            opf.InitialDirectory = "./data/ElevesEdt/";
-            opf.Filter = "Images (*.png, *.jpg) | *.png; *.jpg";
-            opf.FilterIndex = 1;
-            opf.RestoreDirectory = true;
+                if (opf.ShowDialog() == DialogResult.OK)
+                {
+                    opfPath = opf.FileName;
+                    // -- Ajout de l'image dans la picturebox, celle ci devient visible
+                    pbCarteArriere.Image = new Bitmap(opfPath);
+                    Chemin.CheminEdtPerso = opfPath;
+                    btnSelect.Enabled = true;
+                }
 
-            if (opf.ShowDialog() == DialogResult.OK)
+            }
+            catch
             {
-                opfPath = opf.FileName;
-                // -- Ajout de l'image dans la picturebox, celle ci devient visible
-                pbCarteArriere.Image = new Bitmap(opfPath);
+                btnSelect.Enabled = true;
             }
         }
 

diff --git a/CartesAcces/frmCarteParClasseNiveau.Designer.cs b/CartesAcces/frmCarteParClasseNiveau.Designer.cs
diff --git a/CartesAcces/frmCarteProvisoire.cs b/CartesAcces/frmCarteProvisoire.cs
@@ -64,6 +64,7 @@ private void btnReset_Click(object sender, EventArgs e)
                 rdbUlis.Checked = false;
                 rdbUPE2A.Checked = false;
                 rdbRas.Checked = true;
+                btnSelect.Enabled = true;
             }
             catch
             {
@@ -221,15 +222,32 @@ private void pbCarteArriere_MouseUp(object sender, MouseEventArgs e)
                         Edition.RognageY = Math.Min(Edition.RognageY, e.Y);
                         Cursor = Cursors.Default;
                         var classe = cbbClasse.Text;
-                        var pathEdt = "./data/FichierEdtClasse/" + classe + ".jpg";
+                        string pathEdt;
+                        if (Chemin.CheminEdtPerso == "")
+                        {
+                            pathEdt = "./data/FichierEdtClasse/" + classe + ".jpg";
+                        }
+                        else
+                        {
+                            pathEdt = Chemin.CheminEdtPerso;
+                        }
+
                         Edition.SelectionClique = false;
                         Edt.rognageEdt(pbCarteArriere, pathEdt);
                     }
                     else
                     {
                         Cursor = Cursors.Default;
                         var classe = cbbClasse.Text;
-                        var pathEdt = "./data/FichierEdtClasse/" + classe + ".jpg";
+                        string pathEdt;
+                        if (Chemin.CheminEdtPerso == "")
+                        {
+                            pathEdt = "./data/FichierEdtClasse/" + classe + ".jpg";
+                        }
+                        else
+                        {
+                            pathEdt = Chemin.CheminEdtPerso;
+                        }
                         Edition.SelectionClique = false;
                         pbCarteArriere.Image = Image.FromFile(pathEdt);
 
@@ -369,8 +387,15 @@ private void rdbRas_CheckedChanged(object sender, EventArgs e)
 
         private void btnEdtPerso_Click(object sender, EventArgs e)
         {
-            Edt.ajouterEdtPerso(pbCarteArriere);
-            groupBox2.Enabled = false;
+            try
+            {
+                Edt.ajouterEdtPerso(pbCarteArriere, btnSelect);
+                btnSelect.Enabled = true;
+            }
+            catch
+            {
+                btnSelect.Enabled = true;
+            }
         }
 
         private void label6_Click(object sender, EventArgs e)