diff --git a/Tank/Tank/CollectionGenericObjects/AbstractCompany.cs b/Tank/Tank/CollectionGenericObjects/AbstractCompany.cs index 626003b..1f7651d 100644 --- a/Tank/Tank/CollectionGenericObjects/AbstractCompany.cs +++ b/Tank/Tank/CollectionGenericObjects/AbstractCompany.cs @@ -9,12 +9,12 @@ public abstract class AbstractCompany /// /// Размер места (ширина) /// - protected readonly int _placeSizeWidth = 210; + protected readonly int _placeSizeWidth = 250; /// /// Размер места (высота) /// - protected readonly int _placeSizeHeight = 100; + protected readonly int _placeSizeHeight = 150; /// /// Ширина окна diff --git a/Tank/Tank/CollectionGenericObjects/CollectionType.cs b/Tank/Tank/CollectionGenericObjects/CollectionType.cs new file mode 100644 index 0000000..8db1291 --- /dev/null +++ b/Tank/Tank/CollectionGenericObjects/CollectionType.cs @@ -0,0 +1,22 @@ +namespace Tank.CollectionGenericObjects; + +/// +/// Тип коллекции +/// +public enum CollectionType +{ + /// + /// Неопределено + /// + None = 0, + + /// + /// Массив + /// + Massive = 1, + + /// + /// Список + /// + List = 2 +} \ No newline at end of file diff --git a/Tank/Tank/CollectionGenericObjects/ListGenericObjects.cs b/Tank/Tank/CollectionGenericObjects/ListGenericObjects.cs new file mode 100644 index 0000000..1bdc5d0 --- /dev/null +++ b/Tank/Tank/CollectionGenericObjects/ListGenericObjects.cs @@ -0,0 +1,71 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Tank.CollectionGenericObjects; + +public class ListGenericObjects : ICollectionGenericObjects + where T : class +{ + /// + /// Список объектов, которые храним + /// + private readonly List _collection; + /// + /// Максимально допустимое число объектов в списке + /// + private int _maxCount; + public int Count => _collection.Count; + public int SetMaxCount { set { if (value > 0) { _maxCount = value; } } } + /// + /// Конструктор + /// + public ListGenericObjects() + { + _collection = new(); + } + public T? Get(int position) + { + // TODO проверка позиции + if (position <= Count) + { + return _collection[position]; + } + else + return null; + } + public int Insert(T obj) + { + // TODO проверка, что не превышено максимальное количество элементов + // TODO вставка в конец набора + if (Count + 1 > _maxCount) + return -1; + _collection.Add(obj); + return Count; + } + public int Insert(T obj, int position) + { + // TODO проверка, что не превышено максимальное количество элементов + // TODO проверка позиции + // TODO вставка по позиции + if (Count + 1 > _maxCount) + return -1; + if (position < 0 || position > Count) + return -1; + _collection.Insert(position, obj); + return 1; + + } + public T? Remove(int position) + { + // TODO проверка позиции + // TODO удаление объекта из списка + if (position < 0 || position > Count) + return null; + T? temp = _collection[position]; + _collection.RemoveAt(position); + return temp; + } +} diff --git a/Tank/Tank/CollectionGenericObjects/StorageCollection.cs b/Tank/Tank/CollectionGenericObjects/StorageCollection.cs new file mode 100644 index 0000000..0e31968 --- /dev/null +++ b/Tank/Tank/CollectionGenericObjects/StorageCollection.cs @@ -0,0 +1,77 @@ +using Tank.CollectionGenericObjects; + +namespace Tank.CollectionGenericObjects; + +/// +/// Класс-хранилище коллекций +/// +/// +public class StorageCollection + where T : class +{ + /// + /// Словарь (хранилище) с коллекциями + /// + readonly Dictionary> _storages; + /// + /// Возвращение списка названий коллекций + /// + public List Keys => _storages.Keys.ToList(); + /// + /// Конструктор + /// + public StorageCollection() + { + _storages = new Dictionary>(); + } + /// + /// Добавление коллекции в хранилище + /// + /// Название коллекции + /// тип коллекции + public void AddCollection(string name, CollectionType collectionType) + { + // TODO проверка, что name не пустой и нет в словаре записи с таким ключом + // TODO Прописать логику для добавления + if (name == null || _storages.ContainsKey(name)) + return; + switch (collectionType) + { + case CollectionType.None: + return; + case CollectionType.Massive: + _storages[name] = new MassiveGenericObjects(); + return; + case CollectionType.List: + _storages[name] = new ListGenericObjects(); + return; + } + + } + /// + /// Удаление коллекции + /// + /// Название коллекции + public void DelCollection(string name) + { + // TODO Прописать логику для удаления коллекции + if (_storages.ContainsKey(name)) + _storages.Remove(name); + } + /// + /// Доступ к коллекции + /// + /// Название коллекции + /// + public ICollectionGenericObjects? this[string name] + { + get + { + // TODO Продумать логику получения объекта + if (name == null || !_storages.ContainsKey(name)) + return null; + return _storages[name]; + } + } + +} diff --git a/Tank/Tank/FormTankCollection.Designer.cs b/Tank/Tank/FormTankCollection.Designer.cs index 6f67715..cb5f01a 100644 --- a/Tank/Tank/FormTankCollection.Designer.cs +++ b/Tank/Tank/FormTankCollection.Designer.cs @@ -29,98 +29,215 @@ private void InitializeComponent() { groupBoxTools = new GroupBox(); - buttonRefresh = new Button(); - buttonGoToCheck = new Button(); - buttonDelTank = new Button(); - maskedTextBoxPosition = new MaskedTextBox(); - buttonAddMachine = new Button(); + panelCompanyTools = new Panel(); buttonAddTank = new Button(); + buttonAddMachine = new Button(); + maskedTextBoxPosition = new MaskedTextBox(); + buttonRefresh = new Button(); + buttonDelTank = new Button(); + buttonGoToCheck = new Button(); + buttonCreateCompany = new Button(); + panelStorage = new Panel(); + 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(buttonGoToCheck); - groupBoxTools.Controls.Add(buttonDelTank); - groupBoxTools.Controls.Add(maskedTextBoxPosition); - groupBoxTools.Controls.Add(buttonAddMachine); - groupBoxTools.Controls.Add(buttonAddTank); + groupBoxTools.Controls.Add(panelCompanyTools); + groupBoxTools.Controls.Add(buttonCreateCompany); + groupBoxTools.Controls.Add(panelStorage); groupBoxTools.Controls.Add(comboBoxSelectorCompany); groupBoxTools.Dock = DockStyle.Right; - groupBoxTools.Location = new Point(1079, 0); + groupBoxTools.Location = new Point(1174, 0); groupBoxTools.Name = "groupBoxTools"; - groupBoxTools.Size = new Size(371, 871); + groupBoxTools.Size = new Size(371, 1030); groupBoxTools.TabIndex = 0; groupBoxTools.TabStop = false; groupBoxTools.Text = "Инструменты"; // - // buttonRefresh + // panelCompanyTools // - buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonRefresh.Location = new Point(17, 698); - buttonRefresh.Name = "buttonRefresh"; - buttonRefresh.Size = new Size(342, 77); - buttonRefresh.TabIndex = 6; - buttonRefresh.Text = "Обновить"; - buttonRefresh.UseVisualStyleBackColor = true; - buttonRefresh.Click += ButtonRefresh_Click; + panelCompanyTools.Controls.Add(buttonAddTank); + panelCompanyTools.Controls.Add(buttonAddMachine); + panelCompanyTools.Controls.Add(maskedTextBoxPosition); + panelCompanyTools.Controls.Add(buttonRefresh); + panelCompanyTools.Controls.Add(buttonDelTank); + panelCompanyTools.Controls.Add(buttonGoToCheck); + panelCompanyTools.Dock = DockStyle.Bottom; + panelCompanyTools.Enabled = false; + panelCompanyTools.Location = new Point(3, 717); + panelCompanyTools.Name = "panelCompanyTools"; + panelCompanyTools.Size = new Size(365, 310); + panelCompanyTools.TabIndex = 9; + panelCompanyTools.Paint += panelCompanyTools_Paint; // - // buttonGoToCheck + // buttonAddTank // - buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonGoToCheck.Location = new Point(17, 554); - buttonGoToCheck.Name = "buttonGoToCheck"; - buttonGoToCheck.Size = new Size(342, 77); - buttonGoToCheck.TabIndex = 5; - buttonGoToCheck.Text = "Передать на тесты"; - buttonGoToCheck.UseVisualStyleBackColor = true; - buttonGoToCheck.Click += ButtonGoToCheck_Click; - // - // buttonDelTank - // - buttonDelTank.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonDelTank.Location = new Point(17, 403); - buttonDelTank.Name = "buttonDelTank"; - buttonDelTank.Size = new Size(342, 77); - buttonDelTank.TabIndex = 4; - buttonDelTank.Text = "Удалить танк"; - buttonDelTank.UseVisualStyleBackColor = true; - buttonDelTank.Click += ButtonRemoveCar_Click; - // - // maskedTextBoxPosition - // - maskedTextBoxPosition.Location = new Point(17, 308); - maskedTextBoxPosition.Mask = "00"; - maskedTextBoxPosition.Name = "maskedTextBoxPosition"; - maskedTextBoxPosition.Size = new Size(342, 39); - maskedTextBoxPosition.TabIndex = 3; - maskedTextBoxPosition.ValidatingType = typeof(int); + buttonAddTank.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonAddTank.Location = new Point(33, 3); + buttonAddTank.Name = "buttonAddTank"; + buttonAddTank.Size = new Size(307, 50); + buttonAddTank.TabIndex = 1; + buttonAddTank.Text = "Добавление танка"; + buttonAddTank.UseVisualStyleBackColor = true; + buttonAddTank.Click += ButtonAddTank_Click; // // buttonAddMachine // buttonAddMachine.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddMachine.Location = new Point(17, 196); + buttonAddMachine.Location = new Point(33, 59); buttonAddMachine.Name = "buttonAddMachine"; - buttonAddMachine.Size = new Size(342, 77); + buttonAddMachine.Size = new Size(307, 50); buttonAddMachine.TabIndex = 2; buttonAddMachine.Text = "Добавление машины"; buttonAddMachine.UseVisualStyleBackColor = true; buttonAddMachine.Click += ButtonAddMachine_Click; // - // buttonAddTank + // maskedTextBoxPosition // - buttonAddTank.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddTank.Location = new Point(17, 113); - buttonAddTank.Name = "buttonAddTank"; - buttonAddTank.Size = new Size(342, 77); - buttonAddTank.TabIndex = 1; - buttonAddTank.Text = "Добавление танка"; - buttonAddTank.UseVisualStyleBackColor = true; - buttonAddTank.Click += ButtonAddTank_Click; + maskedTextBoxPosition.Location = new Point(33, 126); + maskedTextBoxPosition.Mask = "00"; + maskedTextBoxPosition.Name = "maskedTextBoxPosition"; + maskedTextBoxPosition.Size = new Size(1116, 39); + maskedTextBoxPosition.TabIndex = 3; + maskedTextBoxPosition.ValidatingType = typeof(int); + // + // buttonRefresh + // + buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonRefresh.Location = new Point(33, 263); + buttonRefresh.Name = "buttonRefresh"; + buttonRefresh.Size = new Size(307, 38); + buttonRefresh.TabIndex = 6; + buttonRefresh.Text = "Обновить"; + buttonRefresh.UseVisualStyleBackColor = true; + buttonRefresh.Click += ButtonRefresh_Click; + // + // buttonDelTank + // + buttonDelTank.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonDelTank.Location = new Point(33, 171); + buttonDelTank.Name = "buttonDelTank"; + buttonDelTank.Size = new Size(307, 39); + buttonDelTank.TabIndex = 4; + buttonDelTank.Text = "Удалить танк"; + buttonDelTank.UseVisualStyleBackColor = true; + buttonDelTank.Click += ButtonRemoveCar_Click; + // + // buttonGoToCheck + // + buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonGoToCheck.Location = new Point(33, 216); + buttonGoToCheck.Name = "buttonGoToCheck"; + buttonGoToCheck.Size = new Size(307, 44); + buttonGoToCheck.TabIndex = 5; + buttonGoToCheck.Text = "Передать на тесты"; + buttonGoToCheck.UseVisualStyleBackColor = true; + buttonGoToCheck.Click += ButtonGoToCheck_Click; + // + // buttonCreateCompany + // + buttonCreateCompany.Location = new Point(17, 576); + buttonCreateCompany.Name = "buttonCreateCompany"; + buttonCreateCompany.Size = new Size(342, 46); + buttonCreateCompany.TabIndex = 8; + buttonCreateCompany.Text = "Создать компанию"; + buttonCreateCompany.UseVisualStyleBackColor = true; + buttonCreateCompany.Click += buttonCreateCompany_Click; + // + // panelStorage + // + panelStorage.Controls.Add(buttonCollectionDel); + panelStorage.Controls.Add(listBoxCollection); + panelStorage.Controls.Add(buttonCollectionAdd); + panelStorage.Controls.Add(radioButtonList); + panelStorage.Controls.Add(radioButtonMassive); + panelStorage.Controls.Add(textBoxCollectionName); + panelStorage.Controls.Add(labelCollectionName); + panelStorage.Dock = DockStyle.Top; + panelStorage.Location = new Point(3, 35); + panelStorage.Name = "panelStorage"; + panelStorage.Size = new Size(365, 489); + panelStorage.TabIndex = 7; + // + // buttonCollectionDel + // + buttonCollectionDel.Location = new Point(14, 420); + buttonCollectionDel.Name = "buttonCollectionDel"; + buttonCollectionDel.Size = new Size(342, 46); + buttonCollectionDel.TabIndex = 6; + buttonCollectionDel.Text = "Удалить коллекцию"; + buttonCollectionDel.UseVisualStyleBackColor = true; + buttonCollectionDel.Click += buttonCollectionDel_Click; + // + // listBoxCollection + // + listBoxCollection.FormattingEnabled = true; + listBoxCollection.ItemHeight = 32; + listBoxCollection.Location = new Point(14, 186); + listBoxCollection.Name = "listBoxCollection"; + listBoxCollection.Size = new Size(342, 228); + listBoxCollection.TabIndex = 5; + // + // buttonCollectionAdd + // + buttonCollectionAdd.Location = new Point(14, 134); + buttonCollectionAdd.Name = "buttonCollectionAdd"; + buttonCollectionAdd.Size = new Size(342, 46); + buttonCollectionAdd.TabIndex = 4; + buttonCollectionAdd.Text = "Добавить коллекцию"; + buttonCollectionAdd.UseVisualStyleBackColor = true; + buttonCollectionAdd.Click += buttonCollectionAdd_Click; + // + // radioButtonList + // + radioButtonList.AutoSize = true; + radioButtonList.Location = new Point(231, 92); + radioButtonList.Name = "radioButtonList"; + radioButtonList.Size = new Size(125, 36); + radioButtonList.TabIndex = 3; + radioButtonList.TabStop = true; + radioButtonList.Text = "Список"; + radioButtonList.UseVisualStyleBackColor = true; + // + // radioButtonMassive + // + radioButtonMassive.AutoSize = true; + radioButtonMassive.Location = new Point(14, 92); + radioButtonMassive.Name = "radioButtonMassive"; + radioButtonMassive.Size = new Size(128, 36); + radioButtonMassive.TabIndex = 2; + radioButtonMassive.TabStop = true; + radioButtonMassive.Text = "Массив"; + radioButtonMassive.UseVisualStyleBackColor = true; + // + // textBoxCollectionName + // + textBoxCollectionName.Location = new Point(14, 47); + textBoxCollectionName.Name = "textBoxCollectionName"; + textBoxCollectionName.Size = new Size(342, 39); + textBoxCollectionName.TabIndex = 1; + // + // labelCollectionName + // + labelCollectionName.AutoSize = true; + labelCollectionName.Location = new Point(66, 12); + labelCollectionName.Name = "labelCollectionName"; + labelCollectionName.Size = new Size(251, 32); + labelCollectionName.TabIndex = 0; + labelCollectionName.Text = "Название коллекции:"; // // comboBoxSelectorCompany // @@ -128,7 +245,7 @@ comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList; comboBoxSelectorCompany.FormattingEnabled = true; comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" }); - comboBoxSelectorCompany.Location = new Point(17, 53); + comboBoxSelectorCompany.Location = new Point(17, 530); comboBoxSelectorCompany.Name = "comboBoxSelectorCompany"; comboBoxSelectorCompany.Size = new Size(342, 40); comboBoxSelectorCompany.TabIndex = 0; @@ -139,7 +256,7 @@ pictureBox.Dock = DockStyle.Fill; pictureBox.Location = new Point(0, 0); pictureBox.Name = "pictureBox"; - pictureBox.Size = new Size(1079, 871); + pictureBox.Size = new Size(1174, 1030); pictureBox.TabIndex = 1; pictureBox.TabStop = false; // @@ -147,13 +264,16 @@ // AutoScaleDimensions = new SizeF(13F, 32F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(1450, 871); + ClientSize = new Size(1545, 1030); Controls.Add(pictureBox); Controls.Add(groupBoxTools); Name = "FormTankCollection"; 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 +289,15 @@ private MaskedTextBox maskedTextBoxPosition; private Button buttonRefresh; private ComboBox comboBoxSelectorCompany; + private Panel panelStorage; + private RadioButton radioButtonList; + private RadioButton radioButtonMassive; + private TextBox textBoxCollectionName; + private Label labelCollectionName; + private Button buttonCollectionDel; + private ListBox listBoxCollection; + private Button buttonCollectionAdd; + private Button buttonCreateCompany; + private Panel panelCompanyTools; } } \ No newline at end of file diff --git a/Tank/Tank/FormTankCollection.cs b/Tank/Tank/FormTankCollection.cs index 01419e5..dd89ab9 100644 --- a/Tank/Tank/FormTankCollection.cs +++ b/Tank/Tank/FormTankCollection.cs @@ -18,6 +18,7 @@ namespace Tank; public partial class FormTankCollection : Form { + private readonly StorageCollection _storageCollection; /// /// /// @@ -29,6 +30,7 @@ public partial class FormTankCollection : Form public FormTankCollection() { InitializeComponent(); + _storageCollection = new(); } /// @@ -38,13 +40,9 @@ public partial class FormTankCollection : Form /// private void ComboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e) { - switch (comboBoxSelectorCompany.Text) - { - case "Хранилище": - _company = new TankSharingService(pictureBox.Width, pictureBox.Height, new MassiveGenericObjects()); - break; - } + panelCompanyTools.Enabled = false; } + /// /// Добавление обычного автомобиля /// @@ -142,6 +140,18 @@ public partial class FormTankCollection : Form } } + private void RefreshListBoxItems() + { + 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); + } + } + } /// /// Передача объекта в другую форму /// @@ -187,4 +197,75 @@ public partial class FormTankCollection : 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); + RefreshListBoxItems(); + } + + private void buttonCollectionDel_Click(object sender, EventArgs e) + { + if (listBoxCollection.SelectedIndex < 0 || listBoxCollection.SelectedItems == null) + { + MessageBox.Show("Коллекция не выбрана"); + return; + } + if (MessageBox.Show("Удалить коллекцию?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) + { + return; + } + _storageCollection.DelCollection(listBoxCollection.SelectedItem.ToString() ?? string.Empty); + RefreshListBoxItems(); + } + /// + /// Обновление списка в listBoxCollection + /// + + + private void buttonCreateCompany_Click(object sender, EventArgs e) + { + if (listBoxCollection.SelectedIndex < 0 || listBoxCollection.SelectedItem == null) + { + MessageBox.Show("Коллекция не выбрана"); + return; + } + + ICollectionGenericObjects? collection = _storageCollection[listBoxCollection.SelectedItem.ToString() ?? string.Empty]; + if (collection == null) + { + MessageBox.Show("Коллекция не проинициализирована"); + return; + } + + switch (comboBoxSelectorCompany.Text) + { + case "Хранилище": + _company = new TankSharingService(pictureBox.Width, pictureBox.Height, collection); + break; + } + + panelCompanyTools.Enabled = true; + RefreshListBoxItems(); + + } + + private void panelCompanyTools_Paint(object sender, PaintEventArgs e) + { + + } } \ No newline at end of file