LabWork01

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/DrawningArtillery.cs

@@ -0,0 +1,217 @@
+namespace SelfPropelledArtilleryUnit;
+/// <summary>
+/// Класс, отвечающий за прорисовку и перемещение объекта-сущности
+/// </summary>
+public class DrawningArtillery
+{
+    /// <summary>
+    /// Класс-сущность
+    /// </summary>
+    public EntityArtillery? EntityArtillery { get; private set; }
+    /// <summary>
+    /// Ширина окна
+    /// </summary>
+    private int? _pictureWidth;
+    /// <summary>
+    /// Высота окна
+    /// </summary>
+    private int? _pictureHeight;
+    /// <summary>
+    /// Левая координата прорисовки автомобиля
+    /// </summary>
+    private int? _startPosX;
+    /// <summary>
+    /// Верхняя кооридната прорисовки автомобиля
+    /// </summary>
+    private int? _startPosY;
+    /// <summary>
+    /// Ширина прорисовки автомобиля
+    /// </summary>
+    private readonly int _drawningArtilleryWidth = 130;
+    /// <summary>
+    /// Высота прорисовки автомобиля
+    /// </summary>
+    private readonly int _drawningArtilleryHeight = 70;
+    /// <summary>
+    /// Инициализация свойств
+    /// </summary>
+    /// <param name="speed">Скорость</param>
+    /// <param name="weight">Вес</param>
+    /// <param name="bodyColor">Основной цвет</param>
+    /// <param name="additionalColor">Дополнительный цвет</param>
+    /// <param name="bodyKit">Признак наличия обвеса</param>
+    /// <param name="wing">Признак наличия антикрыла</param>
+    /// <param name="sportLine">Признак наличия гоночной полосы</param>
+    public void Init(int speed, double weight, Color bodyColor, Color
+    additionalColor, bool cannon, bool rocket)
+    {
+        EntityArtillery = new EntityArtillery();
+        EntityArtillery.Init(speed, weight, bodyColor, additionalColor, cannon, rocket);
+        _pictureWidth = null;
+        _pictureHeight = null;
+        _startPosX = null;
+        _startPosY = null;
+    }
+    /// <summary>
+    /// Установка границ поля
+    /// </summary>
+    /// <param name="width">Ширина поля</param>
+    /// <param name="height">Высота поля</param>
+    /// <returns>true - границы заданы, false - проверка не пройдена, нельзя разместить объект в этих размерах</returns>
+    public bool SetPictureSize(int width, int height)
+    {
+        // TODO проверка, что объект "влезает" в размеры поля
+        // если влезает, сохраняем границы и корректируем позицию объекта,если она была уже установлена
+        if (width >= _drawningArtilleryWidth && height >= _drawningArtilleryHeight)
+        {
+            _pictureWidth = width;
+            _pictureHeight = height;
+            return true;
+        }
+        return false;
+    }
+    /// <summary>
+    /// Установка позиции
+    /// </summary>
+    /// <param name="x">Координата X</param>
+    /// <param name="y">Координата Y</param>
+    public void SetPosition(int x, int y)
+    {
+        if (!_pictureHeight.HasValue || !_pictureWidth.HasValue)
+        {
+            return;
+        }
+        // TODO если при установке объекта в эти координаты, он будет "выходить" за границы формы
+        // то надо изменить координаты, чтобы он оставался в этих границах
+        if (x + 110 > _pictureWidth.Value)
+        {
+            x -= (x + 110) - _pictureWidth.Value;
+        }
+        if (y + 60 > _pictureHeight.Value)
+        {
+            y -= (y + 60) - _pictureHeight.Value;
+        }
+        _startPosX = x;
+        _startPosY = y;
+    }
+    /// <summary>
+    /// Изменение направления перемещения
+    /// </summary>
+    /// <param name="direction">Направление</param>
+    /// <returns>true - перемещене выполнено, false - перемещение невозможно</returns>
+    public bool MoveTransport(DirectionType direction)
+    {
+        if (EntityArtillery == null || !_startPosX.HasValue ||
+        !_startPosY.HasValue)
+        {
+            return false;
+        }
+        switch (direction)
+        {
+            //влево
+            case DirectionType.Left:
+                if (_startPosX.Value - EntityArtillery.Step > 0)
+                {
+                    _startPosX -= (int)EntityArtillery.Step;
+                }
+                return true;
+            //вверх
+            case DirectionType.Up:
+                if (_startPosY.Value - EntityArtillery.Step > 0)
+                {
+                    _startPosY -= (int)EntityArtillery.Step;
+                }
+                return true;
+            // вправо
+            case DirectionType.Right:
+                if (_startPosX.Value + EntityArtillery.Step + _drawningArtilleryWidth < _pictureWidth)
+                {
+                    _startPosX += (int)EntityArtillery.Step;
+                }
+
+                return true;
+            //вниз
+            case DirectionType.Down:
+                if (_startPosY.Value + EntityArtillery.Step + _drawningArtilleryHeight < _pictureHeight)
+                {
+                    _startPosY += (int)EntityArtillery.Step;
+                }
+                return true;
+            default:
+                return false;
+        }
+    }
+    /// <summary>
+    /// Прорисовка объекта
+    /// </summary>
+    /// <param name="g"></param>
+    public void DrawTransport(Graphics g)
+    {
+        if (EntityArtillery == null || !_startPosX.HasValue ||
+        !_startPosY.HasValue)
+        {
+            return;
+        }
+
+        Pen pen = new(Color.Black);
+        Brush additionalBrush = new
+        SolidBrush(EntityArtillery.AdditionalColor);
+        Brush brush = new SolidBrush(EntityArtillery.BodyColor);
+        Brush grayBrush = new SolidBrush(Color.Gray);
+        Brush blackBrush = new SolidBrush(Color.Black);
+        //тело
+        g.FillRectangle(additionalBrush, _startPosX.Value, _startPosY.Value + 40, 110, 20);
+        g.DrawRectangle(pen, _startPosX.Value, _startPosY.Value + 40, 110, 20);
+        
+        //башня
+        g.FillRectangle(additionalBrush, _startPosX.Value+30, _startPosY.Value+20,50,20);
+        g.DrawRectangle(pen, _startPosX.Value+30, _startPosY.Value + 20, 50, 20);
+        //ходовая
+        //основа
+        g.DrawEllipse(pen, _startPosX.Value, _startPosY.Value + 50, 110, 20);
+        g.FillEllipse(grayBrush, _startPosX.Value, _startPosY.Value + 50, 110, 20);
+        //1-e
+        g.DrawEllipse(pen, _startPosX.Value + 25, _startPosY.Value + 58, 11, 11);
+        g.FillEllipse(blackBrush, _startPosX.Value + 25, _startPosY.Value + 58, 11, 11);
+
+        //2-ое 
+        g.DrawEllipse(pen, _startPosX.Value + 40, _startPosY.Value + 58, 11, 11);
+        g.FillEllipse(blackBrush, _startPosX.Value + 40, _startPosY.Value + 58, 11, 11);
+
+        //3-ее 
+        g.DrawEllipse(pen, _startPosX.Value + 55, _startPosY.Value + 58, 11, 11);
+        g.FillEllipse(blackBrush, _startPosX.Value + 55, _startPosY.Value + 58, 11, 11);
+
+        //4-ое 
+        g.DrawEllipse(pen, _startPosX.Value + 70, _startPosY.Value + 58, 11, 11);
+        g.FillEllipse(blackBrush, _startPosX.Value + 70, _startPosY.Value + 58, 11, 11);
+
+        //5-ое 
+        g.DrawEllipse(pen, _startPosX.Value + 90, _startPosY.Value + 52, 15, 15);
+        g.FillEllipse(blackBrush, _startPosX.Value + 90, _startPosY.Value + 52, 15, 15);
+
+        //6-ое 
+        g.DrawEllipse(pen, _startPosX.Value + 7, _startPosY.Value + 52, 15, 15);
+        g.FillEllipse(blackBrush, _startPosX.Value + 7, _startPosY.Value + 52, 15, 15);
+        //орудие 
+        if (EntityArtillery.Cannon)
+        {
+            g.FillRectangle(brush, _startPosX.Value+80, _startPosY.Value + 25, 50, 5);
+            g.DrawRectangle(pen, _startPosX.Value+80, _startPosY.Value + 25, 50, 5);
+        }
+        //установка
+        if (EntityArtillery.Cannon)
+        {
+            //колонна
+            g.FillRectangle(brush, _startPosX.Value +5, _startPosY.Value + 10, 5, 30);
+            g.DrawRectangle(pen, _startPosX.Value +5, _startPosY.Value + 10, 5, 30);
+            //контейнер
+            g.FillRectangle(brush, _startPosX.Value + 3, _startPosY.Value + 5, 50, 13);
+            g.DrawRectangle(pen, _startPosX.Value + 3, _startPosY.Value + 5, 50, 13);
+            //ракеты
+            g.DrawRectangle(pen, _startPosX.Value + 52, _startPosY.Value + 5, 10, 3);
+            g.DrawRectangle(pen, _startPosX.Value + 52, _startPosY.Value + 10, 10, 3);
+            g.DrawRectangle(pen, _startPosX.Value + 52, _startPosY.Value + 15, 10, 3);
+        }
+    }
+}

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/DrawningSelfPropelledArtillery.cs

@@ -1,228 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement.Tab;
-
-namespace SelfPropelledArtilleryUnit;
-/// <summary>
-/// 
-/// </summary>
-public class DrawningSelfPropelledArtillery
-{
-    /// <summary>
-	/// Класс-сущность
-	/// </summary>
-	public EntitySelfPropelledArtillery? EntitySelfPropelledArtillery { get; private set; }
-
-    /// <summary>
-    /// Ширина окна
-    /// </summary>
-    private int? _pictureWidth;
-
-    /// <summary>
-    /// Высота окна
-    /// </summary>
-    private int? _pictureHeight;
-
-    /// <summary>
-    /// Левая координата прорисовки автомобиля
-    /// </summary>
-    private int? _startPosX;
-
-    /// <summary>
-    /// Верхняя кооридната прорисовки автомобиля
-    /// </summary>
-    private int? _startPosY;
-
-    /// <summary>
-    /// Ширина прорисовки автомобиля
-    /// </summary>
-    private readonly int _SelfPropelledArtilleryWidth = 110;
-
-    /// <summary>
-    /// Высота прорисовки автомобиля
-    /// </summary>
-    private readonly int _SelfPropelledArtilleryHeight = 60;
-
-    /// <summary>
-    /// Инициализация свойств
-    /// </summary>
-    /// <param name="speed">Скорость</param>
-    /// <param name="weight">Вес</param>
-    /// <param name="bodyColor">Основной цвет</param>
-    /// <param name="additionalColor">Дополнительный цвет</param>
-    /// /// <param name="width">Ширина картинки</param>
-    /// <param name="height">Высота картинки</param>
-    /// /// <param name="Cannon">орудие</param>
-    ///<param name="Rocket">залповая установка</param>
-    public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool cannon, bool rocket)
-    {
-        EntitySelfPropelledArtillery = new EntitySelfPropelledArtillery();
-        EntitySelfPropelledArtillery.Init(speed, weight,bodyColor, additionalColor, cannon, rocket);
-    }
-
-    /// <summary>
-    /// Установка границ поля
-    /// </summary>
-    /// <param name="width">Ширина поля</param>
-    /// <param name="height">Высота поля</param>
-    /// <returns>true - границы заданы, false - проверка не пройдена, нельзя разместить объект в этих размерах</returns>
-
-    /// <summary>
-    /// Установка позиции
-    /// </summary>
-    /// <param name="x">Координата X</param>
-    /// <param name="y">Координата Y</param>
-    public void SetPosition(int x, int y, int width, int height)
-    {
-        if (x < 0 || x - _SelfPropelledArtilleryWidth >= width)
-        {
-            return;
-        }
-        if (y < 0 || y - _SelfPropelledArtilleryHeight >= height)
-        {
-            return;
-        }
-        _startPosX = x;
-        _startPosY = y;
-        _pictureWidth = width;
-        _pictureHeight = height;
-    }
-
-    /// <summary>
-    /// Изменение направления перемещения
-    /// </summary>
-    /// <param name="direction">Направление</param>
-    /// <returns>true - перемещене выполнено, false - перемещение невозможно</returns>
-    public bool MoveTransport(DirectionType direction)
-    {
-        if (EntitySelfPropelledArtillery == null || !_startPosX.HasValue || !_startPosY.HasValue)
-        {
-            return false;
-        }
-
-        switch (direction)
-        {
-            //влево
-            case DirectionType.Left:
-                if (_startPosX.Value - EntitySelfPropelledArtillery.Step > 0)
-                {
-                    _startPosX -= (int)EntitySelfPropelledArtillery.Step;
-                }
-                return true;
-            //вверх
-            case DirectionType.Up:
-                if (_startPosY.Value - EntitySelfPropelledArtillery.Step > 0)
-                {
-                    _startPosY -= (int)EntitySelfPropelledArtillery.Step;
-                }
-                return true;
-            // вправо
-            case DirectionType.Right:
-                if (_startPosX.Value + EntitySelfPropelledArtillery.Step + _SelfPropelledArtilleryWidth < _pictureWidth)
-                {
-                    _startPosX += (int)EntitySelfPropelledArtillery.Step;
-                }
-                return true;
-            //вниз
-            case DirectionType.Down:
-                if (_startPosY.Value + EntitySelfPropelledArtillery.Step + _SelfPropelledArtilleryHeight < _pictureHeight)
-                {
-                    _startPosY += (int)EntitySelfPropelledArtillery.Step;
-                }
-                return true;
-            default:
-                return false;
-        }
-    }
-
-    /// <summary>
-    /// Прорисовка объекта
-    /// </summary>
-    /// <param name="g"></param>
-    public void DrawTransport(Graphics g)
-    {
-        if (_startPosX < 0 || _startPosY < 0 || !_pictureHeight.HasValue || !_pictureWidth.HasValue)
-        {
-            return;
-        }
-        Pen pen = new(Color.Black);
-        Brush brush = new SolidBrush(EntitySelfPropelledArtillery?.BodyColor ?? Color.Black);
-        //башня
-        g.FillRectangle(brush, _startPosX.Value + _SelfPropelledArtilleryWidth / 16 * 2, _startPosY.Value, _SelfPropelledArtilleryWidth / 8 * 4, _SelfPropelledArtilleryWidth / 5);
-        g.DrawRectangle(pen, _startPosX.Value + _SelfPropelledArtilleryWidth / 16 * 2, _startPosY.Value, _SelfPropelledArtilleryWidth / 8 * 4, _SelfPropelledArtilleryWidth / 5);
-        //корпус 
-        g.FillRectangle(brush, _startPosX.Value, _startPosY.Value + _SelfPropelledArtilleryHeight / 3, _SelfPropelledArtilleryWidth, _SelfPropelledArtilleryHeight / 3);
-        g.DrawRectangle(pen, _startPosX.Value, _startPosY.Value + _SelfPropelledArtilleryHeight / 3, _SelfPropelledArtilleryWidth, _SelfPropelledArtilleryHeight / 3);
-
-
-
-        Brush blackBrush = new SolidBrush(Color.Black);
-        Brush grayBrush = new SolidBrush(Color.Gray);
-        //орудие 
-        if (EntitySelfPropelledArtillery.Cannon)
-        {
-            g.DrawRectangle(pen, _startPosX.Value + 62, _startPosY.Value, _SelfPropelledArtilleryWidth / 8 * 5, _SelfPropelledArtilleryWidth / 15);
-            g.FillRectangle(blackBrush, _startPosX.Value + 62, _startPosY.Value, _SelfPropelledArtilleryWidth / 8 * 5, _SelfPropelledArtilleryWidth / 15);
-        }
-        
-        //установка
-        if (EntitySelfPropelledArtillery.Rocket)
-        {
-           // g.DrawRectangle(pen, _startPosX.Value - 55, _startPosY.Value, _SelfPropelledArtilleryWidth / 2 * 5, _SelfPropelledArtilleryWidth / 10);
-           // g.FillRectangle(blackBrush, _startPosX.Value - 55, _startPosY.Value, _SelfPropelledArtilleryWidth / 2 * 5, _SelfPropelledArtilleryWidth / 10);
-            g.FillRectangle(brush, _startPosX.Value + _SelfPropelledArtilleryWidth / 100 * 2, _startPosY.Value-15, _SelfPropelledArtilleryWidth / 80 * 4, _SelfPropelledArtilleryWidth / 3);
-            g.DrawRectangle(pen, _startPosX.Value + _SelfPropelledArtilleryWidth / 100 * 2, _startPosY.Value-15, _SelfPropelledArtilleryWidth / 80 * 4, _SelfPropelledArtilleryWidth / 3);
-            g.FillRectangle(brush, _startPosX.Value + _SelfPropelledArtilleryWidth / 200 * 2, _startPosY.Value - 15, _SelfPropelledArtilleryWidth / 80 * 50, _SelfPropelledArtilleryWidth / 10);
-            g.DrawRectangle(pen, _startPosX.Value + _SelfPropelledArtilleryWidth / 200 * 2, _startPosY.Value - 15, _SelfPropelledArtilleryWidth / 80 * 50, _SelfPropelledArtilleryWidth / 10);
-
-            g.DrawRectangle(pen, _startPosX.Value + _SelfPropelledArtilleryWidth / 200 * 50, _startPosY.Value - 16, _SelfPropelledArtilleryWidth / 80 * 60, _SelfPropelledArtilleryWidth / 35);
-            g.DrawRectangle(pen, _startPosX.Value + _SelfPropelledArtilleryWidth / 200 * 50, _startPosY.Value - 11, _SelfPropelledArtilleryWidth / 80 * 60, _SelfPropelledArtilleryWidth / 35);
-            g.DrawRectangle(pen, _startPosX.Value + _SelfPropelledArtilleryWidth / 200 * 50, _startPosY.Value - 6, _SelfPropelledArtilleryWidth / 80 * 60, _SelfPropelledArtilleryWidth / 35);
-           // g.DrawRectangle(pen, _startPosX.Value + _SelfPropelledArtilleryWidth / 200 * 50, _startPosY.Value - 14, _SelfPropelledArtilleryWidth / 80 * 50, _SelfPropelledArtilleryWidth / 35);
-        }
-        //ходовая
-        g.DrawEllipse(pen, _startPosX.Value, _startPosY.Value + _SelfPropelledArtilleryHeight * 2 / 5, _SelfPropelledArtilleryWidth, _SelfPropelledArtilleryHeight * 2 / 5);
-        g.FillEllipse(grayBrush, _startPosX.Value, _startPosY.Value + _SelfPropelledArtilleryHeight * 2 / 5, _SelfPropelledArtilleryWidth, _SelfPropelledArtilleryHeight * 2 / 5);
-        //катки
-        g.FillEllipse(blackBrush, _startPosX.Value+ _SelfPropelledArtilleryWidth / 20, _startPosY.Value + _SelfPropelledArtilleryHeight * 7 / 15, _SelfPropelledArtilleryWidth * 4 / 20, _SelfPropelledArtilleryHeight * 10 / 32);
-        g.FillEllipse(blackBrush, _startPosX.Value+ _SelfPropelledArtilleryWidth * 5 / 20, _startPosY.Value + _SelfPropelledArtilleryHeight * 9 / 16, _SelfPropelledArtilleryWidth * 3 / 20, _SelfPropelledArtilleryHeight * 8 / 32);
-        g.FillEllipse(blackBrush, _startPosX.Value+ _SelfPropelledArtilleryWidth * 8 / 20, _startPosY.Value + _SelfPropelledArtilleryHeight * 10 / 16, _SelfPropelledArtilleryWidth * 2 / 20, _SelfPropelledArtilleryHeight * 6 / 32);
-        g.FillEllipse(blackBrush, _startPosX.Value+ _SelfPropelledArtilleryWidth * 10 / 20, _startPosY.Value + _SelfPropelledArtilleryHeight * 10 / 16, _SelfPropelledArtilleryWidth * 2 / 20, _SelfPropelledArtilleryHeight * 6 / 32);
-        g.FillEllipse(blackBrush, _startPosX.Value+ _SelfPropelledArtilleryWidth * 12 / 20, _startPosY.Value + _SelfPropelledArtilleryHeight * 9 / 16, _SelfPropelledArtilleryWidth * 3 / 20, _SelfPropelledArtilleryHeight * 8 / 32);
-        g.FillEllipse(blackBrush, _startPosX.Value + _SelfPropelledArtilleryWidth * 15 / 20, _startPosY.Value + _SelfPropelledArtilleryHeight * 7 / 15, _SelfPropelledArtilleryWidth * 4 / 20, _SelfPropelledArtilleryHeight * 10 / 32);
-        //обводка катков 
-        g.DrawEllipse(pen, _startPosX.Value + _SelfPropelledArtilleryWidth / 20, _startPosY.Value + _SelfPropelledArtilleryHeight * 7 / 15, _SelfPropelledArtilleryWidth * 4 / 20, _SelfPropelledArtilleryHeight * 10 / 32);
-        g.DrawEllipse(pen, _startPosX.Value + _SelfPropelledArtilleryWidth * 5 / 20, _startPosY.Value + _SelfPropelledArtilleryHeight * 9 / 16, _SelfPropelledArtilleryWidth * 3 / 20, _SelfPropelledArtilleryHeight * 8 / 32);
-        g.DrawEllipse(pen, _startPosX.Value + _SelfPropelledArtilleryWidth * 8 / 20, _startPosY.Value + _SelfPropelledArtilleryHeight * 10 / 16, _SelfPropelledArtilleryWidth * 2 / 20, _SelfPropelledArtilleryHeight * 6 / 32);
-        g.DrawEllipse(pen, _startPosX.Value + _SelfPropelledArtilleryWidth * 10 / 20, _startPosY.Value + _SelfPropelledArtilleryHeight * 10 / 16, _SelfPropelledArtilleryWidth * 2 / 20, _SelfPropelledArtilleryHeight * 6 / 32);
-        g.DrawEllipse(pen, _startPosX.Value + _SelfPropelledArtilleryWidth * 12 / 20, _startPosY.Value + _SelfPropelledArtilleryHeight * 9 / 16, _SelfPropelledArtilleryWidth * 3 / 20, _SelfPropelledArtilleryHeight * 8 / 32);
-        g.DrawEllipse(pen, _startPosX.Value + _SelfPropelledArtilleryWidth * 15 / 20, _startPosY.Value + _SelfPropelledArtilleryHeight * 7 / 15, _SelfPropelledArtilleryWidth * 4 / 20, _SelfPropelledArtilleryHeight * 10 / 32);
-
-    }
-
-    public void ChangeBorders(int width, int height)
-    {
-        _pictureWidth = width;
-        _pictureHeight = height;
-        if (_pictureWidth <= _SelfPropelledArtilleryWidth || _pictureHeight <= _SelfPropelledArtilleryHeight)
-        {
-            _pictureWidth = null;
-            _pictureHeight = null;
-            return;
-        }
-        if (_startPosX + _SelfPropelledArtilleryWidth > _pictureWidth)
-        {
-            _startPosX = _pictureWidth.Value - _SelfPropelledArtilleryWidth;
-        }
-        if (_startPosY + _SelfPropelledArtilleryHeight > _pictureHeight)
-        {
-            _startPosY = _pictureHeight.Value - _SelfPropelledArtilleryHeight;
-        }
-    }
-
-}
-

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/EntityArtillery.cs

@@ -0,0 +1,60 @@
+namespace SelfPropelledArtilleryUnit;
+/// <summary>
+/// Класс-сущность "Спортивный автомобиль"
+/// </summary>
+
+
+public class EntityArtillery
+    {
+        /// <summary>
+        /// Скорость
+        /// </summary>
+        public int Speed { get; private set; }
+        /// <summary>
+        /// Вес
+        /// </summary>
+        public double Weight { get; private set; }
+        /// <summary>
+        /// Основной цвет
+        /// </summary>
+        public Color BodyColor { get; private set; }
+        /// <summary>
+        /// Дополнительный цвет (для опциональных элементов)
+        /// </summary>
+        public Color AdditionalColor { get; private set; }
+        /// <summary>
+        /// Признак (опция) наличия обвеса
+        /// </summary>
+        public bool Cannon { get; private set; }
+        /// <summary>
+        /// Признак (опция) наличия антикрыла
+        /// </summary>
+         public bool Rocket { get; private set; }
+        
+        /// <summary>
+        /// Шаг перемещения автомобиля
+        /// </summary>
+        public double Step => Speed * 100 / Weight;
+        /// <summary>
+        /// Инициализация полей объекта-класса спортивного автомобиля
+        /// </summary>
+        /// <param name="speed">Скорость</param>
+        /// <param name="weight">Вес автомобиля</param>
+        /// <param name="bodyColor">Основной цвет</param>
+        /// <param name="additionalColor">Дополнительный цвет</param>
+        /// <param name="bodyKit">Признак наличия обвеса</param>
+        /// <param name="wing">Признак наличия антикрыла</param>
+        /// <param name="sportLine">Признак наличия гоночной полосы</param>
+        public void Init(int speed, double weight, Color bodyColor, Color
+        additionalColor, bool cannon, bool rocket)
+        {
+            Speed = speed;
+            Weight = weight;
+            BodyColor = bodyColor;
+            AdditionalColor = additionalColor;
+            Cannon = cannon;
+            Rocket = rocket;
+        }
+
+    }
+

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/EntitySelfPropelledArtillery.cs

@@ -1,62 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.NetworkInformation;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SelfPropelledArtilleryUnit;
-
-public class EntitySelfPropelledArtillery
-{
-    /// <summary>
-    /// Скорость
-    /// </summary>
-    public int Speed { get; private set; }
-
-    /// <summary>
-    /// Вес
-    /// </summary>
-    public double Weight { get; private set; }
-
-    /// <summary>
-    /// Основной цвет
-    /// </summary>
-    public Color BodyColor { get; private set; }
-
-    /// <summary>
-    /// Дополнительный цвет (для опциональных элементов)
-    /// </summary>
-    public Color AdditionalColor { get; private set; }
-
-    /// <summary>
-    /// Шаг перемещения автомобиля
-    /// </summary>
-    public double Step => Speed * 100 / Weight;
-
-    /// <summary>
-    /// Инициализация полей объекта-класса спортивного автомобиля
-    /// </summary>
-    /// <param name="speed">Скорость</param>
-    /// <param name="weight">Вес автомобиля</param>
-    /// <param name="bodyColor">Основной цвет</param>
-    /// <param name="additionalColor">Дополнительный цвет</param>
-    /// <param name="Cannon">орудие</param>
-    ///<param name="Rocket">залповая установка</param>
-
-    //пушка
-    public bool Cannon { get; private set; }
-    //залповая установка
-    public bool Rocket { get; private set; }
-    public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool cannon, bool rocket)
-    {
-
-        Speed = speed;
-        Weight = weight;
-        BodyColor = bodyColor;
-        AdditionalColor = additionalColor;
-        Cannon = cannon;
-        Rocket = rocket;
-    }
-}
-

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormArtillery.Designer.cs

@@ -1,6 +1,6 @@
 namespace SelfPropelledArtilleryUnit
 {
-    partial class FormSelfPropelledArtillery
+    partial class FormArtillery
     {
         /// <summary>
         /// Required designer variable.
@@ -28,29 +28,54 @@
         /// </summary>
         private void InitializeComponent()
         {
-            pictureBoxSelfPropelledArtillery = new PictureBox();
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormArtillery));
+            pictureBoxArtillery = new PictureBox();
+            buttonCreate = new Button();
+            buttonLeft = new Button();
             buttonUp = new Button();
             buttonDown = new Button();
             buttonRight = new Button();
-            buttonCreate = new Button();
+            ((System.ComponentModel.ISupportInitialize)pictureBoxArtillery).BeginInit();
-            buttonLeft = new Button();
-            ((System.ComponentModel.ISupportInitialize)pictureBoxSelfPropelledArtillery).BeginInit();
             SuspendLayout();
             // 
-            // pictureBoxSelfPropelledArtillery
+            // pictureBoxArtillery
             // 
-            pictureBoxSelfPropelledArtillery.Location = new Point(1, 0);
+            pictureBoxArtillery.Dock = DockStyle.Fill;
-            pictureBoxSelfPropelledArtillery.Name = "pictureBoxSelfPropelledArtillery";
+            pictureBoxArtillery.Location = new Point(0, 0);
-            pictureBoxSelfPropelledArtillery.Size = new Size(753, 374);
+            pictureBoxArtillery.Name = "pictureBoxArtillery";
-            pictureBoxSelfPropelledArtillery.TabIndex = 0;
+            pictureBoxArtillery.Size = new Size(800, 461);
-            pictureBoxSelfPropelledArtillery.TabStop = false;
+            pictureBoxArtillery.TabIndex = 0;
+            pictureBoxArtillery.TabStop = false;
+            // 
+            // buttonCreate
+            // 
+            buttonCreate.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
+            buttonCreate.Location = new Point(12, 417);
+            buttonCreate.Name = "buttonCreate";
+            buttonCreate.Size = new Size(75, 23);
+            buttonCreate.TabIndex = 1;
+            buttonCreate.Text = "Создать";
+            buttonCreate.UseVisualStyleBackColor = true;
+            buttonCreate.Click += ButtonCreate_Click;
+            // 
+            // buttonLeft
+            // 
+            buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+            buttonLeft.BackgroundImage = (Image)resources.GetObject("buttonLeft.BackgroundImage");
+            buttonLeft.BackgroundImageLayout = ImageLayout.Stretch;
+            buttonLeft.Location = new Point(677, 417);
+            buttonLeft.Name = "buttonLeft";
+            buttonLeft.Size = new Size(35, 35);
+            buttonLeft.TabIndex = 2;
+            buttonLeft.UseVisualStyleBackColor = true;
+            buttonLeft.Click += ButtonMove_Click;
             // 
             // buttonUp
             // 
             buttonUp.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
-            buttonUp.BackgroundImage = Properties.Resources.arrowUp;
+            buttonUp.BackgroundImage = Properties.Resources.arrowUp1;
             buttonUp.BackgroundImageLayout = ImageLayout.Stretch;
-            buttonUp.Location = new Point(689, 280);
+            buttonUp.Location = new Point(717, 374);
             buttonUp.Name = "buttonUp";
             buttonUp.Size = new Size(35, 35);
             buttonUp.TabIndex = 3;
@@ -62,7 +87,7 @@
             buttonDown.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
             buttonDown.BackgroundImage = Properties.Resources.arrowDown;
             buttonDown.BackgroundImageLayout = ImageLayout.Stretch;
-            buttonDown.Location = new Point(689, 339);
+            buttonDown.Location = new Point(718, 417);
             buttonDown.Name = "buttonDown";
             buttonDown.Size = new Size(35, 35);
             buttonDown.TabIndex = 4;
@@ -74,60 +99,37 @@
             buttonRight.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
             buttonRight.BackgroundImage = Properties.Resources.arrowRight;
             buttonRight.BackgroundImageLayout = ImageLayout.Stretch;
-            buttonRight.Location = new Point(721, 309);
+            buttonRight.Location = new Point(759, 417);
             buttonRight.Name = "buttonRight";
             buttonRight.Size = new Size(35, 35);
             buttonRight.TabIndex = 5;
             buttonRight.UseVisualStyleBackColor = true;
             buttonRight.Click += ButtonMove_Click;
             // 
-            // buttonCreate
+            // FormArtillery
-            // 
-            buttonCreate.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
-            buttonCreate.Location = new Point(0, 339);
-            buttonCreate.Name = "buttonCreate";
-            buttonCreate.Size = new Size(103, 35);
-            buttonCreate.TabIndex = 6;
-            buttonCreate.Text = "Создать";
-            buttonCreate.UseVisualStyleBackColor = true;
-            buttonCreate.Click += ButtonCreate_Click;
-            // 
-            // buttonLeft
-            // 
-            buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
-            buttonLeft.BackgroundImage = Properties.Resources.arrowLeft;
-            buttonLeft.BackgroundImageLayout = ImageLayout.Stretch;
-            buttonLeft.Location = new Point(658, 309);
-            buttonLeft.Name = "buttonLeft";
-            buttonLeft.Size = new Size(35, 35);
-            buttonLeft.TabIndex = 7;
-            buttonLeft.UseVisualStyleBackColor = true;
-            buttonLeft.Click += ButtonMove_Click;
-            // 
-            // FormSelfPropelledArtillery
             // 
             AutoScaleDimensions = new SizeF(7F, 15F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(756, 374);
+            ClientSize = new Size(800, 461);
-            Controls.Add(buttonLeft);
-            Controls.Add(buttonCreate);
             Controls.Add(buttonRight);
             Controls.Add(buttonDown);
             Controls.Add(buttonUp);
-            Controls.Add(pictureBoxSelfPropelledArtillery);
+            Controls.Add(buttonLeft);
-            Name = "FormSelfPropelledArtillery";
+            Controls.Add(buttonCreate);
-            Text = "Самоходная установка";
+            Controls.Add(pictureBoxArtillery);
-            ((System.ComponentModel.ISupportInitialize)pictureBoxSelfPropelledArtillery).EndInit();
+            Name = "FormArtillery";
+            Text = "Самоходка";
+            ((System.ComponentModel.ISupportInitialize)pictureBoxArtillery).EndInit();
             ResumeLayout(false);
         }
 
         #endregion
 
-        private PictureBox pictureBoxSelfPropelledArtillery;
+        private PictureBox pictureBoxArtillery;
+        private Button buttonCreate;
+        private Button buttonLeft;
         private Button buttonUp;
         private Button buttonDown;
         private Button buttonRight;
-        private Button buttonCreate;
-        private Button buttonLeft;
     }
 }

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormArtillery.cs

@@ -0,0 +1,83 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace SelfPropelledArtilleryUnit
+{
+    public partial class FormArtillery : Form
+    {
+        private DrawningArtillery? _drawningArtillery;
+
+        public FormArtillery()
+        {
+            InitializeComponent();
+        }
+
+
+        private void Draw()
+        {
+            if (_drawningArtillery == null)
+            {
+                return;
+            }
+
+            Bitmap bmp = new(pictureBoxArtillery.Width, pictureBoxArtillery.Height);
+            Graphics gr = Graphics.FromImage(bmp);
+            _drawningArtillery.DrawTransport(gr);
+            pictureBoxArtillery.Image = bmp;
+        }
+
+        private void ButtonCreate_Click(object sender, EventArgs e)
+        {
+            Random random = new();
+            _drawningArtillery = new DrawningArtillery();
+            _drawningArtillery.Init(random.Next(100, 300), random.Next(1000, 3000),
+
+        Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
+        Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
+        Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
+
+            _drawningArtillery.SetPictureSize(pictureBoxArtillery.Width, pictureBoxArtillery.Height);
+            _drawningArtillery.SetPosition(random.Next(10, 100), random.Next(10, 100));
+
+            Draw();
+
+        }
+        private void ButtonMove_Click(object sender, EventArgs e)
+        {
+            if (_drawningArtillery == null)
+            {
+                return;
+            }
+
+            string name = ((Button)sender)?.Name ?? string.Empty;
+            bool result = false;
+            switch (name)
+            {
+                case "buttonUp":
+                    result = _drawningArtillery.MoveTransport(DirectionType.Up);
+                    break;
+                case "buttonDown":
+                    result = _drawningArtillery.MoveTransport(DirectionType.Down);
+                    break;
+                case "buttonLeft":
+                    result = _drawningArtillery.MoveTransport(DirectionType.Left);
+                    break;
+                case "buttonRight":
+                    result = _drawningArtillery.MoveTransport(DirectionType.Right);
+                    break;
+            }
+
+            if (result)
+            {
+                Draw();
+            }
+        }
+    }
+}

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormSelfPropelledArtillery.cs

@@ -1,102 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace SelfPropelledArtilleryUnit
-{
-    public partial class FormSelfPropelledArtillery : Form
-    {
-        /// <summary>
-        /// Поле-объект для прорисовки объекта
-        /// </summary>
-        private DrawningSelfPropelledArtillery? _drawningSelfPropelledArtillery;
-
-        /// <summary>
-        /// Конструктор формы
-        /// </summary>
-        public FormSelfPropelledArtillery()
-        {
-            InitializeComponent();
-
-        }
-
-        /// <summary>
-        /// Метод прорисовки машины
-        /// </summary>
-        private void Draw()
-        {
-            if (_drawningSelfPropelledArtillery == null)
-            {
-                return;
-            }
-
-            Bitmap bmp = new(pictureBoxSelfPropelledArtillery.Width, pictureBoxSelfPropelledArtillery.Height);
-            Graphics gr = Graphics.FromImage(bmp);
-            _drawningSelfPropelledArtillery.DrawTransport(gr);
-            pictureBoxSelfPropelledArtillery.Image = bmp;
-        }
-
-        /// <summary>
-        /// Обработка нажатия кнопки "Создать"
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonCreate_Click(object sender, EventArgs e)
-        {
-            Random random = new();
-            _drawningSelfPropelledArtillery = new DrawningSelfPropelledArtillery();
-            _drawningSelfPropelledArtillery.Init(random.Next(100, 300), random.Next(1000, 3000),
-             Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
-            Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)),
-            Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
-
-
-            _drawningSelfPropelledArtillery.SetPosition(random.Next(10, 100), random.Next(10, 100), pictureBoxSelfPropelledArtillery.Width, pictureBoxSelfPropelledArtillery.Height);
-            Draw();
-        }
-
-        /// <summary>
-        /// Перемещение объекта по форме (нажатие кнопок навигации)
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ButtonMove_Click(object sender, EventArgs e)
-        {
-            if (_drawningSelfPropelledArtillery == null)
-            {
-                return;
-            }
-
-            string name = ((Button)sender)?.Name ?? string.Empty;
-            bool result = false;
-            switch (name)
-            {
-                case "buttonUp":
-                    result = _drawningSelfPropelledArtillery.MoveTransport(DirectionType.Up);
-                    break;
-                case "buttonDown":
-                    result = _drawningSelfPropelledArtillery.MoveTransport(DirectionType.Down);
-                    break;
-                case "buttonLeft":
-                    result = _drawningSelfPropelledArtillery.MoveTransport(DirectionType.Left);
-                    break;
-                case "buttonRight":
-                    result = _drawningSelfPropelledArtillery.MoveTransport(DirectionType.Right);
-                    break;
-            }
-
-            if (result)
-            {
-                Draw();
-            }
-        }
-
-        
-    }
-}

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/FormSelfPropelledArtillery.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!--
-    Microsoft ResX Schema 
-
-    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
-    associated with the data types.
-
-    Example:
-
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-
-    There are any number of "resheader" rows that contain simple
-    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
-    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
-    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
-    read any of the formats listed below.
-
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Program.cs

@@ -11,7 +11,7 @@ namespace SelfPropelledArtilleryUnit
             // To customize application configuration such as set high DPI settings or default font,
             // see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
-            Application.Run(new FormSelfPropelledArtillery());
+            Application.Run(new FormArtillery());
         }
     }
 }

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Properties/Resources.Designer.cs

@@ -99,5 +99,15 @@ namespace SelfPropelledArtilleryUnit.Properties {
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
+        
+        /// <summary>
+        ///   Поиск локализованного ресурса типа System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap arrowUp1 {
+            get {
+                object obj = ResourceManager.GetObject("arrowUp1", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
     }
 }

SelfPropelledArtilleryUnit/SelfPropelledArtilleryUnit/Properties/Resources.resx

@@ -121,13 +121,16 @@
   <data name="arrowDown" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\arrowDown.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="arrowLeft" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="arrowUp" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\arrowLeft.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\arrowUp.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="arrowRight" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\arrowRight.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="arrowUp" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="arrowLeft" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\arrowLeft.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="arrowUp1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\arrowUp.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>