diff --git a/AirplaneWithRadar/AirplaneWithRadar/DrawningAirplane.cs b/AirplaneWithRadar/AirplaneWithRadar/DrawningAirplane.cs
index f9338bf..fc95e9a 100644
--- a/AirplaneWithRadar/AirplaneWithRadar/DrawningAirplane.cs
+++ b/AirplaneWithRadar/AirplaneWithRadar/DrawningAirplane.cs
@@ -229,6 +229,10 @@ namespace AirplaneWithRadar.DrawningObjects
g.DrawLine(penBlack, new Point(_startPosX + 150, _startPosY + 72), new Point(_startPosX + 150, _startPosY + 55));
g.DrawLine(penBlack, new Point(_startPosX + 150, _startPosY + 72), new Point(_startPosX + 190, _startPosY + 55));
}
+ public void SetBodyColor(Color color)
+ {
+ EntityAirplane.BodyColor = color;
+ }
public void ChangePictureBoxSize(int pictureBoxWidth, int pictureBoxHeight)
{
_pictureWidth = pictureBoxWidth;
diff --git a/AirplaneWithRadar/AirplaneWithRadar/DrawningAirplaneWithRadar.cs b/AirplaneWithRadar/AirplaneWithRadar/DrawningAirplaneWithRadar.cs
index 59b75b9..89e8a80 100644
--- a/AirplaneWithRadar/AirplaneWithRadar/DrawningAirplaneWithRadar.cs
+++ b/AirplaneWithRadar/AirplaneWithRadar/DrawningAirplaneWithRadar.cs
@@ -64,6 +64,10 @@ namespace AirplaneWithRadar.DrawningObjects
g.FillPolygon(additionalBrush, new Point[] { new Point(_startPosX + 115, _startPosY + 65), new Point(_startPosX + 125, _startPosY + 72), new Point(_startPosX + 115, _startPosY + 80) });
}
}
+ public void SetAddColor(Color color)
+ {
+ (EntityAirplane as EntityAirplaneWithRadar).AdditionalColor = color;
+ }
}
}
diff --git a/AirplaneWithRadar/AirplaneWithRadar/EntityAirplane.cs b/AirplaneWithRadar/AirplaneWithRadar/EntityAirplane.cs
index f448c24..ee33478 100644
--- a/AirplaneWithRadar/AirplaneWithRadar/EntityAirplane.cs
+++ b/AirplaneWithRadar/AirplaneWithRadar/EntityAirplane.cs
@@ -22,7 +22,7 @@ namespace AirplaneWithRadar.Entities
///
/// Основной цвет
///
- public Color BodyColor { get; private set; }
+ public Color BodyColor { get; set; }
///
/// Шаг перемещения самолета
///
@@ -39,10 +39,5 @@ namespace AirplaneWithRadar.Entities
Weight = weight;
BodyColor = bodyColor;
}
- internal void SetBodyColor(Color color)
- {
- BodyColor = color;
- }
-
}
}
\ No newline at end of file
diff --git a/AirplaneWithRadar/AirplaneWithRadar/EntityAirplaneWithRadar.cs b/AirplaneWithRadar/AirplaneWithRadar/EntityAirplaneWithRadar.cs
index a8940c8..5913a90 100644
--- a/AirplaneWithRadar/AirplaneWithRadar/EntityAirplaneWithRadar.cs
+++ b/AirplaneWithRadar/AirplaneWithRadar/EntityAirplaneWithRadar.cs
@@ -14,7 +14,7 @@ namespace AirplaneWithRadar.Entities
///
/// Дополнительный цвет (для опциональных элементов)
///
- public Color AdditionalColor { get; private set; }
+ public Color AdditionalColor { get; set; }
///
/// Признак (опция) наличия радара
///
@@ -45,9 +45,5 @@ namespace AirplaneWithRadar.Entities
Tank = tank;
Pin = pin;
}
- internal void SetAdditionalColor(Color color)
- {
- AdditionalColor = color;
- }
}
}
diff --git a/AirplaneWithRadar/AirplaneWithRadar/FormAirplaneCollection.cs b/AirplaneWithRadar/AirplaneWithRadar/FormAirplaneCollection.cs
index 6c97343..4821c61 100644
--- a/AirplaneWithRadar/AirplaneWithRadar/FormAirplaneCollection.cs
+++ b/AirplaneWithRadar/AirplaneWithRadar/FormAirplaneCollection.cs
@@ -103,25 +103,6 @@ namespace AirplaneWithRadar
///
///
///
- /**private void buttonAdd_Click(object sender, EventArgs e)
- {
- if (listBoxStorages.SelectedIndex == -1)
- {
- return;
- }
- var obj = _storage[listBoxStorages.SelectedItem.ToString() ??
- string.Empty];
- if (obj == null)
- {
- return;
- }
-
- var formAirplaneConfig = new FormAirplaneConfig();
- formAirplaneConfig.AddEvent(AddAirplane);
- formAirplaneConfig.Show();
- }
- **/
-
private void buttonAdd_Click(object sender, EventArgs e)
{
if (listBoxStorages.SelectedIndex == -1)
@@ -154,31 +135,6 @@ namespace AirplaneWithRadar
formAirplaneConfig.AddEvent(airplaneDelegate);
}
-
- /**private void AddAirplane(DrawningAirplane drawningAirplane)
- {
- if (listBoxStorages.SelectedIndex == -1)
- {
- return;
- }
- var obj = _storage[listBoxStorages.SelectedItem.ToString() ??
- string.Empty];
- if (obj == null)
- {
- return;
- }
-
- if (obj + drawningAirplane)
- {
- MessageBox.Show("Объект добавлен");
- pictureBoxCollection.Image = obj.ShowAirplanes();
- }
- else
- {
- MessageBox.Show("Не удалось добавить объект");
- }
- }**/
-
///
/// Удаление объекта из набора
///
diff --git a/AirplaneWithRadar/AirplaneWithRadar/FormAirplaneConfig.cs b/AirplaneWithRadar/AirplaneWithRadar/FormAirplaneConfig.cs
index acbc48f..f794bf5 100644
--- a/AirplaneWithRadar/AirplaneWithRadar/FormAirplaneConfig.cs
+++ b/AirplaneWithRadar/AirplaneWithRadar/FormAirplaneConfig.cs
@@ -37,7 +37,6 @@ namespace AirplaneWithRadar
panelYellow.MouseDown += PanelColor_MouseDown;
panelBlue.MouseDown += PanelColor_MouseDown;
- // TODO buttonCancel.Click with lambda +
buttonCancel.Click += (s, e) => Close();
}
///
@@ -116,7 +115,6 @@ namespace AirplaneWithRadar
}
DrawAirplane();
}
- // TODO Реализовать логику смены цветов: основного и дополнительного (для продвинутого объекта)
///
/// Добавление самолета
@@ -141,12 +139,12 @@ namespace AirplaneWithRadar
switch (((Label)sender).Name)
{
case "labelBodyColor":
- _airplane?.EntityAirplane?.SetBodyColor((Color)e.Data.GetData(typeof(Color)));
+ _airplane.SetBodyColor((Color)e.Data.GetData(typeof(Color)));
break;
case "labelAdditionalColor":
if (!(_airplane is DrawningAirplaneWithRadar))
return;
- (_airplane.EntityAirplane as EntityAirplaneWithRadar)?.SetAdditionalColor(color: (Color)e.Data.GetData(typeof(Color)));
+ (_airplane as DrawningAirplaneWithRadar).SetAddColor((Color)e.Data.GetData(typeof(Color)));
break;
}
DrawAirplane();