Лабараторная работа №4 1

ProjectWarmlyShip/ProjectWarmlyShip/CollectionGenericObjects/CollectionType.cs

@@ -0,0 +1,17 @@
+namespace ProjectWarmlyShip.CollectionGenericObjects;
+
+public enum CollectionType
+{
+    /// <summary>
+    /// Неопределено
+    /// </summary>
+    None = 0,
+    /// <summary>
+    /// Массив
+    /// </summary>
+    Massive = 1,
+    /// <summary>
+    /// Список
+    /// </summary>
+    List = 2
+}

ProjectWarmlyShip/ProjectWarmlyShip/CollectionGenericObjects/ListGenericObjects.cs

@@ -0,0 +1,58 @@
+using System;
+
+namespace ProjectWarmlyShip.CollectionGenericObjects;
+
+public class ListGenericObjects<T> : ICollectionGenericObjects<T>
+    where T : class
+{
+    /// <summary>
+    /// Список объектов, которые храним
+    /// </summary>
+    private readonly List<T?> _collection;
+    /// <summary>
+    /// Максимально допустимое число объектов в списке
+    /// </summary>
+    private int _maxCount;
+    public int Count => _collection.Count;
+    public int SetMaxCount { set { if (value > 0) { _maxCount = value; } } }
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    public ListGenericObjects()
+    {
+        _collection = new();
+    }
+    public T? Get(int position)
+    {
+        // TODO проверка позиции
+        if (position >= Count || position < 0) return null;
+        return _collection[position];
+    }
+    public int Insert(T obj)
+    {
+        // TODO проверка, что не превышено максимальное количество элементов
+        // TODO вставка в конец набора
+        if (Count == _maxCount) return -1;
+        _collection.Add(obj);
+        return Count;//возможна проблема
+    }
+    public int Insert(T obj, int position)
+    {
+        // TODO проверка, что не превышено максимальное количество элементов
+        // TODO проверка позиции
+        // TODO вставка по позиции
+        if (Count == _maxCount) return -1;
+        if (position >= Count || position < 0) return -1;
+        _collection.Insert(position, obj);
+        return position;
+    }
+    public T Remove(int position)
+    {
+        // TODO проверка позиции
+        // TODO удаление объекта из списка
+        if (position >= Count || position < 0) return null;
+        T obj = _collection[position];
+        _collection.RemoveAt(position);
+        return obj;
+    }
+}

ProjectWarmlyShip/ProjectWarmlyShip/CollectionGenericObjects/MassiveGenericObjects.cs

@@ -8,7 +8,23 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
     /// </summary>
     private T?[] _collection;
     public int Count => _collection.Length;
-    public int SetMaxCount { set { if (value > 0) { _collection = new T?[value]; } } }
+    public int SetMaxCount
+    {
+        set
+        {
+            if (value > 0)
+            {
+                if (_collection.Length > 0)
+                {
+                    Array.Resize(ref _collection, value);
+                }
+                else
+                {
+                    _collection = new T?[value];
+                }
+            }
+        }
+    }
     /// <summary>
     /// Конструктор
     /// </summary>
@@ -16,10 +32,11 @@ public class MassiveGenericObjects<T> : ICollectionGenericObjects<T>
     {
         _collection = Array.Empty<T?>();
     }
-    public T? Get(int position)
+    public T Get(int position)
     {
         // TODO проверка позиции
-        if (position >= _collection.Length || position < 0) return null; 
+        if (position >= _collection.Length || position < 0) 
+            return null; 
         return _collection[position];
     }
     public int Insert(T obj)

ProjectWarmlyShip/ProjectWarmlyShip/CollectionGenericObjects/StorageCollection.cs

@@ -0,0 +1,65 @@
+using ProjectWarmlyShip.Drawnings;
+
+namespace ProjectWarmlyShip.CollectionGenericObjects;
+
+public class StorageCollection<T>
+    where T : class
+{
+    /// <summary>
+    /// Словарь (хранилище) с коллекциями
+    /// </summary>
+    readonly Dictionary<string, ICollectionGenericObjects<T>> _storages;
+    /// <summary>
+    /// Возвращение списка названий коллекций
+    /// </summary>
+    public List<string> Keys => _storages.Keys.ToList();
+    /// <summary>
+    /// Конструктор
+    /// </summary>
+    public StorageCollection()
+    {
+        _storages = new Dictionary<string, ICollectionGenericObjects<T>>();
+    }
+    /// <summary>
+    /// Добавление коллекции в хранилище
+    /// </summary>
+    /// <param name="name">Название коллекции</param>
+    /// <param name="collectionType">тип коллекции</param>
+    public void AddCollection(string name, CollectionType collectionType)
+    {
+        // TODO проверка, что name не пустой и нет в словаре записи с таким ключом
+        // TODO Прописать логику для добавления
+        if (_storages.ContainsKey(name)) return;
+        if (collectionType == CollectionType.None) return;
+        else if (collectionType == CollectionType.Massive)
+            _storages[name] = new MassiveGenericObjects<T>();
+        else if (collectionType == CollectionType.List)
+            _storages[name] = new ListGenericObjects<T>();
+    }
+    /// <summary>
+    /// Удаление коллекции
+    /// </summary>
+    /// <param name="name">Название коллекции</param>
+    public void DelCollection(string name)
+    {
+
+        // TODO Прописать логику для удаления коллекции
+        if (_storages.ContainsKey(name)) 
+            _storages.Remove(name);
+    }
+    /// <summary>
+    /// Доступ к коллекции
+    /// </summary>
+    /// <param name="name">Название коллекции</param>
+    /// <returns></returns>
+    public ICollectionGenericObjects<T>? this[string name]
+    {
+        get
+        {
+            // TODO Продумать логику получения объекта
+            if (_storages.ContainsKey(name))
+                return _storages[name];
+            return null;
+        }
+    }
+}

ProjectWarmlyShip/ProjectWarmlyShip/FormShipCollection.Designer.cs

@@ -29,27 +29,35 @@
         private void InitializeComponent()
         {
             groupBoxTools = new GroupBox();
+            panelCompanyTools = new Panel();
+            buttonAddShip = new Button();
+            buttonAddWarmlyShip = new Button();
             buttonRefresh = new Button();
+            maskedTextBox = new MaskedTextBox();
             buttonGoToCheck = new Button();
             buttonRemoveShip = new Button();
-            maskedTextBox = new MaskedTextBox();
+            buttonCreateCompany = new Button();
-            buttonAddWarmlyShip = new Button();
+            panelStorage = new Panel();
-            buttonAddShip = new Button();
+            buttonCollectionDel = new Button();
+            listBoxCollection = new ListBox();
+            buttonCollectionAdd = new Button();
+            radioButtonList = new RadioButton();
+            radioButtonMassive = new RadioButton();
+            textBoxCollectionName = new TextBox();
+            labelCollectionName = new Label();
             comboBoxSelectorCompany = new ComboBox();
             pictureBox = new PictureBox();
             groupBoxTools.SuspendLayout();
+            panelCompanyTools.SuspendLayout();
+            panelStorage.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
             SuspendLayout();
             // 
             // groupBoxTools
             // 
-            groupBoxTools.Controls.Add(buttonRefresh);
+            groupBoxTools.Controls.Add(panelCompanyTools);
-            groupBoxTools.Controls.Add(buttonGoToCheck);
+            groupBoxTools.Controls.Add(buttonCreateCompany);
-            groupBoxTools.Controls.Add(buttonRemoveShip);
+            groupBoxTools.Controls.Add(panelStorage);
-            groupBoxTools.Controls.Add(maskedTextBox);
-            groupBoxTools.Controls.Add(buttonAddWarmlyShip);
-            groupBoxTools.Controls.Add(buttonAddShip);
-            groupBoxTools.Controls.Add(comboBoxSelectorCompany);
             groupBoxTools.Dock = DockStyle.Right;
             groupBoxTools.Location = new Point(887, 0);
             groupBoxTools.Name = "groupBoxTools";
@@ -58,10 +66,46 @@
             groupBoxTools.TabStop = false;
             groupBoxTools.Text = "Инструменты";
             // 
+            // panelCompanyTools
+            // 
+            panelCompanyTools.Controls.Add(buttonAddShip);
+            panelCompanyTools.Controls.Add(buttonAddWarmlyShip);
+            panelCompanyTools.Controls.Add(buttonRefresh);
+            panelCompanyTools.Controls.Add(maskedTextBox);
+            panelCompanyTools.Controls.Add(buttonGoToCheck);
+            panelCompanyTools.Controls.Add(buttonRemoveShip);
+            panelCompanyTools.Enabled = false;
+            panelCompanyTools.Location = new Point(6, 333);
+            panelCompanyTools.Name = "panelCompanyTools";
+            panelCompanyTools.Size = new Size(200, 280);
+            panelCompanyTools.TabIndex = 2;
+            // 
+            // buttonAddShip
+            // 
+            buttonAddShip.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonAddShip.Location = new Point(3, 3);
+            buttonAddShip.Name = "buttonAddShip";
+            buttonAddShip.Size = new Size(128, 38);
+            buttonAddShip.TabIndex = 1;
+            buttonAddShip.Text = "Добавление судна";
+            buttonAddShip.UseVisualStyleBackColor = true;
+            buttonAddShip.Click += buttonAddShip_Click;
+            // 
+            // buttonAddWarmlyShip
+            // 
+            buttonAddWarmlyShip.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonAddWarmlyShip.Location = new Point(3, 47);
+            buttonAddWarmlyShip.Name = "buttonAddWarmlyShip";
+            buttonAddWarmlyShip.Size = new Size(128, 40);
+            buttonAddWarmlyShip.TabIndex = 2;
+            buttonAddWarmlyShip.Text = "Добавление теплохода";
+            buttonAddWarmlyShip.UseVisualStyleBackColor = true;
+            buttonAddWarmlyShip.Click += buttonAddWarmlyShip_Click;
+            // 
             // buttonRefresh
             // 
             buttonRefresh.Anchor = AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
-            buttonRefresh.Location = new Point(6, 544);
+            buttonRefresh.Location = new Point(3, 214);
             buttonRefresh.Name = "buttonRefresh";
             buttonRefresh.Size = new Size(128, 40);
             buttonRefresh.TabIndex = 6;
@@ -69,10 +113,19 @@
             buttonRefresh.UseVisualStyleBackColor = true;
             buttonRefresh.Click += buttonRefresh_Click;
             // 
+            // maskedTextBox
+            // 
+            maskedTextBox.Location = new Point(3, 93);
+            maskedTextBox.Mask = "00";
+            maskedTextBox.Name = "maskedTextBox";
+            maskedTextBox.Size = new Size(128, 23);
+            maskedTextBox.TabIndex = 3;
+            maskedTextBox.ValidatingType = typeof(int);
+            // 
             // buttonGoToCheck
             // 
             buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonGoToCheck.Location = new Point(6, 324);
+            buttonGoToCheck.Location = new Point(3, 168);
             buttonGoToCheck.Name = "buttonGoToCheck";
             buttonGoToCheck.Size = new Size(128, 40);
             buttonGoToCheck.TabIndex = 5;
@@ -83,7 +136,7 @@
             // buttonRemoveShip
             // 
             buttonRemoveShip.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
-            buttonRemoveShip.Location = new Point(6, 250);
+            buttonRemoveShip.Location = new Point(3, 122);
             buttonRemoveShip.Name = "buttonRemoveShip";
             buttonRemoveShip.Size = new Size(128, 40);
             buttonRemoveShip.TabIndex = 4;
@@ -91,36 +144,98 @@
             buttonRemoveShip.UseVisualStyleBackColor = true;
             buttonRemoveShip.Click += buttonRemoveShip_Click;
             // 
-            // maskedTextBox
+            // buttonCreateCompany
             // 
-            maskedTextBox.Location = new Point(6, 221);
+            buttonCreateCompany.Location = new Point(6, 304);
-            maskedTextBox.Mask = "00";
+            buttonCreateCompany.Name = "buttonCreateCompany";
-            maskedTextBox.Name = "maskedTextBox";
+            buttonCreateCompany.Size = new Size(128, 23);
-            maskedTextBox.Size = new Size(128, 23);
+            buttonCreateCompany.TabIndex = 8;
-            maskedTextBox.TabIndex = 3;
+            buttonCreateCompany.Text = "Создать компанию";
-            maskedTextBox.ValidatingType = typeof(int);
+            buttonCreateCompany.UseVisualStyleBackColor = true;
+            buttonCreateCompany.Click += buttonCreateCompany_Click;
             // 
-            // buttonAddWarmlyShip
+            // panelStorage
             // 
-            buttonAddWarmlyShip.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            panelStorage.Controls.Add(buttonCollectionDel);
-            buttonAddWarmlyShip.Location = new Point(6, 131);
+            panelStorage.Controls.Add(listBoxCollection);
-            buttonAddWarmlyShip.Name = "buttonAddWarmlyShip";
+            panelStorage.Controls.Add(buttonCollectionAdd);
-            buttonAddWarmlyShip.Size = new Size(128, 40);
+            panelStorage.Controls.Add(radioButtonList);
-            buttonAddWarmlyShip.TabIndex = 2;
+            panelStorage.Controls.Add(radioButtonMassive);
-            buttonAddWarmlyShip.Text = "Добавление теплохода";
+            panelStorage.Controls.Add(textBoxCollectionName);
-            buttonAddWarmlyShip.UseVisualStyleBackColor = true;
+            panelStorage.Controls.Add(labelCollectionName);
-            buttonAddWarmlyShip.Click += buttonAddWarmlyShip_Click;
+            panelStorage.Controls.Add(comboBoxSelectorCompany);
+            panelStorage.Dock = DockStyle.Top;
+            panelStorage.Location = new Point(3, 19);
+            panelStorage.Name = "panelStorage";
+            panelStorage.Size = new Size(140, 279);
+            panelStorage.TabIndex = 7;
             // 
-            // buttonAddShip
+            // buttonCollectionDel
             // 
-            buttonAddShip.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+            buttonCollectionDel.Location = new Point(3, 216);
-            buttonAddShip.Location = new Point(6, 87);
+            buttonCollectionDel.Name = "buttonCollectionDel";
-            buttonAddShip.Name = "buttonAddShip";
+            buttonCollectionDel.Size = new Size(132, 23);
-            buttonAddShip.Size = new Size(128, 38);
+            buttonCollectionDel.TabIndex = 6;
-            buttonAddShip.TabIndex = 1;
+            buttonCollectionDel.Text = "Удалить коллецию";
-            buttonAddShip.Text = "Добавление судна";
+            buttonCollectionDel.UseVisualStyleBackColor = true;
-            buttonAddShip.UseVisualStyleBackColor = true;
+            buttonCollectionDel.Click += buttonCollectionDel_Click;
-            buttonAddShip.Click += buttonAddShip_Click;
+            // 
+            // listBoxCollection
+            // 
+            listBoxCollection.FormattingEnabled = true;
+            listBoxCollection.ItemHeight = 15;
+            listBoxCollection.Location = new Point(3, 101);
+            listBoxCollection.Name = "listBoxCollection";
+            listBoxCollection.Size = new Size(134, 109);
+            listBoxCollection.TabIndex = 5;
+            // 
+            // buttonCollectionAdd
+            // 
+            buttonCollectionAdd.Location = new Point(3, 72);
+            buttonCollectionAdd.Name = "buttonCollectionAdd";
+            buttonCollectionAdd.Size = new Size(128, 23);
+            buttonCollectionAdd.TabIndex = 4;
+            buttonCollectionAdd.Text = "Добавить коллекцию";
+            buttonCollectionAdd.UseVisualStyleBackColor = true;
+            buttonCollectionAdd.Click += buttonCollectionAdd_Click;
+            // 
+            // radioButtonList
+            // 
+            radioButtonList.AutoSize = true;
+            radioButtonList.Location = new Point(71, 47);
+            radioButtonList.Name = "radioButtonList";
+            radioButtonList.Size = new Size(66, 19);
+            radioButtonList.TabIndex = 3;
+            radioButtonList.TabStop = true;
+            radioButtonList.Text = "Список";
+            radioButtonList.UseVisualStyleBackColor = true;
+            // 
+            // radioButtonMassive
+            // 
+            radioButtonMassive.AutoSize = true;
+            radioButtonMassive.Location = new Point(3, 47);
+            radioButtonMassive.Name = "radioButtonMassive";
+            radioButtonMassive.Size = new Size(67, 19);
+            radioButtonMassive.TabIndex = 2;
+            radioButtonMassive.TabStop = true;
+            radioButtonMassive.Text = "Массив";
+            radioButtonMassive.UseVisualStyleBackColor = true;
+            // 
+            // textBoxCollectionName
+            // 
+            textBoxCollectionName.Location = new Point(3, 18);
+            textBoxCollectionName.Name = "textBoxCollectionName";
+            textBoxCollectionName.Size = new Size(128, 23);
+            textBoxCollectionName.TabIndex = 1;
+            // 
+            // labelCollectionName
+            // 
+            labelCollectionName.AutoSize = true;
+            labelCollectionName.Location = new Point(3, 0);
+            labelCollectionName.Name = "labelCollectionName";
+            labelCollectionName.Size = new Size(125, 15);
+            labelCollectionName.TabIndex = 0;
+            labelCollectionName.Text = "Название коллекции:";
             // 
             // comboBoxSelectorCompany
             // 
@@ -128,11 +243,11 @@
             comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList;
             comboBoxSelectorCompany.FormattingEnabled = true;
             comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" });
-            comboBoxSelectorCompany.Location = new Point(6, 22);
+            comboBoxSelectorCompany.Location = new Point(3, 256);
             comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
-            comboBoxSelectorCompany.Size = new Size(134, 23);
+            comboBoxSelectorCompany.Size = new Size(128, 23);
             comboBoxSelectorCompany.TabIndex = 0;
-            comboBoxSelectorCompany.SelectedIndexChanged += comboBoxSelectorCompany_SelectedIndexChanged;
+            comboBoxSelectorCompany.SelectedIndexChanged += ComboBoxSelectorCompany_SelectedIndexChanged;
             // 
             // pictureBox
             // 
@@ -153,7 +268,10 @@
             Name = "FormShipCollection";
             Text = "Коллекция судов";
             groupBoxTools.ResumeLayout(false);
-            groupBoxTools.PerformLayout();
+            panelCompanyTools.ResumeLayout(false);
+            panelCompanyTools.PerformLayout();
+            panelStorage.ResumeLayout(false);
+            panelStorage.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
             ResumeLayout(false);
         }
@@ -169,5 +287,15 @@
         private MaskedTextBox maskedTextBox;
         private PictureBox pictureBox;
         private Button buttonRefresh;
+        private Panel panelStorage;
+        private RadioButton radioButtonList;
+        private RadioButton radioButtonMassive;
+        private TextBox textBoxCollectionName;
+        private Label labelCollectionName;
+        private Button buttonCreateCompany;
+        private Button buttonCollectionDel;
+        private ListBox listBoxCollection;
+        private Button buttonCollectionAdd;
+        private Panel panelCompanyTools;
     }
 }

ProjectWarmlyShip/ProjectWarmlyShip/FormShipCollection.cs

@@ -6,18 +6,15 @@ namespace ProjectWarmlyShip;
 public partial class FormShipCollection : Form
 {
     private AbstractCompany? _company = null;
+    private readonly StorageCollection<DrawningShip> _storageCollection;
     public FormShipCollection()
     {
         InitializeComponent();
+        _storageCollection = new();
     }
-    private void comboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e)
+    private void ComboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e)
     {
-        switch (comboBoxSelectorCompany.Text)
+        panelCompanyTools.Enabled = false;
-        {
-            case "Хранилище":
-                _company = new ShipPortService(pictureBox.Width, pictureBox.Height, new MassiveGenericObjects<DrawningShip>());
-                break;
-        }
     }
     private void CreateObject(string type)
     {
@@ -127,4 +124,78 @@ public partial class FormShipCollection : Form
         }
         pictureBox.Image = _company.Show();
     }
+    private void buttonCollectionAdd_Click(object sender, EventArgs e)
+    {
+        if (string.IsNullOrEmpty(textBoxCollectionName.Text) || (!radioButtonList.Checked && !radioButtonMassive.Checked))
+        {
+            MessageBox.Show("Не все данные заполнены", "Ошибка",
+            MessageBoxButtons.OK, MessageBoxIcon.Error);
+            return;
+        }
+        CollectionType collectionType = CollectionType.None;
+        if (radioButtonMassive.Checked)
+        {
+            collectionType = CollectionType.Massive;
+        }
+        else if (radioButtonList.Checked)
+        {
+            collectionType = CollectionType.List;
+        }
+        _storageCollection.AddCollection(textBoxCollectionName.Text, collectionType);
+        RerfreshListBoxItems();
+    }
+    private void RerfreshListBoxItems()
+    {
+        listBoxCollection.Items.Clear();
+        for (int i = 0; i < _storageCollection.Keys?.Count; ++i)
+        {
+            string? colName = _storageCollection.Keys?[i];
+            if (!string.IsNullOrEmpty(colName))
+            {
+                listBoxCollection.Items.Add(colName);
+            }
+        }
+    }
+    private void buttonCollectionDel_Click(object sender, EventArgs e)
+    {
+        // TODO прописать логику удаления элемента из коллекции
+        // нужно убедиться, что есть выбранная коллекция
+        // спросить у пользователя через MessageBox, что он подтверждает, что хочет удалить запись
+        // удалить и обновить ListBox
+        if (listBoxCollection.SelectedIndex < 0 || listBoxCollection.SelectedItem == null)
+        {
+            MessageBox.Show("Коллекция не выбрана");
+            return;
+        }
+        if (MessageBox.Show("Удалить коллекцию?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+        {
+            return;
+        }
+        _storageCollection.DelCollection(listBoxCollection.SelectedItem.ToString());
+        RerfreshListBoxItems();
+    }
+    private void buttonCreateCompany_Click(object sender, EventArgs e)
+    {
+        if (listBoxCollection.SelectedIndex < 0 || listBoxCollection.SelectedItem == null)
+        {
+            MessageBox.Show("Коллекция не выбрана");
+            return;
+        }
+        ICollectionGenericObjects<DrawningShip>? collection =
+            _storageCollection[listBoxCollection.SelectedItem.ToString() ?? string.Empty];
+        if (collection == null)
+        {
+            MessageBox.Show("Коллекция не проинициализирована");
+            return;
+        }
+        switch (comboBoxSelectorCompany.Text)
+        {
+            case "Хранилище":
+                _company = new ShipPortService(pictureBox.Width, pictureBox.Height, collection);
+                break;
+        }
+        panelCompanyTools.Enabled = true;
+        RerfreshListBoxItems();
+    }
 }
+