diff --git a/psychorientation/psychorientation/InterfaceClasse.Designer.cs b/psychorientation/psychorientation/InterfaceClasse.Designer.cs index ae4bea3a9771c51b0bf75cbab030ec3ccda3bc9f..74eaf438f483851a5174125182ef9b14c230a563 100644 --- a/psychorientation/psychorientation/InterfaceClasse.Designer.cs +++ b/psychorientation/psychorientation/InterfaceClasse.Designer.cs @@ -69,7 +69,7 @@ this.lblDate.BackColor = System.Drawing.Color.Transparent; this.lblDate.Font = new System.Drawing.Font("Consolas", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblDate.ForeColor = System.Drawing.Color.White; - this.lblDate.Location = new System.Drawing.Point(277, 171); + this.lblDate.Location = new System.Drawing.Point(275, 171); this.lblDate.Name = "lblDate"; this.lblDate.Size = new System.Drawing.Size(140, 22); this.lblDate.TabIndex = 2; @@ -81,7 +81,7 @@ this.lblClasse.BackColor = System.Drawing.Color.Transparent; this.lblClasse.Font = new System.Drawing.Font("Consolas", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lblClasse.ForeColor = System.Drawing.Color.White; - this.lblClasse.Location = new System.Drawing.Point(951, 171); + this.lblClasse.Location = new System.Drawing.Point(949, 171); this.lblClasse.Name = "lblClasse"; this.lblClasse.Size = new System.Drawing.Size(140, 22); this.lblClasse.TabIndex = 4; diff --git a/psychorientation/psychorientation/InterfaceClasse.cs b/psychorientation/psychorientation/InterfaceClasse.cs index 65a9beea3b30680f42361235b66f9686013b0d40..2782d15aaa26f827e94910aea5473ee3f87b2234 100644 --- a/psychorientation/psychorientation/InterfaceClasse.cs +++ b/psychorientation/psychorientation/InterfaceClasse.cs @@ -220,14 +220,15 @@ namespace psychorientation moyenneInitiale, effortFinal, competenceFinal, - moyenneFinale, - isRandom + moyenneFinale ); m_fin.ShowDialog(); UntransmitKeyDown(); pb_action_suivante.Click -= new System.EventHandler(Pb_action_suivante_Click); this.FormClosing -= new System.Windows.Forms.FormClosingEventHandler(InterfaceClasse_FormClosing); Close(); + InterfaceClasse iC = new InterfaceClasse(isRandom); + iC.ShowDialog(); break; } diff --git a/psychorientation/psychorientation/InterfaceClasse.resx b/psychorientation/psychorientation/InterfaceClasse.resx index 02edc12fbfc6a0ab36b7246326a46f133a9739cc..af07aa2e465b4024c9efe3c1b9a4fd3304382e32 100644 --- a/psychorientation/psychorientation/InterfaceClasse.resx +++ b/psychorientation/psychorientation/InterfaceClasse.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACM - mgEAAk1TRnQBSQFMAgEBBgEAAYABAAGAAQAByAEAAcgBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + mgEAAk1TRnQBSQFMAgEBBgEAAYgBAAGIAQAByAEAAcgBAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABIAEDAgABkAEBAgABAQEAAQgGAAHiAQQXAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEA AcAB3AHAAQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEA A0IBAAM5AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIA diff --git a/psychorientation/psychorientation/Menu.Designer.cs b/psychorientation/psychorientation/Menu.Designer.cs index f957dc7ad69e9c1b88030063334df548bbff3a45..b403011c3bf01c0bff062f2f253985150ff3db7e 100644 --- a/psychorientation/psychorientation/Menu.Designer.cs +++ b/psychorientation/psychorientation/Menu.Designer.cs @@ -84,6 +84,7 @@ this.Name = "Menu"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Menu"; + this.Load += new System.EventHandler(this.Menu_Load); this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.Menu_KeyDown); this.ResumeLayout(false); this.PerformLayout(); diff --git a/psychorientation/psychorientation/Menu.cs b/psychorientation/psychorientation/Menu.cs index 00e62793d30f5daf18589699269c60e8fb0a68cf..98c31c095c9e475fbabb38adc5dc1067bc90bca4 100644 --- a/psychorientation/psychorientation/Menu.cs +++ b/psychorientation/psychorientation/Menu.cs @@ -22,14 +22,14 @@ namespace psychorientation private void button1_Click(object sender, EventArgs e) { InterfaceClasse iC = new InterfaceClasse(false); - iC.Show(); + iC.ShowDialog(); } private void button2_Click(object sender, EventArgs e) { InterfaceClasse iC = new InterfaceClasse(true); - iC.Show(); + iC.ShowDialog(); } private void TransmitKeyDown() @@ -54,5 +54,10 @@ namespace psychorientation Close(); } } + + private void Menu_Load(object sender, EventArgs e) + { + + } } } diff --git a/psychorientation/psychorientation/Message.cs b/psychorientation/psychorientation/Message.cs index c3507428d2ee41bcba658716d39930d4c2bb13e8..1da6d1fa3c8adbdd14941ec9b4149cd28b961c4d 100644 --- a/psychorientation/psychorientation/Message.cs +++ b/psychorientation/psychorientation/Message.cs @@ -48,7 +48,7 @@ namespace psychorientation titre = titreAffiche; } - public void setParamRes(double effortInitial, double competenceInitial, double moyenneInitiale, double effortFinal, double competenceFinal, double moyenneFinale,bool isRandom) + public void setParamRes(double effortInitial, double competenceInitial, double moyenneInitiale, double effortFinal, double competenceFinal, double moyenneFinale) { effortScore = Math.Round(100 * (effortFinal - effortInitial) / effortInitial, 1); competenceScore = Math.Round(100 * (competenceFinal - competenceInitial) / competenceInitial, 1); @@ -206,8 +206,6 @@ namespace psychorientation private void btnRejouer_Click(object sender, EventArgs e) { this.DialogResult = DialogResult.OK; - InterfaceClasse iC = new InterfaceClasse(isRandom); - iC.Show(); } } }