diff --git a/Documents/diagrammePaquetage.mdj b/Documents/diagrammePaquetage.mdj
index 848611c..1642edc 100644
--- a/Documents/diagrammePaquetage.mdj
+++ b/Documents/diagrammePaquetage.mdj
@@ -175,9 +175,9 @@
"font": "Arial;13;1",
"left": 341,
"top": 262,
- "width": 59.99169921875,
+ "width": 67.1708984375,
"height": 13,
- "text": "test"
+ "text": "testRequin"
},
{
"_type": "LabelView",
@@ -210,7 +210,7 @@
"font": "Arial;13;0",
"left": 336,
"top": 255,
- "width": 69.99169921875,
+ "width": 77.1708984375,
"height": 25,
"stereotypeLabel": {
"$ref": "AAAAAAGAVgJ23UuCE6k="
@@ -230,7 +230,7 @@
"containerChangeable": true,
"left": 336,
"top": 240,
- "width": 69.99169921875,
+ "width": 77.1708984375,
"height": 40,
"nameCompartment": {
"$ref": "AAAAAAGAVgJ23EuBaSg="
@@ -346,7 +346,7 @@
"_parent": {
"$ref": "AAAAAAGAVgHH+ks1lEI="
},
- "name": "test",
+ "name": "testRequin",
"ownedElements": [
{
"_type": "UMLDependency",
diff --git a/WpfApp1/MainWindow.xaml b/WpfApp1/MainWindow.xaml
index 1080176..2ce6fb7 100644
--- a/WpfApp1/MainWindow.xaml
+++ b/WpfApp1/MainWindow.xaml
@@ -32,7 +32,7 @@
-
+
diff --git a/WpfApp1/MainWindow.xaml.cs b/WpfApp1/MainWindow.xaml.cs
index 83fc6ee..7d6bda9 100644
--- a/WpfApp1/MainWindow.xaml.cs
+++ b/WpfApp1/MainWindow.xaml.cs
@@ -42,13 +42,13 @@ namespace WpfApp1
public void ContentControlSwapAcc()
{
- contentControl.Content = new userControlEdit();
+ contentControl.Content = new userControlAcceuil();
}
public void ContentControlSwapEdit()
{
- contentControl.Content = new userControlEdit();
+ contentControl.Content = new UserControlEdit();
}
private void TextBox_IsKeyboardFocusedChanged(object sender, DependencyPropertyChangedEventArgs e)
diff --git a/WpfApp1/userControlAcceuil.xaml b/WpfApp1/userControlAcceuil.xaml
index 35f7952..e69083f 100644
--- a/WpfApp1/userControlAcceuil.xaml
+++ b/WpfApp1/userControlAcceuil.xaml
@@ -1,4 +1,4 @@
-
/// Logique d'interaction pour userControlAcceuil.xaml
///
- public partial class userControlEdit : UserControl
+ public partial class userControlAcceuil : UserControl
{
- public userControlEdit()
+ public userControlAcceuil()
{
InitializeComponent();
}
diff --git a/WpfApp1/userControlDescription.xaml.cs b/WpfApp1/userControlDescription.xaml.cs
index ff288b4..da46d30 100644
--- a/WpfApp1/userControlDescription.xaml.cs
+++ b/WpfApp1/userControlDescription.xaml.cs
@@ -1,4 +1,5 @@
-using System;
+using Modèle;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -34,5 +35,41 @@ namespace WpfApp1
{
((MainWindow)System.Windows.Application.Current.MainWindow).ContentControlSwapEdit();
}
+
+
+ public Requin requin { get; set; }
+
+ public void UpdateUI(Requin requin)
+ {
+ nameReq.Text = requin.Nom;
+ sciName.Text = requin.NomSci;
+ desc.Text = requin.Description;
+ vid.Source = new Uri(requin.Video);
+ photo.Source = new BitmapImage(new Uri(requin.Photo, UriKind.Relative));
+ funFact.Text = requin.FunFact;
+ switch (requin.StatutCons)
+ {
+ case Conservation.EX:
+ break;
+ case Conservation.EW:
+ break;
+ case Conservation.CR:
+ break;
+ case Conservation.EN:
+ consPic.Source= new BitmapImage(new Uri("En-danger.png", UriKind.Relative));
+ break;
+ case Conservation.VU:
+ break;
+ case Conservation.NT:
+ break;
+ case Conservation.LC:
+ break;
+ case Conservation.DD:
+ break;
+ case Conservation.NE:
+ break;
+
+ }
+ }
}
}