diff --git a/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/DrawningAirplane.cs b/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/DrawningAirplane.cs index 77977e8..9e38a76 100644 --- a/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/DrawningAirplane.cs +++ b/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/DrawningAirplane.cs @@ -54,6 +54,12 @@ namespace ProjectAirplaneWithRadar.DrawningObjects _startPosX = x; _startPosY = y; } + public void ChangeColor(Color col) + { + if (EntityAirplane == null) + return; + EntityAirplane.BodyColor = col; + } public bool CanMove(Direction direction) { if (EntityAirplane == null) diff --git a/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/DrawningAirplaneWithRadar.cs b/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/DrawningAirplaneWithRadar.cs index c0b9176..92df033 100644 --- a/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/DrawningAirplaneWithRadar.cs +++ b/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/DrawningAirplaneWithRadar.cs @@ -20,6 +20,10 @@ namespace ProjectAirplaneWithRadar.DrawningObjects EntityAirplane = new EntityAirplaneWithRadar(speed, weight, bodyColor, additionalColor, radar, dopbak); } } + public void ChangeAddColor(Color col) + { + ((EntityAirplaneWithRadar)EntityAirplane).AdditionalColor = col; + } public override void DrawTransport(Graphics g) { if (EntityAirplane is not EntityAirplaneWithRadar airplaneWithRadar) diff --git a/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/EntityAirplane.cs b/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/EntityAirplane.cs index 0ace7d2..e3f1787 100644 --- a/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/EntityAirplane.cs +++ b/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/EntityAirplane.cs @@ -11,7 +11,7 @@ namespace ProjectAirplaneWithRadar.Entities { public int Speed { get; private set; } public double Weight { get; private set; } - public Color BodyColor { get; private set; } + public Color BodyColor { get; set; } public double Step => (double)Speed * 100 / Weight; public EntityAirplane(int speed, double weight, Color bodyColor) { diff --git a/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/EntityAirplaneWithRadar.cs b/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/EntityAirplaneWithRadar.cs index 28e36f1..dc93954 100644 --- a/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/EntityAirplaneWithRadar.cs +++ b/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/EntityAirplaneWithRadar.cs @@ -9,7 +9,7 @@ namespace ProjectAirplaneWithRadar.Entities { public class EntityAirplaneWithRadar : EntityAirplane { - public Color AdditionalColor { get; private set; } + public Color AdditionalColor { get; set; } public bool Radar { get; private set; } public bool DopBak { get; private set; } public EntityAirplaneWithRadar(int speed, double weight, Color bodyColor, Color additionalColor, bool radar, bool dopbak) : base(speed, weight, bodyColor) diff --git a/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/FormAirplaneConfig.cs b/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/FormAirplaneConfig.cs index f350074..9b47ff3 100644 --- a/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/FormAirplaneConfig.cs +++ b/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/FormAirplaneConfig.cs @@ -70,13 +70,13 @@ namespace ProjectAirplaneWithRadar { case "airplaneLabel": _airplane = new DrawningAirplane((int)numericSpeed.Value, - (int)numericWeight.Value, Color.White, Color.Silver, Color.Black, pictureBox.Width, + (int)numericWeight.Value, Color.Silver, pictureBox.Width, pictureBox.Height); break; case "airplaneWithRadarLabel": _airplane = new DrawningAirplaneWithRadar((int)numericSpeed.Value, - (int)numericWeight.Value, Color.White, Color.Silver, Color.Black, pictureBox.Width, - pictureBox.Height, 4, Color.Silver, checkRadar.Checked, checkDopBak.Checked); + (int)numericWeight.Value, Color.Silver, Color.Black, checkRadar.Checked, checkDopBak.Checked, pictureBox.Width, + pictureBox.Height); break; } colorLabel.BackColor = Color.Empty; diff --git a/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/MonorailDelegate.cs b/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/MonorailDelegate.cs new file mode 100644 index 0000000..30a98d8 --- /dev/null +++ b/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/MonorailDelegate.cs @@ -0,0 +1,12 @@ +using ProjectAirplaneWithRadar.DrawningObjects; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectAirplaneWithRadar +{ + public delegate void AirplaneDelegate(DrawningAirplane airplane); + +}