d.agliullov/ISEbd-21_Agliullov.D.A._AirBomber.Base
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Правки для корректного добавления объектов

Browse Source
This commit is contained in:
Данияр Аглиуллов 2022-09-30 16:37:59 +04:00
parent 340744510b
commit 70641cea7f
5 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AirBomber/AirBomber/DrawningObject.cs
View File

@ -34,7 +34,7 @@ namespace AirBomber
void IDrawningObject.DrawningObject(Graphics g) void IDrawningObject.DrawningObject(Graphics g)
{ {
_airplane.DrawTransport(g); _airplane?.DrawTransport(g);
} }
} }
} }

2
AirBomber/AirBomber/FormMapWithSetAirplanes.Designer.cs generated
View File

@ -162,7 +162,7 @@
this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxSelectorMap.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBoxSelectorMap.FormattingEnabled = true; this.comboBoxSelectorMap.FormattingEnabled = true;
this.comboBoxSelectorMap.Items.AddRange(new object[] { this.comboBoxSelectorMap.Items.AddRange(new object[] {
"Простая карта"}); "Простая карта", "Карта со стенами"});
this.comboBoxSelectorMap.Location = new System.Drawing.Point(17, 32); this.comboBoxSelectorMap.Location = new System.Drawing.Point(17, 32);
this.comboBoxSelectorMap.Name = "comboBoxSelectorMap"; this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
this.comboBoxSelectorMap.Size = new System.Drawing.Size(175, 23); this.comboBoxSelectorMap.Size = new System.Drawing.Size(175, 23);

11
AirBomber/AirBomber/FormMapWithSetAirplanes.cs
View File

@ -26,6 +26,9 @@
case "Простая карта": case "Простая карта":
map = new SimpleMap(); map = new SimpleMap();
break; break;
case "Карта со стенами":
map = new WallMap();
break;
} }
if (map != null) if (map != null)
{ {
@ -52,14 +55,14 @@
if (form.ShowDialog() == DialogResult.OK) if (form.ShowDialog() == DialogResult.OK)
{ {
DrawningObject airplane = new(form.SelectedAirplane); DrawningObject airplane = new(form.SelectedAirplane);
if (_mapAirplanesCollectionGeneric + airplane) if (form.SelectedAirplane == null || !(_mapAirplanesCollectionGeneric + airplane))
{ {
MessageBox.Show("Объект добавлен"); MessageBox.Show("Не удалось добавить объект");
pictureBox.Image = _mapAirplanesCollectionGeneric.ShowSet();
} }
else else
{ {
MessageBox.Show("Не удалось добавить объект"); MessageBox.Show("Объект добавлен");
pictureBox.Image = _mapAirplanesCollectionGeneric.ShowSet();
} }
} }
} }

4
AirBomber/AirBomber/MapWithSetAirplanesGeneric.cs
View File

@ -78,7 +78,7 @@ namespace AirBomber
Bitmap bmp = new(_pictureWidth, _pictureHeight); Bitmap bmp = new(_pictureWidth, _pictureHeight);
Graphics gr = Graphics.FromImage(bmp); Graphics gr = Graphics.FromImage(bmp);
DrawBackground(gr); DrawBackground(gr);
Drawairplanes(gr); DrawAirplanes(gr);
return bmp; return bmp;
} }
/// <summary> /// <summary>
@ -158,7 +158,7 @@ namespace AirBomber
/// Метод прорисовки объектов /// Метод прорисовки объектов
/// </summary> /// </summary>
/// <param name="g"></param> /// <param name="g"></param>
private void Drawairplanes(Graphics g) private void DrawAirplanes(Graphics g)
{ {
for (int i = 0; i < _setAirplanes.Count; i++) for (int i = 0; i < _setAirplanes.Count; i++)
{ {

2
AirBomber/AirBomber/SetAirplanesGeneric.cs
View File

@ -41,7 +41,7 @@ namespace AirBomber
private bool isCorrectPosition(int position) private bool isCorrectPosition(int position)
{ {
return 0 < position && position <= Count; return 0 <= position && position < Count;
} }
/// <summary> /// <summary>
/// Добавление объекта в набор на конкретную позицию /// Добавление объекта в набор на конкретную позицию