AirBomber/AirBomber/FormPlaneCollection.Designer.cs

@@ -28,12 +28,99 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.components = new System.ComponentModel.Container();
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(800, 450);
-            this.Text = "FormPlaneCollection";
+            pictureBoxCollection = new PictureBox();
+            panelTools = new Panel();
+            maskedTextBoxNumber = new MaskedTextBox();
+            buttonRefreshCollection = new Button();
+            buttonRemovePlane = new Button();
+            buttonAddPlane = new Button();
+            ((System.ComponentModel.ISupportInitialize)pictureBoxCollection).BeginInit();
+            panelTools.SuspendLayout();
+            SuspendLayout();
+            // 
+            // pictureBoxCollection
+            // 
+            pictureBoxCollection.BackColor = SystemColors.Control;
+            pictureBoxCollection.Dock = DockStyle.Left;
+            pictureBoxCollection.Location = new Point(0, 0);
+            pictureBoxCollection.Name = "pictureBoxCollection";
+            pictureBoxCollection.Size = new Size(708, 548);
+            pictureBoxCollection.TabIndex = 0;
+            pictureBoxCollection.TabStop = false;
+            // 
+            // panelTools
+            // 
+            panelTools.Controls.Add(maskedTextBoxNumber);
+            panelTools.Controls.Add(buttonRefreshCollection);
+            panelTools.Controls.Add(buttonRemovePlane);
+            panelTools.Controls.Add(buttonAddPlane);
+            panelTools.Dock = DockStyle.Right;
+            panelTools.Location = new Point(719, 0);
+            panelTools.Name = "panelTools";
+            panelTools.Size = new Size(237, 548);
+            panelTools.TabIndex = 1;
+            // 
+            // maskedTextBoxNumber
+            // 
+            maskedTextBoxNumber.Location = new Point(37, 218);
+            maskedTextBoxNumber.Mask = "00";
+            maskedTextBoxNumber.Name = "maskedTextBoxNumber";
+            maskedTextBoxNumber.Size = new Size(160, 31);
+            maskedTextBoxNumber.TabIndex = 3;
+            maskedTextBoxNumber.ValidatingType = typeof(int);
+            // 
+            // buttonRefreshCollection
+            // 
+            buttonRefreshCollection.Location = new Point(37, 394);
+            buttonRefreshCollection.Name = "buttonRefreshCollection";
+            buttonRefreshCollection.Size = new Size(160, 86);
+            buttonRefreshCollection.TabIndex = 2;
+            buttonRefreshCollection.Text = "Обновить коллекцию";
+            buttonRefreshCollection.UseVisualStyleBackColor = true;
+            buttonRefreshCollection.Click += buttonRefreshCollection_Click;
+            // 
+            // buttonRemovePlane
+            // 
+            buttonRemovePlane.Location = new Point(37, 266);
+            buttonRemovePlane.Name = "buttonRemovePlane";
+            buttonRemovePlane.Size = new Size(160, 60);
+            buttonRemovePlane.TabIndex = 1;
+            buttonRemovePlane.Text = "Удалить самолет";
+            buttonRemovePlane.UseVisualStyleBackColor = true;
+            buttonRemovePlane.Click += buttonRemovePlane_Click;
+            // 
+            // buttonAddPlane
+            // 
+            buttonAddPlane.Location = new Point(37, 94);
+            buttonAddPlane.Name = "buttonAddPlane";
+            buttonAddPlane.Size = new Size(160, 64);
+            buttonAddPlane.TabIndex = 0;
+            buttonAddPlane.Text = "Добавить самолет";
+            buttonAddPlane.UseVisualStyleBackColor = true;
+            buttonAddPlane.Click += buttonAddPlane_Click;
+            // 
+            // FormPlaneCollection
+            // 
+            AutoScaleDimensions = new SizeF(10F, 25F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(956, 548);
+            Controls.Add(panelTools);
+            Controls.Add(pictureBoxCollection);
+            Name = "FormPlaneCollection";
+            Text = "Набор самолетов";
+            ((System.ComponentModel.ISupportInitialize)pictureBoxCollection).EndInit();
+            panelTools.ResumeLayout(false);
+            panelTools.PerformLayout();
+            ResumeLayout(false);
         }
 
         #endregion
+
+        private PictureBox pictureBoxCollection;
+        private Panel panelTools;
+        private MaskedTextBox maskedTextBoxNumber;
+        private Button buttonRefreshCollection;
+        private Button buttonRemovePlane;
+        private Button buttonAddPlane;
     }
 }

AirBomber/AirBomber/FormPlaneCollection.cs

@@ -12,9 +12,68 @@ namespace AirBomber
 {
     public partial class FormPlaneCollection : Form
     {
+        /// <summary>
+        /// Набор объектов
+        /// </summary>
+        private readonly PlanesGenericCollection<DrawningAirPlane, DrawningObjectAirPlane> _planes;
+
         public FormPlaneCollection()
         {
             InitializeComponent();
+            _planes = new PlanesGenericCollection<DrawningAirPlane, DrawningObjectAirPlane>(pictureBoxCollection.Width, pictureBoxCollection.Height);
+
+        }
+        /// <summary>
+        /// Добавление объекта в набор
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void buttonAddPlane_Click(object sender, EventArgs e)
+        {
+            FormAirBomber form = new();
+            if (form.ShowDialog() == DialogResult.OK)
+            {
+                if (_planes + form.SelectedPlane)
+                {
+                    MessageBox.Show("Объект добавлен");
+                    pictureBoxCollection.Image = _planes.ShowCars();
+                }
+                else
+                {
+                    MessageBox.Show("Не удалось добавить объект");
+                }
+            }
+        }
+        /// <summary>
+        /// Удаление объекта из набора
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void buttonRemovePlane_Click(object sender, EventArgs e)
+        {
+            if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+            {
+                return;
+            }
+            int pos = Convert.ToInt32(maskedTextBoxNumber.Text);
+            if (_planes - pos != null)
+            {
+                MessageBox.Show("Объект удален");
+                pictureBoxCollection.Image = _planes.ShowCars();
+            }
+            else
+            {
+                MessageBox.Show("Не удалось удалить объект");
+            }
+        }
+        /// <summary>
+        /// Обновление рисунка по набору
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void buttonRefreshCollection_Click(object sender, EventArgs e)
+        {
+            pictureBoxCollection.Image = _planes.ShowCars();
         }
     }
 }

AirBomber/AirBomber/FormPlaneCollection.resx

@@ -1,64 +1,4 @@
-<?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.
-    -->
+<root>
   <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">

AirBomber/AirBomber/PlanesGenericCollection.cs

@@ -6,7 +6,129 @@ using System.Threading.Tasks;
 
 namespace AirBomber
 {
-    internal class PlanesGenericCollection
+    internal class PlanesGenericCollection<T, U>
+        where T : DrawningAirPlane
+        where U : IMoveableObject
     {
+        /// <summary>
+        /// Ширина окна прорисовки
+        /// </summary>
+        private readonly int _pictureWidth;
+        /// <summary>
+        /// Высота окна прорисовки
+        /// </summary>
+        private readonly int _pictureHeight;
+        /// <summary>
+        /// Размер занимаемого объектом места (ширина)
+        /// </summary>
+        private readonly int _placeSizeWidth = 210;
+        /// <summary>
+        /// Размер занимаемого объектом места (высота)
+        /// </summary>
+        private readonly int _placeSizeHeight = 90;
+        /// <summary>
+        /// Набор объектов
+        /// </summary>
+        private readonly SetGeneric<T> _collection;
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="picWidth"></param>
+        /// <param name="picHeight"></param>
+        public PlanesGenericCollection(int picWidth, int picHeight)
+        {
+            int width = picWidth / _placeSizeWidth;
+            int height = picHeight / _placeSizeHeight;
+            _pictureWidth = picWidth;
+            _pictureHeight = picHeight;
+            _collection = new SetGeneric<T>(width * height);
+        }
+        /// <summary>
+        /// Перегрузка оператора сложения
+        /// </summary>
+        /// <param name="collect"></param>
+        /// <param name="obj"></param>
+        /// <returns></returns>
+        public static bool operator +(PlanesGenericCollection<T, U> collect, T?
+        obj)
+        {
+            if (obj == null)
+            {
+                return false;
+            }
+            return collect?._collection.Insert(obj) ?? false;
+        }
+
+        /// <summary>
+        /// Перегрузка оператора вычитания
+        /// </summary>
+        /// <param name="collect"></param>
+        /// <param name="pos"></param>
+        /// <returns></returns>
+        public static T? operator -(PlanesGenericCollection<T, U> collect, int
+        pos)
+        {
+            T? obj = collect._collection.Get(pos);
+            if (obj != null)
+            {
+                collect._collection.Remove(pos);
+            }
+            return obj;
+        }
+        /// <summary>
+        /// Получение объекта IMoveableObject
+        /// </summary>
+        /// <param name="pos"></param>
+        /// <returns></returns>
+        public U? GetU(int pos)
+        {
+            return (U?)_collection.Get(pos)?.GetMoveableObject;
+        }
+        /// <summary>
+        /// Вывод всего набора объектов
+        /// </summary>
+        /// <returns></returns>
+        public Bitmap ShowCars()
+        {
+            Bitmap bmp = new(_pictureWidth, _pictureHeight);
+            Graphics gr = Graphics.FromImage(bmp);
+            DrawBackground(gr);
+            DrawObjects(gr);
+            return bmp;
+        }
+        /// <summary>
+        /// Метод отрисовки фона
+        /// </summary>
+        /// <param name="g"></param>
+        private void DrawBackground(Graphics g)
+        {
+            Pen pen = new(Color.Black, 3);
+            for (int i = 0; i < _pictureWidth / _placeSizeWidth; i++)
+            {
+                for (int j = 0; j < _pictureHeight / _placeSizeHeight +
+                1; ++j)
+                {//линия рамзетки места
+                    g.DrawLine(pen, i * _placeSizeWidth, j *
+                    _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth / 2, j *
+                    _placeSizeHeight);
+                }
+                g.DrawLine(pen, i * _placeSizeWidth, 0, i *
+                _placeSizeWidth, _pictureHeight / _placeSizeHeight * _placeSizeHeight);
+            }
+        }
+        /// <summary>
+        /// Метод прорисовки объектов
+        /// </summary>
+        /// <param name="g"></param>
+        private void DrawObjects(Graphics g)
+        {
+            for (int i = 0; i < _collection.Count; i++)
+            {
+                // TODO получение объекта
+                // TODO установка позиции
+                // TODO прорисовка объекта
+            }
+        }
+
     }
 }

AirBomber/AirBomber/SetGeneric.cs

@@ -6,7 +6,72 @@ using System.Threading.Tasks;
 
 namespace AirBomber
 {
-    internal class SetGeneric
+    internal class SetGeneric<T>
+        where T : class
     {
+        /// <summary>
+        /// Массив объектов, которые храним
+        /// </summary>
+        private readonly T?[] _places;
+        /// <summary>
+        /// Количество объектов в массиве
+        /// </summary>
+        public int Count => _places.Length;
+        /// <summary>
+        /// Конструктор
+        /// </summary>
+        /// <param name="count"></param>
+        public SetGeneric(int count)
+        {
+            _places = new T?[count];
+        }
+        /// <summary>
+        /// Добавление объекта в набор
+        /// </summary>
+        /// <param name="plane">Добавляемый самолет</param>
+        /// <returns></returns>
+        public bool Insert(T plane)
+        {
+            // TODO вставка в начало набора
+            return true;
+        }
+        /// <summary>
+        /// Добавление объекта в набор на конкретную позицию
+        /// </summary>
+        /// <param name="plane">Добавляемый самолет</param>
+        /// <param name="position">Позиция</param>
+        /// <returns></returns>
+        public bool Insert(T plane, int position)
+        {
+            // TODO проверка позиции
+            // TODO проверка, что элемент массива по этой позиции пустой,если нет, то
+        // проверка, что после вставляемого элемента в массиве есть пустой элемент
+        // сдвиг всех объектов, находящихся справа от позиции до первого пустого элемента
+        // TODO вставка по позиции
+            _places[position] = plane;
+            return true;
+        }
+        /// <summary>
+        /// Удаление объекта из набора с конкретной позиции
+        /// </summary>
+        /// <param name="position"></param>
+        /// <returns></returns>
+        public bool Remove(int position)
+        {
+            // TODO проверка позиции
+            // TODO удаление объекта из массива, присвоив элементу массива значение null
+        return true;
+        }
+        /// <summary>
+        /// Получение объекта из набора по позиции
+        /// </summary>
+        /// <param name="position"></param>
+        /// <returns></returns>
+        public T? Get(int position)
+        {
+            // TODO проверка позиции
+            return _places[position];
+        }
+
     }
 }