diff --git a/psychorientation/psychorientation/InterfaceClasse.Designer.cs b/psychorientation/psychorientation/InterfaceClasse.Designer.cs
index d90fd512aef92462778028201b4b252b471461f3..ae4bea3a9771c51b0bf75cbab030ec3ccda3bc9f 100644
--- a/psychorientation/psychorientation/InterfaceClasse.Designer.cs
+++ b/psychorientation/psychorientation/InterfaceClasse.Designer.cs
@@ -43,11 +43,11 @@
this.lbl_barre_decisions = new System.Windows.Forms.Label();
this.lblCours = new System.Windows.Forms.Label();
this.lblNotation = new System.Windows.Forms.Label();
- this.pictureBox1 = new System.Windows.Forms.PictureBox();
+ this.pbProf = new System.Windows.Forms.PictureBox();
((System.ComponentModel.ISupportInitialize)(this.pb_action_suivante)).BeginInit();
this.pnlListeEleve.SuspendLayout();
this.pnlChoix.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.pbProf)).BeginInit();
this.SuspendLayout();
//
// pb_action_suivante
@@ -126,7 +126,8 @@
// pnlListeEleve
//
this.pnlListeEleve.AutoScroll = true;
- this.pnlListeEleve.BackColor = System.Drawing.SystemColors.Control;
+ this.pnlListeEleve.BackColor = System.Drawing.Color.NavajoWhite;
+ this.pnlListeEleve.BackgroundImage = global::psychorientation.Properties.Resources.paternFeuille;
this.pnlListeEleve.Controls.Add(this.lblListeEleve);
this.pnlListeEleve.Location = new System.Drawing.Point(0, -1);
this.pnlListeEleve.Name = "pnlListeEleve";
@@ -158,6 +159,7 @@
//
// pnlChoix
//
+ this.pnlChoix.BackgroundImage = global::psychorientation.Properties.Resources.paternFeuille1;
this.pnlChoix.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
this.pnlChoix.Controls.Add(this.lbl_barre_decisions);
this.pnlChoix.Controls.Add(this.lblCours);
@@ -199,16 +201,16 @@
this.lblNotation.TabIndex = 0;
this.lblNotation.Text = "Coefficients de prise en compte de l\'effort et de la compétence pour noter :";
//
- // pictureBox1
+ // pbProf
//
- this.pictureBox1.BackColor = System.Drawing.Color.Transparent;
- this.pictureBox1.Image = global::psychorientation.Properties.Resources.prof2;
- this.pictureBox1.Location = new System.Drawing.Point(642, 234);
- this.pictureBox1.Name = "pictureBox1";
- this.pictureBox1.Size = new System.Drawing.Size(71, 93);
- this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
- this.pictureBox1.TabIndex = 9;
- this.pictureBox1.TabStop = false;
+ this.pbProf.BackColor = System.Drawing.Color.Transparent;
+ this.pbProf.Image = global::psychorientation.Properties.Resources.prof2;
+ this.pbProf.Location = new System.Drawing.Point(642, 234);
+ this.pbProf.Name = "pbProf";
+ this.pbProf.Size = new System.Drawing.Size(71, 93);
+ this.pbProf.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.pbProf.TabIndex = 9;
+ this.pbProf.TabStop = false;
//
// InterfaceClasse
//
@@ -218,7 +220,7 @@
this.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("$this.BackgroundImage")));
this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.ClientSize = new System.Drawing.Size(1357, 783);
- this.Controls.Add(this.pictureBox1);
+ this.Controls.Add(this.pbProf);
this.Controls.Add(this.pnlChoix);
this.Controls.Add(this.lblEffort);
this.Controls.Add(this.lblCompetence);
@@ -241,7 +243,7 @@
this.pnlListeEleve.ResumeLayout(false);
this.pnlListeEleve.PerformLayout();
this.pnlChoix.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.pbProf)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@@ -264,7 +266,7 @@
private System.Windows.Forms.Label lblNotation;
private System.Windows.Forms.Label lblCours;
private System.Windows.Forms.Label lbl_barre_decisions;
- private System.Windows.Forms.PictureBox pictureBox1;
+ private System.Windows.Forms.PictureBox pbProf;
}
}
diff --git a/psychorientation/psychorientation/InterfaceClasse.cs b/psychorientation/psychorientation/InterfaceClasse.cs
index 4205a1fb233db40798b931bb89575b12904aa6aa..9d5b100bc48f7668d98532a8dc770f76680e55c7 100644
--- a/psychorientation/psychorientation/InterfaceClasse.cs
+++ b/psychorientation/psychorientation/InterfaceClasse.cs
@@ -12,6 +12,12 @@ namespace psychorientation
{
public partial class InterfaceClasse : Form
{
+
+ double effortInitial = 0.0;
+ double competenceInitial = 0.0;
+ double moyenenInitial = 0.0;
+
+
private Random r = new Random();
private Libelle libelle = Libelle.GetInstance();
private int moisActuel = 8;
@@ -54,9 +60,12 @@ namespace psychorientation
{
lblDate.Text = libelle.Mois(moisActuel % 12);
lblClasse.Text = libelle.Niveau(anneeActuelle);
- lblEffort.Text = "Effort de la classe : " + Math.Round(gestEleve.GetEffortClasse(), 1).ToString();
- lblCompetence.Text = "Competence de la classe : " + Math.Round(gestEleve.GetCompetenceClasse(), 1).ToString();
- lblMoyenne.Text = "Moyenne de la classe : " + Math.Round(gestEleve.GetMoyenneClasse(), 1).ToString();
+ effortInitial = Math.Round(gestEleve.GetEffortClasse(), 1);
+ competenceInitial = Math.Round(gestEleve.GetCompetenceClasse(), 1);
+ moyenenInitial = Math.Round(gestEleve.GetMoyenneClasse(), 1);
+ lblEffort.Text = "Effort de la classe : " + effortInitial.ToString();
+ lblCompetence.Text = "Competence de la classe : " + competenceInitial.ToString();
+ lblMoyenne.Text = "Moyenne de la classe : " + moyenenInitial.ToString();
Libelle lib = new Libelle();
int y = 40;
@@ -75,6 +84,7 @@ namespace psychorientation
tbNota.Location = new System.Drawing.Point(0, lblNotation.Location.Y + lblNotation.Size.Height);
tbNota.Size = new System.Drawing.Size(184, 45);
tbNota.Maximum = 20;
+ tbNota.BackColor = System.Drawing.Color.Tan;
tbNota.Value = 10;
tbNota.SmallChange = 1;
tbNota.LargeChange = 1;
@@ -89,10 +99,13 @@ namespace psychorientation
lblValCompetence.Location = new Point(1, 5 + tbNota.Location.Y + tbNota.Size.Height);
lblValEffort.Text = lblValEffort.Tag + ((20 - tbNota.Value) / 10.0).ToString();
lblValCompetence.Text = lblValCompetence.Tag + (tbNota.Value / 10.0).ToString();
+ lblValCompetence.BackColor= System.Drawing.Color.Transparent;
+ lblValEffort.BackColor= System.Drawing.Color.Transparent;
pnlChoix.Controls.Add(lblValEffort);
pnlChoix.Controls.Add(lblValCompetence);
TrackBar tbCours = new TrackBar();
+ tbCours.BackColor= System.Drawing.Color.Tan;
tbCours.Location = new System.Drawing.Point(0, 10 + lblCours.Location.Y + lblCours.Size.Height);
tbCours.Size = new System.Drawing.Size(184, 45);
tbCours.Value = 5;
@@ -161,7 +174,7 @@ namespace psychorientation
iice.Show();
}
- private void Pb_action_suivante_Click(object sender, EventArgs e)
+ private void ActionSuivante()
{
// Traite les actions à effectuer avant de passer au mois suivant.
@@ -178,7 +191,7 @@ namespace psychorientation
// Passe au mois suivant.
moisActuel++;
- switch(moisActuel)
+ switch (moisActuel)
{
case 17: // Fin de la 1ère année : Début Juin.
moisActuel = 20;
@@ -190,14 +203,23 @@ namespace psychorientation
break;
case 42: // Fin de la 3ème année : Debut Juillet.
// Fin de la partie.
- Message m_fin = new Message(
- "Vous avez fini la phase bêta de ce jeu !\n" +
- "Bravo à vous et n'hésitez pas à essayer à nouveau pour " +
- "améliorer votre compréhension du monde extérieur.",
- "Félicitations",
- TypeMessage.INFORMATION
+ double moyenneFinal = Math.Round(gestEleve.GetMoyenneClasse(), 1);
+ double effortFinal = Math.Round(gestEleve.GetEffortClasse(), 1);
+ double competenceFinal = Math.Round(gestEleve.GetCompetenceClasse(), 1);
+ double diffEffort = effortFinal - effortInitial;
+ double diffCompetence = competenceFinal - competenceInitial;
+ double diffMoyenne= moyenneFinal-moyenenInitial;
+
+ Message m_fin = new Message(
+ "Vous avez fini la phase bêta de ce jeu !\n" +
+ "Bravo à vous et n'hésitez pas à essayer à nouveau pour " +
+ "améliorer votre compréhension du monde extérieur.\n",
+ "Félicitations",
+ TypeMessage.RESULTAT
);
+ m_fin.setParamRes(Math.Round(100*diffEffort/effortInitial,1), Math.Round(100 *diffCompetence/competenceInitial,1), Math.Round(100 *diffMoyenne/moyenenInitial,1),moyenneFinal>moyenenInitial,effortFinal>effortInitial+(10-effortInitial)/2,competenceFinal>competenceInitial+(10-competenceInitial)/2);
m_fin.ShowDialog();
+ UntransmitKeyDown();
pb_action_suivante.Click -= new System.EventHandler(Pb_action_suivante_Click);
break;
}
@@ -207,7 +229,12 @@ namespace psychorientation
// Cours particuliers.
lblDate.Text = libelle.Mois(moisActuel % 12);
- lblClasse.Text= libelle.Niveau(anneeActuelle);
+ lblClasse.Text = libelle.Niveau(anneeActuelle);
+ }
+
+ private void Pb_action_suivante_Click(object sender, EventArgs e)
+ {
+ ActionSuivante();
}
private void Pb_liste_eleves_Click(object sender, EventArgs e)
@@ -234,13 +261,6 @@ namespace psychorientation
PictureBox pb1 = pb_action_suivante;
pb1.Location = new Point(Size.Width - pb1.Width - 32, Size.Height - pb1.Height - 32);
}
- /*
- if (MessageBox.Show("Souhaitez-vous quitter le jeu ?\nVous perdrez alors votre progression dans la partie en cours.",
- "Confirmation de fermeture", MessageBoxButtons.YesNo, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button2) == System.Windows.Forms.DialogResult.Yes)
- {
- Close();
- }
- */
private void tbNota_Scroll(object sender, EventArgs e)
{
@@ -288,12 +308,32 @@ namespace psychorientation
}
}
+ private void UntransmitKeyDown()
+ {
+ foreach (Control c in this.Controls)
+ {
+ if (c is Panel)
+ {
+ foreach (Control c2 in (c as Panel).Controls)
+ {
+ c2.KeyDown -= new System.Windows.Forms.KeyEventHandler(InterfaceClasse_KeyDown);
+ }
+ }
+ c.KeyDown -= new System.Windows.Forms.KeyEventHandler(InterfaceClasse_KeyDown);
+ }
+ }
+
private void InterfaceClasse_KeyDown(object sender, KeyEventArgs e)
{
if (e.KeyCode == Keys.Escape)
{
Close();
}
+
+ if (e.KeyCode == Keys.Enter)
+ {
+ ActionSuivante();
+ }
}
}
}
diff --git a/psychorientation/psychorientation/InterfaceClasse.resx b/psychorientation/psychorientation/InterfaceClasse.resx
index 01b8fb0867017861fb017d6179aa4b7ffe78118a..02edc12fbfc6a0ab36b7246326a46f133a9739cc 100644
--- a/psychorientation/psychorientation/InterfaceClasse.resx
+++ b/psychorientation/psychorientation/InterfaceClasse.resx
@@ -125,7 +125,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACM
- mgEAAk1TRnQBSQFMAgEBBgEAAXgBAAF4AQAByAEAAcgBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+ mgEAAk1TRnQBSQFMAgEBBgEAAYABAAGAAQAByAEAAcgBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABIAEDAgABkAEBAgABAQEAAQgGAAHiAQQXAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEA
AcAB3AHAAQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEA
A0IBAAM5AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIA
diff --git a/psychorientation/psychorientation/Message.Designer.cs b/psychorientation/psychorientation/Message.Designer.cs
index 624906096ad4633e7ca8096120275236b4192fa2..62ae444f0923a9a72e6f9da28cd8a036ae5ae611 100644
--- a/psychorientation/psychorientation/Message.Designer.cs
+++ b/psychorientation/psychorientation/Message.Designer.cs
@@ -31,20 +31,27 @@
this.lblMessage = new System.Windows.Forms.Label();
this.lblTitre = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
+ this.lblScore = new System.Windows.Forms.Label();
+ this.lblEffort = new System.Windows.Forms.Label();
+ this.lblCompetence = new System.Windows.Forms.Label();
+ this.lblMoyenen = new System.Windows.Forms.Label();
this.SuspendLayout();
//
// lblMessage
//
+ this.lblMessage.BackColor = System.Drawing.Color.Transparent;
this.lblMessage.Font = new System.Drawing.Font("Microsoft Sans Serif", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblMessage.Location = new System.Drawing.Point(12, 72);
this.lblMessage.Name = "lblMessage";
this.lblMessage.Size = new System.Drawing.Size(962, 181);
this.lblMessage.TabIndex = 0;
this.lblMessage.Text = "label1";
+ this.lblMessage.Visible = false;
//
// lblTitre
//
this.lblTitre.AutoSize = true;
+ this.lblTitre.BackColor = System.Drawing.Color.Transparent;
this.lblTitre.Font = new System.Drawing.Font("Microsoft Sans Serif", 27.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblTitre.Location = new System.Drawing.Point(116, 9);
this.lblTitre.Name = "lblTitre";
@@ -60,11 +67,64 @@
this.label1.Size = new System.Drawing.Size(0, 13);
this.label1.TabIndex = 4;
//
+ // lblScore
+ //
+ this.lblScore.BackColor = System.Drawing.Color.Transparent;
+ this.lblScore.Font = new System.Drawing.Font("Microsoft Sans Serif", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lblScore.Location = new System.Drawing.Point(12, 63);
+ this.lblScore.Name = "lblScore";
+ this.lblScore.Size = new System.Drawing.Size(962, 116);
+ this.lblScore.TabIndex = 5;
+ this.lblScore.Text = "label1";
+ this.lblScore.Visible = false;
+ //
+ // lblEffort
+ //
+ this.lblEffort.AutoSize = true;
+ this.lblEffort.BackColor = System.Drawing.Color.Transparent;
+ this.lblEffort.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lblEffort.Location = new System.Drawing.Point(14, 179);
+ this.lblEffort.Name = "lblEffort";
+ this.lblEffort.Size = new System.Drawing.Size(66, 24);
+ this.lblEffort.TabIndex = 6;
+ this.lblEffort.Text = "label2";
+ this.lblEffort.Visible = false;
+ //
+ // lblCompetence
+ //
+ this.lblCompetence.AutoSize = true;
+ this.lblCompetence.BackColor = System.Drawing.Color.Transparent;
+ this.lblCompetence.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lblCompetence.Location = new System.Drawing.Point(14, 207);
+ this.lblCompetence.Name = "lblCompetence";
+ this.lblCompetence.Size = new System.Drawing.Size(66, 24);
+ this.lblCompetence.TabIndex = 7;
+ this.lblCompetence.Text = "label2";
+ this.lblCompetence.Visible = false;
+ //
+ // lblMoyenen
+ //
+ this.lblMoyenen.AutoSize = true;
+ this.lblMoyenen.BackColor = System.Drawing.Color.Transparent;
+ this.lblMoyenen.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.lblMoyenen.Location = new System.Drawing.Point(14, 236);
+ this.lblMoyenen.Name = "lblMoyenen";
+ this.lblMoyenen.Size = new System.Drawing.Size(66, 24);
+ this.lblMoyenen.TabIndex = 8;
+ this.lblMoyenen.Text = "label2";
+ this.lblMoyenen.Visible = false;
+ this.lblMoyenen.Click += new System.EventHandler(this.lblMoyenen_Click);
+ //
// Message
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.BackgroundImage = global::psychorientation.Properties.Resources.paternFeuille;
this.ClientSize = new System.Drawing.Size(986, 347);
+ this.Controls.Add(this.lblMoyenen);
+ this.Controls.Add(this.lblCompetence);
+ this.Controls.Add(this.lblEffort);
+ this.Controls.Add(this.lblScore);
this.Controls.Add(this.label1);
this.Controls.Add(this.lblTitre);
this.Controls.Add(this.lblMessage);
@@ -84,5 +144,9 @@
private System.Windows.Forms.Label lblMessage;
private System.Windows.Forms.Label lblTitre;
private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.Label lblScore;
+ private System.Windows.Forms.Label lblEffort;
+ private System.Windows.Forms.Label lblCompetence;
+ private System.Windows.Forms.Label lblMoyenen;
}
}
\ No newline at end of file
diff --git a/psychorientation/psychorientation/Message.cs b/psychorientation/psychorientation/Message.cs
index efffe2d67266faf286e6f56a0c407467b616064b..665320813e3f1a2c9a1112cfb621374e5099ee43 100644
--- a/psychorientation/psychorientation/Message.cs
+++ b/psychorientation/psychorientation/Message.cs
@@ -13,7 +13,7 @@ namespace psychorientation
public enum TypeMessage
{
- INFORMATION,NOTATION
+ INFORMATION,NOTATION,RESULTAT
}
public partial class Message : Form
@@ -27,6 +27,14 @@ namespace psychorientation
int reponseInt = 0;
double reponseDouble = 0;
+ bool effortScoreRouge = false;
+ bool moyenneScoreRouge = false;
+ bool competenceScoreRouge = false;
+
+ double effortScore;
+ double moyenneScore;
+ double competenceScore;
+
public Message(string messageAffiche,string titreAffiche,TypeMessage typeMessage)
{
@@ -36,6 +44,16 @@ namespace psychorientation
titre = titreAffiche;
}
+ public void setParamRes(double resEffort, double resCompetence, double resMoyenne,bool effortRouge, bool competenceRouge, bool moyenneRouge)
+ {
+ effortScore = resEffort;
+ moyenneScore = resMoyenne;
+ competenceScore = resCompetence;
+ effortScoreRouge = effortRouge;
+ competenceScoreRouge = competenceRouge;
+ moyenneScoreRouge = moyenneRouge;
+ }
+
public bool getReponseBool
{
get { return reponseBool; }
@@ -60,10 +78,12 @@ namespace psychorientation
private void Message_Load(object sender, EventArgs e)
{
lblMessage.Text = message;
+ lblScore.Text = message;
lblTitre.Text = titre;
switch (typeMessage)
{
case TypeMessage.INFORMATION:
+ lblMessage.Visible = true;
this.Size = new Size(986, 347);
Button b = new Button();
b.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
@@ -75,7 +95,51 @@ namespace psychorientation
b.Click += new System.EventHandler(this.b_Click);
this.Controls.Add(b);
break;
+ case TypeMessage.RESULTAT:
+ lblCompetence.Visible = true;
+ lblEffort.Visible = true;
+ lblMoyenen.Visible = true;
+ lblScore.Visible = true;
+ lblCompetence.Text = "L'évolution des compétences de vos élèves est de : " + competenceScore+" %";
+ lblEffort.Text = "L'évolution des efforts de vos élèves est de : " + effortScore + " %";
+ lblMoyenen.Text = "L'évolution des moyennes de vos élèves est de : " + moyenneScore + " %";
+ if (!effortScoreRouge)
+ {
+ lblEffort.ForeColor = Color.Red;
+ }
+ else
+ {
+ lblEffort.ForeColor = Color.Green;
+ }
+ if (!competenceScoreRouge)
+ {
+ lblCompetence.ForeColor = Color.Red;
+ }
+ else
+ {
+ lblCompetence.ForeColor = Color.Green;
+ }
+ if (!moyenneScoreRouge)
+ {
+ lblMoyenen.ForeColor = Color.Red;
+ }
+ else
+ {
+ lblMoyenen.ForeColor = Color.Green;
+ }
+ this.Size = new Size(986, 347);
+ Button bh = new Button();
+ bh.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ bh.Location = new System.Drawing.Point(784, 284);
+ bh.Size = new System.Drawing.Size(190, 51);
+ bh.TabIndex = 2;
+ bh.Text = "Valider";
+ bh.UseVisualStyleBackColor = true;
+ bh.Click += new System.EventHandler(this.b_Click);
+ this.Controls.Add(bh);
+ break;
case TypeMessage.NOTATION:
+ lblMessage.Visible = true;
this.Size = new Size(986, 347);
Button bu = new Button();
bu.Font = new System.Drawing.Font("Microsoft Sans Serif", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
@@ -122,5 +186,10 @@ namespace psychorientation
this.reponseDouble = (double)tb.Value;
tag.Text= "Type de cours visant à aider les élèves de compétence : " + this.reponseDouble;
}
+
+ private void lblMoyenen_Click(object sender, EventArgs e)
+ {
+
+ }
}
}
diff --git a/psychorientation/psychorientation/Properties/Resources.Designer.cs b/psychorientation/psychorientation/Properties/Resources.Designer.cs
index 811243c2f7faf266076fa9b29b78acefbcb8a550..5a3341e908e534ad8b8561242d82412d32636dc4 100644
--- a/psychorientation/psychorientation/Properties/Resources.Designer.cs
+++ b/psychorientation/psychorientation/Properties/Resources.Designer.cs
@@ -90,6 +90,16 @@ namespace psychorientation.Properties {
}
}
+ /// <summary>
+ /// Recherche une ressource localisée de type System.Drawing.Bitmap.
+ /// </summary>
+ internal static System.Drawing.Bitmap paternFeuille1 {
+ get {
+ object obj = ResourceManager.GetObject("paternFeuille1", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
/// <summary>
/// Recherche une ressource localisée de type System.Drawing.Bitmap.
/// </summary>
diff --git a/psychorientation/psychorientation/Properties/Resources.resx b/psychorientation/psychorientation/Properties/Resources.resx
index 0f195fcdb5f6ced723075beb60b516c2f9193577..4fc2ea8715c175173b895b4c96cb05b29ad3b9fd 100644
--- a/psychorientation/psychorientation/Properties/Resources.resx
+++ b/psychorientation/psychorientation/Properties/Resources.resx
@@ -121,8 +121,8 @@
<data name="salleV1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\salleV1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="passer" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\passer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="grp" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\grp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="paternFeuille" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\bin\Debug\images\patern\paternFeuille.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -130,13 +130,16 @@
<data name="sortir" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\sortir.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="grp" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\grp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="passer" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\passer.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="prof2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\prof2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="salleV11" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\salleV11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
- <data name="prof2" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\prof2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <data name="paternFeuille1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\paternFeuille.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
\ No newline at end of file
diff --git a/psychorientation/psychorientation/Resources/paternFeuille.png b/psychorientation/psychorientation/Resources/paternFeuille.png
new file mode 100644
index 0000000000000000000000000000000000000000..002a14f0605484bd19172bb321b707b2bc00f56c
Binary files /dev/null and b/psychorientation/psychorientation/Resources/paternFeuille.png differ
diff --git a/psychorientation/psychorientation/psychorientation.csproj b/psychorientation/psychorientation/psychorientation.csproj
index a24c009ff7f1e1784e2b2bce8f18f4a7e8938837..55432bbe4a2b6da818421e88d7fd9960b5c40c45 100644
--- a/psychorientation/psychorientation/psychorientation.csproj
+++ b/psychorientation/psychorientation/psychorientation.csproj
@@ -155,5 +155,8 @@
<ItemGroup>
<None Include="Resources\prof2.png" />
</ItemGroup>
+ <ItemGroup>
+ <None Include="Resources\paternFeuille.png" />
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
\ No newline at end of file