diff --git a/AirplaneWithRadar/AirplaneWithRadar/MapWithSetAirplanesGeneric.cs b/AirplaneWithRadar/AirplaneWithRadar/MapWithSetAirplanesGeneric.cs
index 82e92ae..9d064b9 100644
--- a/AirplaneWithRadar/AirplaneWithRadar/MapWithSetAirplanesGeneric.cs
+++ b/AirplaneWithRadar/AirplaneWithRadar/MapWithSetAirplanesGeneric.cs
@@ -144,17 +144,6 @@ namespace AirplaneWithRadar
/// Метод отрисовки фона
///
///
- private void DrawHangar(Graphics g, int x, int y, int width, int height)
- {
- Pen pen = new(Color.Black, 3);
- g.DrawLine(pen, x, y, x + width, y);
- g.DrawLine(pen, x, y, x, y + height + 20);
- g.DrawLine(pen, x, y + height + 20, x + width, y + height + 20);
- }
- ///
- /// Метод отрисовки фона
- ///
- ///
private void DrawBackground(Graphics g)
{
Pen pen = new(Color.White, 5);
@@ -177,11 +166,12 @@ namespace AirplaneWithRadar
// TODO установка позиции
int numObjectsInRow = _pictureWidth / _placeSizeWidth;
int maxLeft = (numObjectsInRow - 1) * _placeSizeWidth;
- for (int i = 0; i < _setAirplanes.Count; i++)
+ int curr = 0;
+ foreach (var airplane in _setAirplanes.GetAirplanes())
{
- var airplane = _setAirplanes[i];
- airplane?.SetObject(maxLeft - i % numObjectsInRow * _placeSizeWidth + 5, i / numObjectsInRow * _placeSizeHeight + 15, _pictureWidth, _pictureHeight);
+ airplane?.SetObject(maxLeft - curr % numObjectsInRow * _placeSizeWidth + 5, curr / numObjectsInRow * _placeSizeHeight + 15, _pictureWidth, _pictureHeight);
airplane?.DrawingObject(g);
+ curr++;
}
}
}