diff --git a/Arti4/Arti4/Formulaires/FORM_Bilan.Designer.cs b/Arti4/Arti4/Formulaires/FORM_Bilan.Designer.cs
index 4bbe1e1d89a69719359aa50cd47e091d95196219..a415722e7518649f86eee03855d8fae99b50c8e6 100644
--- a/Arti4/Arti4/Formulaires/FORM_Bilan.Designer.cs
+++ b/Arti4/Arti4/Formulaires/FORM_Bilan.Designer.cs
@@ -63,6 +63,7 @@
this.txt_recettePublique = new System.Windows.Forms.TextBox();
this.lblPériode = new System.Windows.Forms.Label();
this.lblNum = new System.Windows.Forms.Label();
+ this.bt_recommencer = new System.Windows.Forms.Button();
this.SuspendLayout();
//
// btnP0
@@ -441,11 +442,23 @@
this.lblNum.TabIndex = 90;
this.lblNum.Text = "0";
//
+ // bt_recommencer
+ //
+ this.bt_recommencer.Location = new System.Drawing.Point(777, 504);
+ this.bt_recommencer.Name = "bt_recommencer";
+ this.bt_recommencer.Size = new System.Drawing.Size(241, 92);
+ this.bt_recommencer.TabIndex = 91;
+ this.bt_recommencer.Text = "Recommencer";
+ this.bt_recommencer.UseVisualStyleBackColor = true;
+ this.bt_recommencer.Visible = false;
+ this.bt_recommencer.Click += new System.EventHandler(this.bt_recommencer_Click);
+ //
// FORM_Bilan
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1031, 609);
+ this.Controls.Add(this.bt_recommencer);
this.Controls.Add(this.lblNum);
this.Controls.Add(this.lblPériode);
this.Controls.Add(this.txt_recettePublique);
@@ -527,5 +540,6 @@
private System.Windows.Forms.TextBox txt_recettePublique;
private System.Windows.Forms.Label lblPériode;
private System.Windows.Forms.Label lblNum;
+ private System.Windows.Forms.Button bt_recommencer;
}
}
\ No newline at end of file
diff --git a/Arti4/Arti4/Formulaires/FORM_Bilan.cs b/Arti4/Arti4/Formulaires/FORM_Bilan.cs
index 72660dbc6cc8fce8fae0abc39b278c3663a00302..c59b727b835392bd610aef3b794defe4d93435d3 100644
--- a/Arti4/Arti4/Formulaires/FORM_Bilan.cs
+++ b/Arti4/Arti4/Formulaires/FORM_Bilan.cs
@@ -25,7 +25,16 @@ namespace Arti4.Formulaires
{
periodes = Partie.Instance.GetPeriodes();
setPeriode(periodes[0]);
-
+ if(periodes.Count == 6)
+ {
+ bt_recommencer.Visible = true;
+ btnQuitter.Visible = false;
+ }
+ else
+ {
+ bt_recommencer.Visible = false;
+ btnQuitter.Visible = true;
+ }
}
private void btnP0_Click(object sender, EventArgs e)
@@ -101,7 +110,7 @@ namespace Arti4.Formulaires
this.txt_pib.Text = p.PIB.ToString();
//this.txt_popActive.Text = p.PopActive.ToString();
this.txt_recettePublique.Text = p.RecettePublique.ToString();
- this.txt_soldeBudgetaire.Text = (p.DepensePublique - p.RecettePublique).ToString();
+ this.txt_soldeBudgetaire.Text = (p.RecettePublique - p.DepensePublique).ToString();
}
private void lblRevenuMenage_Click(object sender, EventArgs e)
@@ -118,5 +127,11 @@ namespace Arti4.Formulaires
{
}
+
+ private void bt_recommencer_Click(object sender, EventArgs e)
+ {
+ Partie.Instance.Reset();
+ Application.Restart();
+ }
}
}
diff --git a/Arti4/Arti4/Formulaires/FORM_politique.Designer.cs b/Arti4/Arti4/Formulaires/FORM_politique.Designer.cs
index 63b40d62836057d205c5d62fcf88b0ea52fa99fb..4e9de9b072d7def8f6de0bdb50c544b6978bce2e 100644
--- a/Arti4/Arti4/Formulaires/FORM_politique.Designer.cs
+++ b/Arti4/Arti4/Formulaires/FORM_politique.Designer.cs
@@ -82,6 +82,7 @@
this.Controls.Add(this.listBox1);
this.Controls.Add(this.button1);
this.Name = "FORM_politique";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "Politique de décision";
this.Load += new System.EventHandler(this.FORM_politique_Load);
this.ResumeLayout(false);
diff --git a/Arti4/Arti4/Models/Partie.cs b/Arti4/Arti4/Models/Partie.cs
index 8887f7725a22a0fc3c75786913298231c9806557..5b00dc87f4d4d093e484930c564fb741005d66c6 100644
--- a/Arti4/Arti4/Models/Partie.cs
+++ b/Arti4/Arti4/Models/Partie.cs
@@ -15,6 +15,7 @@ namespace Arti4
private double m_tva_value = 0.2;
private double m_impot_revenue_value = 0.1;
private double m_impot_societe_value = 0.1;
+ private int m_investissementPublique_value = 1;
// variables privées statiques
private static Partie m_instance = null;
@@ -45,6 +46,7 @@ namespace Arti4
public double Tva_value { get => m_tva_value; set => m_tva_value = value; }
public double Impot_revenue_value { get => m_impot_revenue_value; set => m_impot_revenue_value = value; }
public double Impot_societe_value { get => m_impot_societe_value; set => m_impot_societe_value = value; }
+ public int InvestissementPublique_value { get => m_investissementPublique_value; set => m_investissementPublique_value = value; }
// variable publique membres
@@ -63,6 +65,7 @@ namespace Arti4
m_tva_value = p.TauxTva;
m_impot_revenue_value = p.ImpotRevenu;
m_impot_societe_value = p.ImpotSociete;
+ m_investissementPublique_value = p.InvestissementPublique;
periodes.Add(p);
break;
@@ -117,5 +120,21 @@ namespace Arti4
return new List<Periode>(periodes);
}
+ public void Reset()
+ {
+ m_instance = null;
+ }
+
+ public Periode next()
+ {
+
+ Periode currentP = GetCurrentPeriode();
+ Periode nextP = new Periode(currentP);
+ nextP.compute(this.Tva_value, this.Impot_societe_value, this.Impot_revenue_value, this.m_prestation_value, this.m_subvention_value, this.m_investissementPublique_value);
+ periodes.Add(nextP);
+
+ return nextP;
+ }
+
}
}
diff --git a/Arti4/Arti4/Models/Periode.cs b/Arti4/Arti4/Models/Periode.cs
index 1d8035ded8eae0e67b907206fcb5de5c5d31df19..ac04d43ebaaf7fbc6e173a059e77a339de81e85b 100644
--- a/Arti4/Arti4/Models/Periode.cs
+++ b/Arti4/Arti4/Models/Periode.cs
@@ -169,8 +169,6 @@ namespace Arti4.Models
this.m_recettePublique = (int)(new_taux_impot_revenu * new_revenue_menage) + (int)(new_taux_impot_societe * new_revenue_entreprise) + (int)(new_taux_tva * new_pib);
-
-
}
diff --git a/Arti4/Arti4/UserControls/Jeu/UC_Depenses_Publiques.Designer.cs b/Arti4/Arti4/UserControls/Jeu/UC_Depenses_Publiques.Designer.cs
index 10b7cce48e667ce35cd78809f089f78a28aa4b92..51900c6c94fed148949c288cbb8cef4c21eac9cd 100644
--- a/Arti4/Arti4/UserControls/Jeu/UC_Depenses_Publiques.Designer.cs
+++ b/Arti4/Arti4/UserControls/Jeu/UC_Depenses_Publiques.Designer.cs
@@ -43,8 +43,15 @@
this.label8 = new System.Windows.Forms.Label();
this.pbSociale = new System.Windows.Forms.PictureBox();
this.pbEntreprise = new System.Windows.Forms.PictureBox();
+ this.pictureBox1 = new System.Windows.Forms.PictureBox();
+ this.bt_investissement_down = new System.Windows.Forms.Button();
+ this.bt_investissement_up = new System.Windows.Forms.Button();
+ this.txt_new_investissementPublique = new System.Windows.Forms.TextBox();
+ this.txt_investissementPublique_start = new System.Windows.Forms.TextBox();
+ this.label3 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.pbSociale)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pbEntreprise)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.SuspendLayout();
//
// bt_prestation_down
@@ -208,10 +215,82 @@
this.pbEntreprise.TabIndex = 80;
this.pbEntreprise.TabStop = false;
//
+ // pictureBox1
+ //
+ this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+ this.pictureBox1.Image = global::Arti4.Properties.Resources.question_mark;
+ this.pictureBox1.Location = new System.Drawing.Point(641, 327);
+ this.pictureBox1.Name = "pictureBox1";
+ this.pictureBox1.Size = new System.Drawing.Size(35, 35);
+ this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.pictureBox1.TabIndex = 86;
+ this.pictureBox1.TabStop = false;
+ //
+ // bt_investissement_down
+ //
+ this.bt_investissement_down.Font = new System.Drawing.Font("Microsoft Sans Serif", 15.25F);
+ this.bt_investissement_down.Location = new System.Drawing.Point(515, 327);
+ this.bt_investissement_down.Name = "bt_investissement_down";
+ this.bt_investissement_down.Size = new System.Drawing.Size(44, 44);
+ this.bt_investissement_down.TabIndex = 85;
+ this.bt_investissement_down.Text = "v";
+ this.bt_investissement_down.UseVisualStyleBackColor = true;
+ this.bt_investissement_down.Click += new System.EventHandler(this.bt_investissement_down_Click);
+ //
+ // bt_investissement_up
+ //
+ this.bt_investissement_up.Font = new System.Drawing.Font("Microsoft Sans Serif", 15.25F);
+ this.bt_investissement_up.Location = new System.Drawing.Point(565, 327);
+ this.bt_investissement_up.Name = "bt_investissement_up";
+ this.bt_investissement_up.Size = new System.Drawing.Size(44, 44);
+ this.bt_investissement_up.TabIndex = 84;
+ this.bt_investissement_up.Text = "^";
+ this.bt_investissement_up.UseVisualStyleBackColor = true;
+ this.bt_investissement_up.Click += new System.EventHandler(this.bt_investissement_up_Click);
+ //
+ // txt_new_investissementPublique
+ //
+ this.txt_new_investissementPublique.Font = new System.Drawing.Font("Cambria", 15.70909F);
+ this.txt_new_investissementPublique.Location = new System.Drawing.Point(346, 327);
+ this.txt_new_investissementPublique.Multiline = true;
+ this.txt_new_investissementPublique.Name = "txt_new_investissementPublique";
+ this.txt_new_investissementPublique.Size = new System.Drawing.Size(152, 44);
+ this.txt_new_investissementPublique.TabIndex = 81;
+ this.txt_new_investissementPublique.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+ this.txt_new_investissementPublique.TextChanged += new System.EventHandler(this.txt_new_investissementPublique_TextChanged);
+ this.txt_new_investissementPublique.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtUpValue_KeyPress);
+ //
+ // txt_investissementPublique_start
+ //
+ this.txt_investissementPublique_start.Enabled = false;
+ this.txt_investissementPublique_start.Font = new System.Drawing.Font("Cambria", 15.70909F);
+ this.txt_investissementPublique_start.Location = new System.Drawing.Point(182, 327);
+ this.txt_investissementPublique_start.Multiline = true;
+ this.txt_investissementPublique_start.Name = "txt_investissementPublique_start";
+ this.txt_investissementPublique_start.Size = new System.Drawing.Size(152, 44);
+ this.txt_investissementPublique_start.TabIndex = 83;
+ this.txt_investissementPublique_start.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+ //
+ // label3
+ //
+ this.label3.AutoSize = true;
+ this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 15.25F);
+ this.label3.Location = new System.Drawing.Point(3, 318);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(178, 58);
+ this.label3.TabIndex = 82;
+ this.label3.Text = "Investissement \r\n publique";
+ //
// UC_Depenses_Publiques
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.Controls.Add(this.pictureBox1);
+ this.Controls.Add(this.bt_investissement_down);
+ this.Controls.Add(this.bt_investissement_up);
+ this.Controls.Add(this.txt_new_investissementPublique);
+ this.Controls.Add(this.txt_investissementPublique_start);
+ this.Controls.Add(this.label3);
this.Controls.Add(this.pbEntreprise);
this.Controls.Add(this.pbSociale);
this.Controls.Add(this.bt_prestation_down);
@@ -232,6 +311,7 @@
this.Load += new System.EventHandler(this.UC_Choix_2_Load);
((System.ComponentModel.ISupportInitialize)(this.pbSociale)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pbEntreprise)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@@ -254,5 +334,11 @@
private System.Windows.Forms.Label label8;
private System.Windows.Forms.PictureBox pbSociale;
private System.Windows.Forms.PictureBox pbEntreprise;
+ private System.Windows.Forms.PictureBox pictureBox1;
+ private System.Windows.Forms.Button bt_investissement_down;
+ private System.Windows.Forms.Button bt_investissement_up;
+ private System.Windows.Forms.TextBox txt_new_investissementPublique;
+ private System.Windows.Forms.TextBox txt_investissementPublique_start;
+ private System.Windows.Forms.Label label3;
}
}
diff --git a/Arti4/Arti4/UserControls/Jeu/UC_Depenses_Publiques.cs b/Arti4/Arti4/UserControls/Jeu/UC_Depenses_Publiques.cs
index 17b9d99a3071b57e7da1b295ba83abc5469dad42..b093b958768c1f4e0daf22b364519b072ae2b094 100644
--- a/Arti4/Arti4/UserControls/Jeu/UC_Depenses_Publiques.cs
+++ b/Arti4/Arti4/UserControls/Jeu/UC_Depenses_Publiques.cs
@@ -34,10 +34,11 @@ namespace Arti4
txt_prestation_start.Text = p.Prestation.ToString();
txt_subvention_start.Text = p.Subvention.ToString();
-
+ txt_investissementPublique_start.Text = p.InvestissementPublique.ToString();
txt_new_prestation.Text = Partie.Instance.Prestation_value.ToString();
txt_new_subvention.Text = Partie.Instance.Subvention_value.ToString();
+ txt_new_investissementPublique.Text = Partie.Instance.InvestissementPublique_value.ToString();
}
@@ -97,13 +98,38 @@ namespace Arti4
private void txt_new_prestation_TextChanged(object sender, EventArgs e)
{
- Partie.Instance.Prestation_value = int.Parse(txt_new_prestation.Text);
+ if (txt_new_prestation.Text.Length > 0)
+ Partie.Instance.Prestation_value = int.Parse(txt_new_prestation.Text);
}
private void txt_new_subvention_TextChanged(object sender, EventArgs e)
{
- Partie.Instance.Subvention_value = int.Parse(txt_new_subvention.Text);
+ if (txt_new_subvention.Text.Length > 0)
+ Partie.Instance.Subvention_value = int.Parse(txt_new_subvention.Text);
+ }
+ private void bt_investissement_up_Click(object sender, EventArgs e)
+ {
+ int value = 0;
+ if (txt_new_investissementPublique.Text.Length != 0)
+ value = int.Parse(txt_new_investissementPublique.Text);
+ txt_new_investissementPublique.Text = (value + 1).ToString();
+ }
+
+ private void bt_investissement_down_Click(object sender, EventArgs e)
+ {
+ int value = 0;
+ if (txt_new_investissementPublique.Text.Length != 0)
+ value = int.Parse(txt_new_investissementPublique.Text);
+ if (value == 0)
+ return;
+ txt_new_investissementPublique.Text = (value - 1).ToString();
+ }
+
+ private void txt_new_investissementPublique_TextChanged(object sender, EventArgs e)
+ {
+ if(txt_new_investissementPublique.Text.Length > 0)
+ Partie.Instance.InvestissementPublique_value = int.Parse(txt_new_investissementPublique.Text);
}
}
}
diff --git a/Arti4/Arti4/UserControls/UC_Bilan.Designer.cs b/Arti4/Arti4/UserControls/UC_Bilan.Designer.cs
index 452db47619b830e36fd833fcb276272b538d33ee..fae324375f610283b952e47f8aba503f5ea1df5a 100644
--- a/Arti4/Arti4/UserControls/UC_Bilan.Designer.cs
+++ b/Arti4/Arti4/UserControls/UC_Bilan.Designer.cs
@@ -29,25 +29,752 @@
private void InitializeComponent()
{
this.btnSuite = new System.Windows.Forms.Button();
+ this.lblExport = new System.Windows.Forms.Label();
+ this.lblPIB = new System.Windows.Forms.Label();
+ this.lblConso = new System.Windows.Forms.Label();
+ this.lblImportRevenu = new System.Windows.Forms.Label();
+ this.lblInvestissement = new System.Windows.Forms.Label();
+ this.lblEndettement = new System.Windows.Forms.Label();
+ this.lblImport = new System.Windows.Forms.Label();
+ this.txt_endettement_old = new System.Windows.Forms.TextBox();
+ this.txt_import_old = new System.Windows.Forms.TextBox();
+ this.lblImpotSociete = new System.Windows.Forms.Label();
+ this.lblRecette = new System.Windows.Forms.Label();
+ this.lblPop = new System.Windows.Forms.Label();
+ this.lblDepensesPub = new System.Windows.Forms.Label();
+ this.lblSolde = new System.Windows.Forms.Label();
+ this.lblChomage = new System.Windows.Forms.Label();
+ this.txt_impotSociete_old = new System.Windows.Forms.TextBox();
+ this.txt_chomage_old = new System.Windows.Forms.TextBox();
+ this.txt_soldeBudgetaire_old = new System.Windows.Forms.TextBox();
+ this.txt_popActive_old = new System.Windows.Forms.TextBox();
+ this.txt_depenses_old = new System.Windows.Forms.TextBox();
+ this.txt_recettes_old = new System.Windows.Forms.TextBox();
+ this.txt_export_old = new System.Windows.Forms.TextBox();
+ this.txt_pib_old = new System.Windows.Forms.TextBox();
+ this.txt_consommation_old = new System.Windows.Forms.TextBox();
+ this.txt_investissement_old = new System.Windows.Forms.TextBox();
+ this.txt_impotRevenu_old = new System.Windows.Forms.TextBox();
+ this.txt_impotRevenu_new = new System.Windows.Forms.TextBox();
+ this.txt_investissement_new = new System.Windows.Forms.TextBox();
+ this.txt_consommation_new = new System.Windows.Forms.TextBox();
+ this.txt_pib_new = new System.Windows.Forms.TextBox();
+ this.txt_export_new = new System.Windows.Forms.TextBox();
+ this.txt_recettes_new = new System.Windows.Forms.TextBox();
+ this.txt_depenses_new = new System.Windows.Forms.TextBox();
+ this.textBox20 = new System.Windows.Forms.TextBox();
+ this.txt_soldeBudgetaire_new = new System.Windows.Forms.TextBox();
+ this.textBox22 = new System.Windows.Forms.TextBox();
+ this.txt_impotSociete_new = new System.Windows.Forms.TextBox();
+ this.label1 = new System.Windows.Forms.Label();
+ this.label2 = new System.Windows.Forms.Label();
+ this.label3 = new System.Windows.Forms.Label();
+ this.label4 = new System.Windows.Forms.Label();
+ this.label5 = new System.Windows.Forms.Label();
+ this.label6 = new System.Windows.Forms.Label();
+ this.txt_import_new = new System.Windows.Forms.TextBox();
+ this.textBox25 = new System.Windows.Forms.TextBox();
+ this.label7 = new System.Windows.Forms.Label();
+ this.label8 = new System.Windows.Forms.Label();
+ this.label9 = new System.Windows.Forms.Label();
+ this.label10 = new System.Windows.Forms.Label();
+ this.label11 = new System.Windows.Forms.Label();
+ this.label12 = new System.Windows.Forms.Label();
+ this.label13 = new System.Windows.Forms.Label();
+ this.lbl_oldPeriode = new System.Windows.Forms.Label();
+ this.lbl_newPeriode = new System.Windows.Forms.Label();
+ this.groupBox1 = new System.Windows.Forms.GroupBox();
+ this.groupBox2 = new System.Windows.Forms.GroupBox();
+ this.groupBox1.SuspendLayout();
+ this.groupBox2.SuspendLayout();
this.SuspendLayout();
//
// btnSuite
//
- this.btnSuite.Location = new System.Drawing.Point(626, 377);
+ this.btnSuite.Location = new System.Drawing.Point(0, 714);
this.btnSuite.Name = "btnSuite";
- this.btnSuite.Size = new System.Drawing.Size(157, 55);
+ this.btnSuite.Size = new System.Drawing.Size(1259, 39);
this.btnSuite.TabIndex = 0;
this.btnSuite.Text = "Suite";
this.btnSuite.UseVisualStyleBackColor = true;
this.btnSuite.Click += new System.EventHandler(this.btnSuite_Click);
//
+ // lblExport
+ //
+ this.lblExport.AutoSize = true;
+ this.lblExport.Font = new System.Drawing.Font("Microsoft Sans Serif", 12.25F);
+ this.lblExport.Location = new System.Drawing.Point(83, 115);
+ this.lblExport.Name = "lblExport";
+ this.lblExport.Size = new System.Drawing.Size(65, 24);
+ this.lblExport.TabIndex = 101;
+ this.lblExport.Text = "Export";
+ //
+ // lblPIB
+ //
+ this.lblPIB.AutoSize = true;
+ this.lblPIB.Font = new System.Drawing.Font("Microsoft Sans Serif", 12.25F);
+ this.lblPIB.Location = new System.Drawing.Point(86, 164);
+ this.lblPIB.Name = "lblPIB";
+ this.lblPIB.Size = new System.Drawing.Size(38, 24);
+ this.lblPIB.TabIndex = 100;
+ this.lblPIB.Text = "PIB";
+ //
+ // lblConso
+ //
+ this.lblConso.AutoSize = true;
+ this.lblConso.Font = new System.Drawing.Font("Microsoft Sans Serif", 12.25F);
+ this.lblConso.Location = new System.Drawing.Point(86, 213);
+ this.lblConso.Name = "lblConso";
+ this.lblConso.Size = new System.Drawing.Size(137, 24);
+ this.lblConso.TabIndex = 99;
+ this.lblConso.Text = "Consommation";
+ //
+ // lblImportRevenu
+ //
+ this.lblImportRevenu.AutoSize = true;
+ this.lblImportRevenu.Font = new System.Drawing.Font("Microsoft Sans Serif", 12.25F);
+ this.lblImportRevenu.Location = new System.Drawing.Point(86, 311);
+ this.lblImportRevenu.Name = "lblImportRevenu";
+ this.lblImportRevenu.Size = new System.Drawing.Size(127, 24);
+ this.lblImportRevenu.TabIndex = 98;
+ this.lblImportRevenu.Text = "Impôt Revenu";
+ //
+ // lblInvestissement
+ //
+ this.lblInvestissement.AutoSize = true;
+ this.lblInvestissement.Font = new System.Drawing.Font("Microsoft Sans Serif", 12.25F);
+ this.lblInvestissement.Location = new System.Drawing.Point(86, 262);
+ this.lblInvestissement.Name = "lblInvestissement";
+ this.lblInvestissement.Size = new System.Drawing.Size(133, 24);
+ this.lblInvestissement.TabIndex = 94;
+ this.lblInvestissement.Text = "Investissement";
+ //
+ // lblEndettement
+ //
+ this.lblEndettement.AutoSize = true;
+ this.lblEndettement.Font = new System.Drawing.Font("Microsoft Sans Serif", 12.25F);
+ this.lblEndettement.Location = new System.Drawing.Point(86, 654);
+ this.lblEndettement.Name = "lblEndettement";
+ this.lblEndettement.Size = new System.Drawing.Size(117, 24);
+ this.lblEndettement.TabIndex = 92;
+ this.lblEndettement.Text = "Endettement";
+ //
+ // lblImport
+ //
+ this.lblImport.AutoSize = true;
+ this.lblImport.Font = new System.Drawing.Font("Microsoft Sans Serif", 12.25F);
+ this.lblImport.Location = new System.Drawing.Point(83, 66);
+ this.lblImport.Name = "lblImport";
+ this.lblImport.Size = new System.Drawing.Size(62, 24);
+ this.lblImport.TabIndex = 89;
+ this.lblImport.Text = "Import";
+ //
+ // txt_endettement_old
+ //
+ this.txt_endettement_old.Enabled = false;
+ this.txt_endettement_old.Font = new System.Drawing.Font("Cambria", 15.70909F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.txt_endettement_old.Location = new System.Drawing.Point(338, 647);
+ this.txt_endettement_old.Multiline = true;
+ this.txt_endettement_old.Name = "txt_endettement_old";
+ this.txt_endettement_old.Size = new System.Drawing.Size(89, 40);
+ this.txt_endettement_old.TabIndex = 112;
+ this.txt_endettement_old.TabStop = false;
+ this.txt_endettement_old.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+ //
+ // txt_import_old
+ //
+ this.txt_import_old.Enabled = false;
+ this.txt_import_old.Font = new System.Drawing.Font("Cambria", 15.70909F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.txt_import_old.Location = new System.Drawing.Point(338, 59);
+ this.txt_import_old.Multiline = true;
+ this.txt_import_old.Name = "txt_import_old";
+ this.txt_import_old.Size = new System.Drawing.Size(89, 40);
+ this.txt_import_old.TabIndex = 113;
+ this.txt_import_old.TabStop = false;
+ this.txt_import_old.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+ //
+ // lblImpotSociete
+ //
+ this.lblImpotSociete.AutoSize = true;
+ this.lblImpotSociete.Font = new System.Drawing.Font("Microsoft Sans Serif", 12.25F);
+ this.lblImpotSociete.Location = new System.Drawing.Point(86, 606);
+ this.lblImpotSociete.Name = "lblImpotSociete";
+ this.lblImpotSociete.Size = new System.Drawing.Size(124, 24);
+ this.lblImpotSociete.TabIndex = 119;
+ this.lblImpotSociete.Text = "Impôt Société";
+ //
+ // lblRecette
+ //
+ this.lblRecette.AutoSize = true;
+ this.lblRecette.Font = new System.Drawing.Font("Microsoft Sans Serif", 12.25F);
+ this.lblRecette.Location = new System.Drawing.Point(86, 361);
+ this.lblRecette.Name = "lblRecette";
+ this.lblRecette.Size = new System.Drawing.Size(172, 24);
+ this.lblRecette.TabIndex = 118;
+ this.lblRecette.Text = "Recettes Publiques";
+ //
+ // lblPop
+ //
+ this.lblPop.AutoSize = true;
+ this.lblPop.Font = new System.Drawing.Font("Microsoft Sans Serif", 12.25F);
+ this.lblPop.Location = new System.Drawing.Point(86, 459);
+ this.lblPop.Name = "lblPop";
+ this.lblPop.Size = new System.Drawing.Size(155, 24);
+ this.lblPop.TabIndex = 117;
+ this.lblPop.Text = "Population Active";
+ //
+ // lblDepensesPub
+ //
+ this.lblDepensesPub.AutoSize = true;
+ this.lblDepensesPub.Font = new System.Drawing.Font("Microsoft Sans Serif", 12.25F);
+ this.lblDepensesPub.Location = new System.Drawing.Point(86, 410);
+ this.lblDepensesPub.Name = "lblDepensesPub";
+ this.lblDepensesPub.Size = new System.Drawing.Size(185, 24);
+ this.lblDepensesPub.TabIndex = 116;
+ this.lblDepensesPub.Text = "Dépenses Publiques";
+ //
+ // lblSolde
+ //
+ this.lblSolde.AutoSize = true;
+ this.lblSolde.Font = new System.Drawing.Font("Microsoft Sans Serif", 12.25F);
+ this.lblSolde.Location = new System.Drawing.Point(86, 508);
+ this.lblSolde.Name = "lblSolde";
+ this.lblSolde.Size = new System.Drawing.Size(155, 24);
+ this.lblSolde.TabIndex = 115;
+ this.lblSolde.Text = "Solde Budgétaire";
+ //
+ // lblChomage
+ //
+ this.lblChomage.AutoSize = true;
+ this.lblChomage.Font = new System.Drawing.Font("Microsoft Sans Serif", 12.25F);
+ this.lblChomage.Location = new System.Drawing.Point(86, 557);
+ this.lblChomage.Name = "lblChomage";
+ this.lblChomage.Size = new System.Drawing.Size(168, 24);
+ this.lblChomage.TabIndex = 114;
+ this.lblChomage.Text = "Taux de Chômage";
+ //
+ // txt_impotSociete_old
+ //
+ this.txt_impotSociete_old.Enabled = false;
+ this.txt_impotSociete_old.Font = new System.Drawing.Font("Cambria", 15.70909F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.txt_impotSociete_old.Location = new System.Drawing.Point(338, 599);
+ this.txt_impotSociete_old.Multiline = true;
+ this.txt_impotSociete_old.Name = "txt_impotSociete_old";
+ this.txt_impotSociete_old.Size = new System.Drawing.Size(89, 40);
+ this.txt_impotSociete_old.TabIndex = 120;
+ this.txt_impotSociete_old.TabStop = false;
+ this.txt_impotSociete_old.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+ //
+ // txt_chomage_old
+ //
+ this.txt_chomage_old.Enabled = false;
+ this.txt_chomage_old.Font = new System.Drawing.Font("Cambria", 15.70909F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.txt_chomage_old.Location = new System.Drawing.Point(338, 550);
+ this.txt_chomage_old.Multiline = true;
+ this.txt_chomage_old.Name = "txt_chomage_old";
+ this.txt_chomage_old.Size = new System.Drawing.Size(89, 40);
+ this.txt_chomage_old.TabIndex = 121;
+ this.txt_chomage_old.TabStop = false;
+ this.txt_chomage_old.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+ //
+ // txt_soldeBudgetaire_old
+ //
+ this.txt_soldeBudgetaire_old.Enabled = false;
+ this.txt_soldeBudgetaire_old.Font = new System.Drawing.Font("Cambria", 15.70909F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.txt_soldeBudgetaire_old.Location = new System.Drawing.Point(338, 501);
+ this.txt_soldeBudgetaire_old.Multiline = true;
+ this.txt_soldeBudgetaire_old.Name = "txt_soldeBudgetaire_old";
+ this.txt_soldeBudgetaire_old.Size = new System.Drawing.Size(89, 40);
+ this.txt_soldeBudgetaire_old.TabIndex = 122;
+ this.txt_soldeBudgetaire_old.TabStop = false;
+ this.txt_soldeBudgetaire_old.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+ //
+ // txt_popActive_old
+ //
+ this.txt_popActive_old.Enabled = false;
+ this.txt_popActive_old.Font = new System.Drawing.Font("Cambria", 15.70909F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.txt_popActive_old.Location = new System.Drawing.Point(338, 452);
+ this.txt_popActive_old.Multiline = true;
+ this.txt_popActive_old.Name = "txt_popActive_old";
+ this.txt_popActive_old.Size = new System.Drawing.Size(89, 40);
+ this.txt_popActive_old.TabIndex = 123;
+ this.txt_popActive_old.TabStop = false;
+ this.txt_popActive_old.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+ //
+ // txt_depenses_old
+ //
+ this.txt_depenses_old.Enabled = false;
+ this.txt_depenses_old.Font = new System.Drawing.Font("Cambria", 15.70909F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.txt_depenses_old.Location = new System.Drawing.Point(338, 403);
+ this.txt_depenses_old.Multiline = true;
+ this.txt_depenses_old.Name = "txt_depenses_old";
+ this.txt_depenses_old.Size = new System.Drawing.Size(89, 40);
+ this.txt_depenses_old.TabIndex = 124;
+ this.txt_depenses_old.TabStop = false;
+ this.txt_depenses_old.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+ //
+ // txt_recettes_old
+ //
+ this.txt_recettes_old.Enabled = false;
+ this.txt_recettes_old.Font = new System.Drawing.Font("Cambria", 15.70909F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.txt_recettes_old.Location = new System.Drawing.Point(338, 354);
+ this.txt_recettes_old.Multiline = true;
+ this.txt_recettes_old.Name = "txt_recettes_old";
+ this.txt_recettes_old.Size = new System.Drawing.Size(89, 40);
+ this.txt_recettes_old.TabIndex = 125;
+ this.txt_recettes_old.TabStop = false;
+ this.txt_recettes_old.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+ //
+ // txt_export_old
+ //
+ this.txt_export_old.Enabled = false;
+ this.txt_export_old.Font = new System.Drawing.Font("Cambria", 15.70909F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.txt_export_old.Location = new System.Drawing.Point(338, 108);
+ this.txt_export_old.Multiline = true;
+ this.txt_export_old.Name = "txt_export_old";
+ this.txt_export_old.Size = new System.Drawing.Size(89, 40);
+ this.txt_export_old.TabIndex = 126;
+ this.txt_export_old.TabStop = false;
+ this.txt_export_old.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+ //
+ // txt_pib_old
+ //
+ this.txt_pib_old.Enabled = false;
+ this.txt_pib_old.Font = new System.Drawing.Font("Cambria", 15.70909F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.txt_pib_old.Location = new System.Drawing.Point(338, 157);
+ this.txt_pib_old.Multiline = true;
+ this.txt_pib_old.Name = "txt_pib_old";
+ this.txt_pib_old.Size = new System.Drawing.Size(89, 40);
+ this.txt_pib_old.TabIndex = 127;
+ this.txt_pib_old.TabStop = false;
+ this.txt_pib_old.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+ //
+ // txt_consommation_old
+ //
+ this.txt_consommation_old.Enabled = false;
+ this.txt_consommation_old.Font = new System.Drawing.Font("Cambria", 15.70909F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.txt_consommation_old.Location = new System.Drawing.Point(338, 206);
+ this.txt_consommation_old.Multiline = true;
+ this.txt_consommation_old.Name = "txt_consommation_old";
+ this.txt_consommation_old.Size = new System.Drawing.Size(89, 40);
+ this.txt_consommation_old.TabIndex = 128;
+ this.txt_consommation_old.TabStop = false;
+ this.txt_consommation_old.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+ //
+ // txt_investissement_old
+ //
+ this.txt_investissement_old.Enabled = false;
+ this.txt_investissement_old.Font = new System.Drawing.Font("Cambria", 15.70909F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.txt_investissement_old.Location = new System.Drawing.Point(338, 255);
+ this.txt_investissement_old.Multiline = true;
+ this.txt_investissement_old.Name = "txt_investissement_old";
+ this.txt_investissement_old.Size = new System.Drawing.Size(89, 40);
+ this.txt_investissement_old.TabIndex = 129;
+ this.txt_investissement_old.TabStop = false;
+ this.txt_investissement_old.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+ //
+ // txt_impotRevenu_old
+ //
+ this.txt_impotRevenu_old.Enabled = false;
+ this.txt_impotRevenu_old.Font = new System.Drawing.Font("Cambria", 15.70909F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.txt_impotRevenu_old.Location = new System.Drawing.Point(338, 304);
+ this.txt_impotRevenu_old.Multiline = true;
+ this.txt_impotRevenu_old.Name = "txt_impotRevenu_old";
+ this.txt_impotRevenu_old.Size = new System.Drawing.Size(89, 40);
+ this.txt_impotRevenu_old.TabIndex = 130;
+ this.txt_impotRevenu_old.TabStop = false;
+ this.txt_impotRevenu_old.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+ //
+ // txt_impotRevenu_new
+ //
+ this.txt_impotRevenu_new.Enabled = false;
+ this.txt_impotRevenu_new.Font = new System.Drawing.Font("Cambria", 15.70909F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.txt_impotRevenu_new.Location = new System.Drawing.Point(312, 299);
+ this.txt_impotRevenu_new.Multiline = true;
+ this.txt_impotRevenu_new.Name = "txt_impotRevenu_new";
+ this.txt_impotRevenu_new.Size = new System.Drawing.Size(89, 40);
+ this.txt_impotRevenu_new.TabIndex = 156;
+ this.txt_impotRevenu_new.TabStop = false;
+ this.txt_impotRevenu_new.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+ //
+ // txt_investissement_new
+ //
+ this.txt_investissement_new.Enabled = false;
+ this.txt_investissement_new.Font = new System.Drawing.Font("Cambria", 15.70909F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.txt_investissement_new.Location = new System.Drawing.Point(312, 250);
+ this.txt_investissement_new.Multiline = true;
+ this.txt_investissement_new.Name = "txt_investissement_new";
+ this.txt_investissement_new.Size = new System.Drawing.Size(89, 40);
+ this.txt_investissement_new.TabIndex = 155;
+ this.txt_investissement_new.TabStop = false;
+ this.txt_investissement_new.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+ //
+ // txt_consommation_new
+ //
+ this.txt_consommation_new.Enabled = false;
+ this.txt_consommation_new.Font = new System.Drawing.Font("Cambria", 15.70909F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.txt_consommation_new.Location = new System.Drawing.Point(312, 201);
+ this.txt_consommation_new.Multiline = true;
+ this.txt_consommation_new.Name = "txt_consommation_new";
+ this.txt_consommation_new.Size = new System.Drawing.Size(89, 40);
+ this.txt_consommation_new.TabIndex = 154;
+ this.txt_consommation_new.TabStop = false;
+ this.txt_consommation_new.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+ //
+ // txt_pib_new
+ //
+ this.txt_pib_new.Enabled = false;
+ this.txt_pib_new.Font = new System.Drawing.Font("Cambria", 15.70909F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.txt_pib_new.Location = new System.Drawing.Point(312, 152);
+ this.txt_pib_new.Multiline = true;
+ this.txt_pib_new.Name = "txt_pib_new";
+ this.txt_pib_new.Size = new System.Drawing.Size(89, 40);
+ this.txt_pib_new.TabIndex = 153;
+ this.txt_pib_new.TabStop = false;
+ this.txt_pib_new.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+ //
+ // txt_export_new
+ //
+ this.txt_export_new.Enabled = false;
+ this.txt_export_new.Font = new System.Drawing.Font("Cambria", 15.70909F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.txt_export_new.Location = new System.Drawing.Point(312, 103);
+ this.txt_export_new.Multiline = true;
+ this.txt_export_new.Name = "txt_export_new";
+ this.txt_export_new.Size = new System.Drawing.Size(89, 40);
+ this.txt_export_new.TabIndex = 152;
+ this.txt_export_new.TabStop = false;
+ this.txt_export_new.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+ //
+ // txt_recettes_new
+ //
+ this.txt_recettes_new.Enabled = false;
+ this.txt_recettes_new.Font = new System.Drawing.Font("Cambria", 15.70909F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.txt_recettes_new.Location = new System.Drawing.Point(312, 349);
+ this.txt_recettes_new.Multiline = true;
+ this.txt_recettes_new.Name = "txt_recettes_new";
+ this.txt_recettes_new.Size = new System.Drawing.Size(89, 40);
+ this.txt_recettes_new.TabIndex = 151;
+ this.txt_recettes_new.TabStop = false;
+ this.txt_recettes_new.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+ //
+ // txt_depenses_new
+ //
+ this.txt_depenses_new.Enabled = false;
+ this.txt_depenses_new.Font = new System.Drawing.Font("Cambria", 15.70909F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.txt_depenses_new.Location = new System.Drawing.Point(312, 398);
+ this.txt_depenses_new.Multiline = true;
+ this.txt_depenses_new.Name = "txt_depenses_new";
+ this.txt_depenses_new.Size = new System.Drawing.Size(89, 40);
+ this.txt_depenses_new.TabIndex = 150;
+ this.txt_depenses_new.TabStop = false;
+ this.txt_depenses_new.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+ //
+ // textBox20
+ //
+ this.textBox20.Enabled = false;
+ this.textBox20.Font = new System.Drawing.Font("Cambria", 15.70909F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.textBox20.Location = new System.Drawing.Point(312, 447);
+ this.textBox20.Multiline = true;
+ this.textBox20.Name = "textBox20";
+ this.textBox20.Size = new System.Drawing.Size(89, 40);
+ this.textBox20.TabIndex = 149;
+ this.textBox20.TabStop = false;
+ this.textBox20.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+ //
+ // txt_soldeBudgetaire_new
+ //
+ this.txt_soldeBudgetaire_new.Enabled = false;
+ this.txt_soldeBudgetaire_new.Font = new System.Drawing.Font("Cambria", 15.70909F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.txt_soldeBudgetaire_new.Location = new System.Drawing.Point(312, 496);
+ this.txt_soldeBudgetaire_new.Multiline = true;
+ this.txt_soldeBudgetaire_new.Name = "txt_soldeBudgetaire_new";
+ this.txt_soldeBudgetaire_new.Size = new System.Drawing.Size(89, 40);
+ this.txt_soldeBudgetaire_new.TabIndex = 148;
+ this.txt_soldeBudgetaire_new.TabStop = false;
+ this.txt_soldeBudgetaire_new.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+ //
+ // textBox22
+ //
+ this.textBox22.Enabled = false;
+ this.textBox22.Font = new System.Drawing.Font("Cambria", 15.70909F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.textBox22.Location = new System.Drawing.Point(312, 545);
+ this.textBox22.Multiline = true;
+ this.textBox22.Name = "textBox22";
+ this.textBox22.Size = new System.Drawing.Size(89, 40);
+ this.textBox22.TabIndex = 147;
+ this.textBox22.TabStop = false;
+ this.textBox22.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+ //
+ // txt_impotSociete_new
+ //
+ this.txt_impotSociete_new.Enabled = false;
+ this.txt_impotSociete_new.Font = new System.Drawing.Font("Cambria", 15.70909F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.txt_impotSociete_new.Location = new System.Drawing.Point(312, 594);
+ this.txt_impotSociete_new.Multiline = true;
+ this.txt_impotSociete_new.Name = "txt_impotSociete_new";
+ this.txt_impotSociete_new.Size = new System.Drawing.Size(89, 40);
+ this.txt_impotSociete_new.TabIndex = 146;
+ this.txt_impotSociete_new.TabStop = false;
+ this.txt_impotSociete_new.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12.25F);
+ this.label1.Location = new System.Drawing.Point(60, 601);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(124, 24);
+ this.label1.TabIndex = 145;
+ this.label1.Text = "Impôt Société";
+ //
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 12.25F);
+ this.label2.Location = new System.Drawing.Point(60, 356);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(172, 24);
+ this.label2.TabIndex = 144;
+ this.label2.Text = "Recettes Publiques";
+ //
+ // label3
+ //
+ this.label3.AutoSize = true;
+ this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 12.25F);
+ this.label3.Location = new System.Drawing.Point(60, 454);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(155, 24);
+ this.label3.TabIndex = 143;
+ this.label3.Text = "Population Active";
+ //
+ // label4
+ //
+ this.label4.AutoSize = true;
+ this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 12.25F);
+ this.label4.Location = new System.Drawing.Point(60, 405);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(185, 24);
+ this.label4.TabIndex = 142;
+ this.label4.Text = "Dépenses Publiques";
+ //
+ // label5
+ //
+ this.label5.AutoSize = true;
+ this.label5.Font = new System.Drawing.Font("Microsoft Sans Serif", 12.25F);
+ this.label5.Location = new System.Drawing.Point(60, 503);
+ this.label5.Name = "label5";
+ this.label5.Size = new System.Drawing.Size(155, 24);
+ this.label5.TabIndex = 141;
+ this.label5.Text = "Solde Budgétaire";
+ //
+ // label6
+ //
+ this.label6.AutoSize = true;
+ this.label6.Font = new System.Drawing.Font("Microsoft Sans Serif", 12.25F);
+ this.label6.Location = new System.Drawing.Point(60, 552);
+ this.label6.Name = "label6";
+ this.label6.Size = new System.Drawing.Size(168, 24);
+ this.label6.TabIndex = 140;
+ this.label6.Text = "Taux de Chômage";
+ //
+ // txt_import_new
+ //
+ this.txt_import_new.Enabled = false;
+ this.txt_import_new.Font = new System.Drawing.Font("Cambria", 15.70909F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.txt_import_new.Location = new System.Drawing.Point(312, 54);
+ this.txt_import_new.Multiline = true;
+ this.txt_import_new.Name = "txt_import_new";
+ this.txt_import_new.Size = new System.Drawing.Size(89, 40);
+ this.txt_import_new.TabIndex = 139;
+ this.txt_import_new.TabStop = false;
+ this.txt_import_new.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+ //
+ // textBox25
+ //
+ this.textBox25.Enabled = false;
+ this.textBox25.Font = new System.Drawing.Font("Cambria", 15.70909F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.textBox25.Location = new System.Drawing.Point(312, 642);
+ this.textBox25.Multiline = true;
+ this.textBox25.Name = "textBox25";
+ this.textBox25.Size = new System.Drawing.Size(89, 40);
+ this.textBox25.TabIndex = 138;
+ this.textBox25.TabStop = false;
+ this.textBox25.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
+ //
+ // label7
+ //
+ this.label7.AutoSize = true;
+ this.label7.Font = new System.Drawing.Font("Microsoft Sans Serif", 12.25F);
+ this.label7.Location = new System.Drawing.Point(57, 110);
+ this.label7.Name = "label7";
+ this.label7.Size = new System.Drawing.Size(65, 24);
+ this.label7.TabIndex = 137;
+ this.label7.Text = "Export";
+ //
+ // label8
+ //
+ this.label8.AutoSize = true;
+ this.label8.Font = new System.Drawing.Font("Microsoft Sans Serif", 12.25F);
+ this.label8.Location = new System.Drawing.Point(60, 159);
+ this.label8.Name = "label8";
+ this.label8.Size = new System.Drawing.Size(38, 24);
+ this.label8.TabIndex = 136;
+ this.label8.Text = "PIB";
+ //
+ // label9
+ //
+ this.label9.AutoSize = true;
+ this.label9.Font = new System.Drawing.Font("Microsoft Sans Serif", 12.25F);
+ this.label9.Location = new System.Drawing.Point(60, 208);
+ this.label9.Name = "label9";
+ this.label9.Size = new System.Drawing.Size(137, 24);
+ this.label9.TabIndex = 135;
+ this.label9.Text = "Consommation";
+ //
+ // label10
+ //
+ this.label10.AutoSize = true;
+ this.label10.Font = new System.Drawing.Font("Microsoft Sans Serif", 12.25F);
+ this.label10.Location = new System.Drawing.Point(60, 306);
+ this.label10.Name = "label10";
+ this.label10.Size = new System.Drawing.Size(127, 24);
+ this.label10.TabIndex = 134;
+ this.label10.Text = "Impôt Revenu";
+ //
+ // label11
+ //
+ this.label11.AutoSize = true;
+ this.label11.Font = new System.Drawing.Font("Microsoft Sans Serif", 12.25F);
+ this.label11.Location = new System.Drawing.Point(60, 257);
+ this.label11.Name = "label11";
+ this.label11.Size = new System.Drawing.Size(133, 24);
+ this.label11.TabIndex = 133;
+ this.label11.Text = "Investissement";
+ //
+ // label12
+ //
+ this.label12.AutoSize = true;
+ this.label12.Font = new System.Drawing.Font("Microsoft Sans Serif", 12.25F);
+ this.label12.Location = new System.Drawing.Point(60, 649);
+ this.label12.Name = "label12";
+ this.label12.Size = new System.Drawing.Size(117, 24);
+ this.label12.TabIndex = 132;
+ this.label12.Text = "Endettement";
+ //
+ // label13
+ //
+ this.label13.AutoSize = true;
+ this.label13.Font = new System.Drawing.Font("Microsoft Sans Serif", 12.25F);
+ this.label13.Location = new System.Drawing.Point(57, 61);
+ this.label13.Name = "label13";
+ this.label13.Size = new System.Drawing.Size(62, 24);
+ this.label13.TabIndex = 131;
+ this.label13.Text = "Import";
+ //
+ // lbl_oldPeriode
+ //
+ this.lbl_oldPeriode.AutoSize = true;
+ this.lbl_oldPeriode.Font = new System.Drawing.Font("Microsoft Sans Serif", 12.25F);
+ this.lbl_oldPeriode.Location = new System.Drawing.Point(209, 7);
+ this.lbl_oldPeriode.Name = "lbl_oldPeriode";
+ this.lbl_oldPeriode.Size = new System.Drawing.Size(108, 24);
+ this.lbl_oldPeriode.TabIndex = 157;
+ this.lbl_oldPeriode.Text = "Période n-1";
+ //
+ // lbl_newPeriode
+ //
+ this.lbl_newPeriode.AutoSize = true;
+ this.lbl_newPeriode.Font = new System.Drawing.Font("Microsoft Sans Serif", 12.25F);
+ this.lbl_newPeriode.Location = new System.Drawing.Point(230, 7);
+ this.lbl_newPeriode.Name = "lbl_newPeriode";
+ this.lbl_newPeriode.Size = new System.Drawing.Size(92, 24);
+ this.lbl_newPeriode.TabIndex = 158;
+ this.lbl_newPeriode.Text = "Période n";
+ //
+ // groupBox1
+ //
+ this.groupBox1.Controls.Add(this.lbl_oldPeriode);
+ this.groupBox1.Controls.Add(this.txt_impotRevenu_old);
+ this.groupBox1.Controls.Add(this.txt_investissement_old);
+ this.groupBox1.Controls.Add(this.txt_consommation_old);
+ this.groupBox1.Controls.Add(this.txt_pib_old);
+ this.groupBox1.Controls.Add(this.txt_export_old);
+ this.groupBox1.Controls.Add(this.txt_recettes_old);
+ this.groupBox1.Controls.Add(this.txt_depenses_old);
+ this.groupBox1.Controls.Add(this.txt_popActive_old);
+ this.groupBox1.Controls.Add(this.txt_soldeBudgetaire_old);
+ this.groupBox1.Controls.Add(this.txt_chomage_old);
+ this.groupBox1.Controls.Add(this.txt_impotSociete_old);
+ this.groupBox1.Controls.Add(this.lblImpotSociete);
+ this.groupBox1.Controls.Add(this.lblRecette);
+ this.groupBox1.Controls.Add(this.lblPop);
+ this.groupBox1.Controls.Add(this.lblDepensesPub);
+ this.groupBox1.Controls.Add(this.lblSolde);
+ this.groupBox1.Controls.Add(this.lblChomage);
+ this.groupBox1.Controls.Add(this.txt_import_old);
+ this.groupBox1.Controls.Add(this.txt_endettement_old);
+ this.groupBox1.Controls.Add(this.lblExport);
+ this.groupBox1.Controls.Add(this.lblPIB);
+ this.groupBox1.Controls.Add(this.lblConso);
+ this.groupBox1.Controls.Add(this.lblImportRevenu);
+ this.groupBox1.Controls.Add(this.lblInvestissement);
+ this.groupBox1.Controls.Add(this.lblEndettement);
+ this.groupBox1.Controls.Add(this.lblImport);
+ this.groupBox1.Location = new System.Drawing.Point(43, 8);
+ this.groupBox1.Name = "groupBox1";
+ this.groupBox1.Size = new System.Drawing.Size(551, 700);
+ this.groupBox1.TabIndex = 159;
+ this.groupBox1.TabStop = false;
+ //
+ // groupBox2
+ //
+ this.groupBox2.Controls.Add(this.lbl_newPeriode);
+ this.groupBox2.Controls.Add(this.txt_impotRevenu_new);
+ this.groupBox2.Controls.Add(this.txt_investissement_new);
+ this.groupBox2.Controls.Add(this.txt_consommation_new);
+ this.groupBox2.Controls.Add(this.txt_pib_new);
+ this.groupBox2.Controls.Add(this.txt_export_new);
+ this.groupBox2.Controls.Add(this.txt_recettes_new);
+ this.groupBox2.Controls.Add(this.txt_depenses_new);
+ this.groupBox2.Controls.Add(this.textBox20);
+ this.groupBox2.Controls.Add(this.txt_soldeBudgetaire_new);
+ this.groupBox2.Controls.Add(this.textBox22);
+ this.groupBox2.Controls.Add(this.txt_impotSociete_new);
+ this.groupBox2.Controls.Add(this.label1);
+ this.groupBox2.Controls.Add(this.label2);
+ this.groupBox2.Controls.Add(this.label3);
+ this.groupBox2.Controls.Add(this.label4);
+ this.groupBox2.Controls.Add(this.label5);
+ this.groupBox2.Controls.Add(this.label6);
+ this.groupBox2.Controls.Add(this.txt_import_new);
+ this.groupBox2.Controls.Add(this.textBox25);
+ this.groupBox2.Controls.Add(this.label7);
+ this.groupBox2.Controls.Add(this.label8);
+ this.groupBox2.Controls.Add(this.label9);
+ this.groupBox2.Controls.Add(this.label10);
+ this.groupBox2.Controls.Add(this.label11);
+ this.groupBox2.Controls.Add(this.label12);
+ this.groupBox2.Controls.Add(this.label13);
+ this.groupBox2.Location = new System.Drawing.Point(652, 8);
+ this.groupBox2.Name = "groupBox2";
+ this.groupBox2.Size = new System.Drawing.Size(551, 700);
+ this.groupBox2.TabIndex = 160;
+ this.groupBox2.TabStop = false;
+ //
// UC_Bilan
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.Controls.Add(this.groupBox2);
+ this.Controls.Add(this.groupBox1);
this.Controls.Add(this.btnSuite);
this.Name = "UC_Bilan";
- this.Size = new System.Drawing.Size(1280, 800);
+ this.Size = new System.Drawing.Size(1262, 756);
+ this.Load += new System.EventHandler(this.UC_Bilan_Load_1);
+ this.groupBox1.ResumeLayout(false);
+ this.groupBox1.PerformLayout();
+ this.groupBox2.ResumeLayout(false);
+ this.groupBox2.PerformLayout();
this.ResumeLayout(false);
}
@@ -55,5 +782,61 @@
#endregion
private System.Windows.Forms.Button btnSuite;
+ private System.Windows.Forms.Label lblExport;
+ private System.Windows.Forms.Label lblPIB;
+ private System.Windows.Forms.Label lblConso;
+ private System.Windows.Forms.Label lblImportRevenu;
+ private System.Windows.Forms.Label lblInvestissement;
+ private System.Windows.Forms.Label lblEndettement;
+ private System.Windows.Forms.Label lblImport;
+ private System.Windows.Forms.TextBox txt_endettement_old;
+ private System.Windows.Forms.TextBox txt_import_old;
+ private System.Windows.Forms.Label lblImpotSociete;
+ private System.Windows.Forms.Label lblRecette;
+ private System.Windows.Forms.Label lblPop;
+ private System.Windows.Forms.Label lblDepensesPub;
+ private System.Windows.Forms.Label lblSolde;
+ private System.Windows.Forms.Label lblChomage;
+ private System.Windows.Forms.TextBox txt_impotSociete_old;
+ private System.Windows.Forms.TextBox txt_chomage_old;
+ private System.Windows.Forms.TextBox txt_soldeBudgetaire_old;
+ private System.Windows.Forms.TextBox txt_popActive_old;
+ private System.Windows.Forms.TextBox txt_depenses_old;
+ private System.Windows.Forms.TextBox txt_recettes_old;
+ private System.Windows.Forms.TextBox txt_export_old;
+ private System.Windows.Forms.TextBox txt_pib_old;
+ private System.Windows.Forms.TextBox txt_consommation_old;
+ private System.Windows.Forms.TextBox txt_investissement_old;
+ private System.Windows.Forms.TextBox txt_impotRevenu_old;
+ private System.Windows.Forms.TextBox txt_impotRevenu_new;
+ private System.Windows.Forms.TextBox txt_investissement_new;
+ private System.Windows.Forms.TextBox txt_consommation_new;
+ private System.Windows.Forms.TextBox txt_pib_new;
+ private System.Windows.Forms.TextBox txt_export_new;
+ private System.Windows.Forms.TextBox txt_recettes_new;
+ private System.Windows.Forms.TextBox txt_depenses_new;
+ private System.Windows.Forms.TextBox textBox20;
+ private System.Windows.Forms.TextBox txt_soldeBudgetaire_new;
+ private System.Windows.Forms.TextBox textBox22;
+ private System.Windows.Forms.TextBox txt_impotSociete_new;
+ private System.Windows.Forms.Label label1;
+ private System.Windows.Forms.Label label2;
+ private System.Windows.Forms.Label label3;
+ private System.Windows.Forms.Label label4;
+ private System.Windows.Forms.Label label5;
+ private System.Windows.Forms.Label label6;
+ private System.Windows.Forms.TextBox txt_import_new;
+ private System.Windows.Forms.TextBox textBox25;
+ private System.Windows.Forms.Label label7;
+ private System.Windows.Forms.Label label8;
+ private System.Windows.Forms.Label label9;
+ private System.Windows.Forms.Label label10;
+ private System.Windows.Forms.Label label11;
+ private System.Windows.Forms.Label label12;
+ private System.Windows.Forms.Label label13;
+ private System.Windows.Forms.Label lbl_oldPeriode;
+ private System.Windows.Forms.Label lbl_newPeriode;
+ private System.Windows.Forms.GroupBox groupBox1;
+ private System.Windows.Forms.GroupBox groupBox2;
}
}
diff --git a/Arti4/Arti4/UserControls/UC_Bilan.cs b/Arti4/Arti4/UserControls/UC_Bilan.cs
index fa4552753f2880debe1b0dc6fb1044a89a4497e4..bea710c5007ad93849b8b8639ff7aec48232f771 100644
--- a/Arti4/Arti4/UserControls/UC_Bilan.cs
+++ b/Arti4/Arti4/UserControls/UC_Bilan.cs
@@ -7,6 +7,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
+using Arti4.Models;
namespace Arti4
{
@@ -19,14 +20,52 @@ namespace Arti4
this.form_main = form_main;
}
- private void UC_Bilan_Load(object sender, EventArgs e)
+ private void btnSuite_Click(object sender, EventArgs e)
{
+ if (Partie.Instance.GetPeriodes().Count == 6)
+ {
+ Formulaires.FORM_Bilan bilan = new Formulaires.FORM_Bilan();
+ bilan.ShowDialog();
+ }
+ else
+ {
+ UC_Jeu jeu = new UC_Jeu(form_main);
+ form_main.CollerUC(jeu);
+ }
}
- private void btnSuite_Click(object sender, EventArgs e)
+ private void UC_Bilan_Load_1(object sender, EventArgs e)
{
- UC_Jeu jeu = new UC_Jeu(form_main);
- form_main.CollerUC(jeu);
+ Periode oldP = Partie.Instance.GetCurrentPeriode();
+ Periode newP = Partie.Instance.next();
+
+ if (newP == null)
+ return;
+ lbl_newPeriode.Text = "Période " + (Partie.Instance.GetPeriodes().Count - 1);
+ lbl_oldPeriode.Text = "Période " + (Partie.Instance.GetPeriodes().Count - 2);
+
+ this.txt_consommation_old.Text = oldP.Consommation.ToString();
+ this.txt_depenses_old.Text = oldP.DepensePublique.ToString();
+ this.txt_export_old.Text = oldP.Export.ToString();
+ this.txt_import_old.Text = oldP.Import.ToString();
+ this.txt_impotRevenu_old.Text = (oldP.ImpotRevenu*100).ToString() + "%";
+ this.txt_impotSociete_old.Text = (oldP.ImpotSociete * 100).ToString() + "%";
+ this.txt_investissement_old.Text = oldP.Investissement.ToString();
+ this.txt_pib_old.Text = oldP.PIB.ToString();
+ this.txt_recettes_old.Text = oldP.RecettePublique.ToString();
+ this.txt_soldeBudgetaire_old.Text = (oldP.RecettePublique - oldP.DepensePublique).ToString();
+
+ this.txt_consommation_new.Text = newP.Consommation.ToString();
+ this.txt_depenses_new.Text = newP.DepensePublique.ToString();
+ this.txt_export_new.Text = newP.Export.ToString();
+ this.txt_import_new.Text = newP.Import.ToString();
+ this.txt_impotRevenu_new.Text = (newP.ImpotRevenu*100).ToString() + "%";
+ this.txt_impotSociete_new.Text = (newP.ImpotSociete*100).ToString() + "%";
+ this.txt_investissement_new.Text = newP.Investissement.ToString();
+ this.txt_pib_new.Text = newP.PIB.ToString();
+ this.txt_recettes_new.Text = newP.RecettePublique.ToString();
+ this.txt_soldeBudgetaire_new.Text = (newP.RecettePublique - newP.DepensePublique).ToString();
+
}
}
}
diff --git a/Arti4/Arti4/UserControls/UC_Jeu.Designer.cs b/Arti4/Arti4/UserControls/UC_Jeu.Designer.cs
index 0b8da5f1bf99e34af09b596b1175c164e7a5387b..78e55b093b6eccf4494d2f9e9f8839053db9149e 100644
--- a/Arti4/Arti4/UserControls/UC_Jeu.Designer.cs
+++ b/Arti4/Arti4/UserControls/UC_Jeu.Designer.cs
@@ -30,18 +30,15 @@
{
this.btnRecettesPub = new System.Windows.Forms.Button();
this.btnDepensesPub = new System.Windows.Forms.Button();
- this.btnEmplois = new System.Windows.Forms.Button();
- this.btnBanque = new System.Windows.Forms.Button();
this.btnAccepter = new System.Windows.Forms.Button();
this.choix_container = new System.Windows.Forms.Panel();
- this.btnAutres = new System.Windows.Forms.Button();
this.vertSeparator1 = new VertSeparator();
this.uC_ToolBar1 = new Arti4.UserControls.Jeu.Toolbar.UC_ToolBar();
this.SuspendLayout();
//
// btnRecettesPub
//
- this.btnRecettesPub.Location = new System.Drawing.Point(11, 254);
+ this.btnRecettesPub.Location = new System.Drawing.Point(11, 330);
this.btnRecettesPub.Name = "btnRecettesPub";
this.btnRecettesPub.Size = new System.Drawing.Size(147, 64);
this.btnRecettesPub.TabIndex = 0;
@@ -51,7 +48,7 @@
//
// btnDepensesPub
//
- this.btnDepensesPub.Location = new System.Drawing.Point(11, 333);
+ this.btnDepensesPub.Location = new System.Drawing.Point(11, 409);
this.btnDepensesPub.Name = "btnDepensesPub";
this.btnDepensesPub.Size = new System.Drawing.Size(149, 64);
this.btnDepensesPub.TabIndex = 1;
@@ -59,33 +56,13 @@
this.btnDepensesPub.UseVisualStyleBackColor = true;
this.btnDepensesPub.Click += new System.EventHandler(this.btnChoix2_Click);
//
- // btnEmplois
- //
- this.btnEmplois.Location = new System.Drawing.Point(11, 413);
- this.btnEmplois.Name = "btnEmplois";
- this.btnEmplois.Size = new System.Drawing.Size(149, 64);
- this.btnEmplois.TabIndex = 2;
- this.btnEmplois.Text = "Emplois";
- this.btnEmplois.UseVisualStyleBackColor = true;
- this.btnEmplois.Click += new System.EventHandler(this.btnChoix3_Click);
- //
- // btnBanque
- //
- this.btnBanque.Location = new System.Drawing.Point(11, 493);
- this.btnBanque.Name = "btnBanque";
- this.btnBanque.Size = new System.Drawing.Size(149, 64);
- this.btnBanque.TabIndex = 3;
- this.btnBanque.Text = "Banque";
- this.btnBanque.UseVisualStyleBackColor = true;
- this.btnBanque.Click += new System.EventHandler(this.btnChoix4_Click);
- //
// btnAccepter
//
- this.btnAccepter.Location = new System.Drawing.Point(29, 642);
+ this.btnAccepter.Location = new System.Drawing.Point(29, 599);
this.btnAccepter.Name = "btnAccepter";
this.btnAccepter.Size = new System.Drawing.Size(106, 33);
this.btnAccepter.TabIndex = 5;
- this.btnAccepter.Text = "Accepter";
+ this.btnAccepter.Text = "Valider";
this.btnAccepter.UseVisualStyleBackColor = true;
this.btnAccepter.Click += new System.EventHandler(this.btnAccepter_Click);
//
@@ -96,15 +73,6 @@
this.choix_container.Size = new System.Drawing.Size(1104, 692);
this.choix_container.TabIndex = 4;
//
- // btnAutres
- //
- this.btnAutres.Location = new System.Drawing.Point(11, 572);
- this.btnAutres.Name = "btnAutres";
- this.btnAutres.Size = new System.Drawing.Size(149, 64);
- this.btnAutres.TabIndex = 6;
- this.btnAutres.Text = "Autres";
- this.btnAutres.UseVisualStyleBackColor = true;
- //
// vertSeparator1
//
this.vertSeparator1.AlignLine = VertSeparator.Anc.Right;
@@ -128,12 +96,9 @@
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.uC_ToolBar1);
- this.Controls.Add(this.btnAutres);
this.Controls.Add(this.vertSeparator1);
this.Controls.Add(this.btnAccepter);
this.Controls.Add(this.choix_container);
- this.Controls.Add(this.btnBanque);
- this.Controls.Add(this.btnEmplois);
this.Controls.Add(this.btnDepensesPub);
this.Controls.Add(this.btnRecettesPub);
this.Name = "UC_Jeu";
@@ -147,12 +112,9 @@
private System.Windows.Forms.Button btnRecettesPub;
private System.Windows.Forms.Button btnDepensesPub;
- private System.Windows.Forms.Button btnEmplois;
- private System.Windows.Forms.Button btnBanque;
private System.Windows.Forms.Panel choix_container;
private VertSeparator vertSeparator1;
- private System.Windows.Forms.Button btnAutres;
private System.Windows.Forms.Button btnAccepter;
private UserControls.Jeu.Toolbar.UC_ToolBar uC_ToolBar1;
diff --git a/Arti4/Arti4/UserControls/UC_Menu.Designer.cs b/Arti4/Arti4/UserControls/UC_Menu.Designer.cs
index 15fcc56bf9900dd93bf1df70c9f630f479df9e84..38d7f7c2c2251b5f117d2c367fa8e318c7cd5b32 100644
--- a/Arti4/Arti4/UserControls/UC_Menu.Designer.cs
+++ b/Arti4/Arti4/UserControls/UC_Menu.Designer.cs
@@ -37,7 +37,7 @@
// btnJeu
//
this.btnJeu.Font = new System.Drawing.Font("Segoe Print", 28.14545F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.btnJeu.Location = new System.Drawing.Point(337, 321);
+ this.btnJeu.Location = new System.Drawing.Point(337, 403);
this.btnJeu.Name = "btnJeu";
this.btnJeu.Size = new System.Drawing.Size(613, 83);
this.btnJeu.TabIndex = 0;
@@ -48,7 +48,7 @@
// btnQuitter
//
this.btnQuitter.Font = new System.Drawing.Font("Segoe Print", 28.14545F);
- this.btnQuitter.Location = new System.Drawing.Point(337, 430);
+ this.btnQuitter.Location = new System.Drawing.Point(337, 537);
this.btnQuitter.Name = "btnQuitter";
this.btnQuitter.Size = new System.Drawing.Size(613, 83);
this.btnQuitter.TabIndex = 1;
@@ -63,7 +63,7 @@
this.pictureBox1.Image = global::Arti4.Properties.Resources.articaspacito;
this.pictureBox1.Location = new System.Drawing.Point(0, 0);
this.pictureBox1.Name = "pictureBox1";
- this.pictureBox1.Size = new System.Drawing.Size(1280, 271);
+ this.pictureBox1.Size = new System.Drawing.Size(1280, 295);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.pictureBox1.TabIndex = 2;
this.pictureBox1.TabStop = false;
diff --git a/Arti4/Arti4/UserControls/UC_Scenario.Designer.cs b/Arti4/Arti4/UserControls/UC_Scenario.Designer.cs
index bed6709739aa95cc5e029feb4ac6a772af2b1d4e..e87aa4a9e37f6c4f5b21a9c47d2fc354b610e37d 100644
--- a/Arti4/Arti4/UserControls/UC_Scenario.Designer.cs
+++ b/Arti4/Arti4/UserControls/UC_Scenario.Designer.cs
@@ -41,7 +41,7 @@
this.btnScenar1.Name = "btnScenar1";
this.btnScenar1.Size = new System.Drawing.Size(190, 136);
this.btnScenar1.TabIndex = 0;
- this.btnScenar1.Text = "Scénario Tutoriel";
+ this.btnScenar1.Text = "Tutoriel";
this.btnScenar1.UseVisualStyleBackColor = true;
this.btnScenar1.Click += new System.EventHandler(this.btnScenar1_Click);
//
@@ -51,7 +51,7 @@
this.btnScenar2.Name = "btnScenar2";
this.btnScenar2.Size = new System.Drawing.Size(190, 136);
this.btnScenar2.TabIndex = 1;
- this.btnScenar2.Text = "Scénario 2";
+ this.btnScenar2.Text = "Scénario 1";
this.btnScenar2.UseVisualStyleBackColor = true;
this.btnScenar2.Click += new System.EventHandler(this.btnScenar2_Click);
//
@@ -61,7 +61,7 @@
this.btnScenar3.Name = "btnScenar3";
this.btnScenar3.Size = new System.Drawing.Size(190, 136);
this.btnScenar3.TabIndex = 2;
- this.btnScenar3.Text = "Scénario 3";
+ this.btnScenar3.Text = "Scénario 2";
this.btnScenar3.UseVisualStyleBackColor = true;
this.btnScenar3.Click += new System.EventHandler(this.btnScenar3_Click);
//
diff --git a/Lexique.md b/Lexique.md
new file mode 100644
index 0000000000000000000000000000000000000000..8be00765107a4e090eafc0bbd5d6ce46591caa30
--- /dev/null
+++ b/Lexique.md
@@ -0,0 +1,85 @@
+
+
+---
+
+# Documentation complémentaire
+
+---
+## Lexique
+
+**Balance Commerciale** : La balance commerciale retrace les entrées et sorties de biens ainsi que les revenus tirés des opérations de ventes et d’achat de marchandises réalisées par des entreprises hors du territoire national
+=> *BC = X - M = exports - imports*
+
+**Chômage** : Le Bureau International du Travail (*BIT*) retient trois critères pour définir le chômage :
+- être sans emploi,
+- être disponible pour en obtenir un,
+- et en chercher
+
+**Consommation** : Consommer, c’est utiliser une partie des ressources pour satisfaire des besoins, ou participer à l’activité de production.
+
+**Croissance** : Le taux de croissance exprime la variation du PIB d’une année à l’autre.
+
+**Déficit** : Le déficit *budgétaire* résulte, dans le budget de l’Etat, de l’excédent des dépenses sur les recettes du budget de la nation.
+Le déficit *social* est celui de l’excédent des dépenses des administrations publiques (caisses de chômage, retraite, sécurité sociale) et des collectivités territoriales.
+Le *déficit public annuel* ne doit pas dépasser 3% du PIB.
+=> *déficit public = déficit budgétaire + déficit social*
+
+**Dette** : Correspond aux emprunts extérieurs du pays.
+
+**Dépenses publiques** : Toutes les dépenses financées par l’Etat. Elles regroupent les prestations sociales, les subventions aux entreprises et l’investissement public.
+
+**Dépression** : Plus de croissance du tout.
+
+**Désinflation** : Baisse généralisée des prix. Elle peut venir d’une politique de rigueur ou encore de la forte baisse des prix des valeurs premières.
+
+**Exportations** : Les exportations sont des biens neufs ou existants, qui, à titre onéreux ou gratuit, *sortent* définitivement du territoire national en direction du reste du monde.
+
+**Indice de la monnaie** : Valeur de la monnaie nationale par rapport aux autres devises. Elle va baisser si les marchés n’ont pas confiance en elle.
+
+**Importations** : Les importations sont des biens neufs ou existants, qui, à titre onéreux ou gratuit, *entrent* définitivement sur le territoire national en provenance du reste du monde.
+
+**Inflation** : L’inflation c’est la hausse généralisée et durable des prix. *Le taux d’inflation* mesure cette hausse. L’inflation peut venir d’une demande plus importante que l’offre, ou d’une création monétaire excessive. Elle peut aussi être le résultat de coûts de production plus importants (salaires, matières premières…) que les gains de productivité. Les entreprises augmentent alors leur prix pour maintenir leurs marges.
+
+**Investissement** : Il existe une forte corrélation entre le taux d’investissement et la croissance économique. Un très fort investissement va impliquer une hausse de la croissance.
+
+**Loi psychologique fondamentale** : Loi établie par *Keynes* montrant que la consommation augmente avec le revenu (sans proportionnalité). En revanche, la consommation va diminuer lorsque l’épargne augmente.
+
+**Revenu global** : R = (1/1-a) x I
+a => propension marginale à consommer (environ 0.8)
+I => investissement
+
+**Population active** : La population active est le nombre de personnes qui ont un emploi ou qui sont à la recherche d’un emploi rémunéré.
+
+**PIB** : Le PIB mesure la valeur des biens et des services produits sur le territoire national durant une année.
+
+**Revenu par habitant** : Par simplification, le revenu par habitant est équivalent au PIB par habitant.
+=> *revenu par habitant = PIB/population totale*
+
+**Récession** : Ralentissement de la croissance (de 5% à 2% par exemple).
+
+**Taux d’intérêt** : Arbitrage entre l’offre et la demande de monnaie. Une hausse permet d’attirer des capitaux et améliorer l’indice de la monnaie.
+
+**Taux de change** : Le taux de change exprime le taux de convertibilité d’une monnaie dans une autre monnaie.
+
+**Taux de chômage** : Part de la population active sans emploi. Il est existe un chômage incompressible qui varie en fonction des pays (environ 3% en Europe, 5% aux USA).
+
+---
+
+## Politiques
+
+
+**Conjoncturelle** : Court terme. L’objectif est de lutter contre le chômage et l’inflation.
+
+**Redistribution du revenu** : Vise à réduire les inégalités sociales.
+
+**Structurelle** : Soutien des secteurs jugés prioritaires en modifiant durablement le partage entre le secteur public et le secteur privé.
+
+**Budgétaire** : Stimuler la demande en augmentant les dépenses publiques et donc la consommation, la production et l’emploi. Elle peut permettre d’accélérer ou ralentir la croissance.
+
+**Monétaire** : Elle accompagne souvent une politique budgétaire. Consiste à baisser les taux d’intérêts pour stimuler l’investissement.
+
+**Relance** : L’Etat investit, baisse les impôts ou augmente les revenus ce qui relance l’activité économique :
+- **par l’investissement** : L’économie sera plus compétitive grâce à des entreprises plus performantes. L’augmentation des des exportations et les diminution des importations va améliorer la balance commerciale. Par conséquence, la production va augmenter et le chômage diminuer. Il y aura également une augmentation de l’indice de la monnaie. L’Etat doit alors permettre aux entreprises d’améliorer leur rentabilité en allégeant les charges et en les incitant à investir.
+- **par la consommation** : Relancer la croissance par l’augmentation de la consommation des ménages. Les revenus de ces derniers vont augmenter et augmenter le déficit budgétaire de l’Etat.
+
+**Rigueur** : Réduire les différentes déficits (budgétaire, social et dette extérieure). L’Etat va provoquer une diminution de l’inflation, favoriser les exports et va augmenter la valeur de la monnaie. Implique une *récession* ou une *dépression*. L’économie sera alors plus compétitive avec les autres pays ce qui aura pour conséquence, une revalorisation de l’indice de la monnaie nationale.
\ No newline at end of file