Pibd-13_Garifullin_F.M_LabWork04 #13

Closed
Garifullin_Farid wants to merge 3 commits from LabWork_4 into LabWork_3
7 changed files with 492 additions and 189 deletions
Showing only changes of commit 67456c2de9 - Show all commits

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

@ -7,42 +7,44 @@
public interface ICollectionGenericObjects<T>
where T : class
{
/// Количество объектов в коллекции
/// </summary>
int Count { get; }
/// </summary>
/// Количество объектов в коллекции
/// </summary>
int Count { get; }
/// <summary>
/// Установка максимального количества элементов
/// </summary>
int SetMaxCount { set; }
/// <summary>
/// Установка максимального количества элементов
/// </summary>
int SetMaxCount { set; }
/// <summary>
/// Добавление объекта в коллекцию
/// </summary>
/// <param name="obj">Добавляемый объект</param>
/// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
int Insert(T obj);
/// <summary>
/// Добавление объекта в коллекцию
/// </summary>
/// <param name="obj">Добавляемый объект</param>
/// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
int Insert(T obj);
/// <summary>
/// Добавление объекта в коллекцию на конкретную позицию
/// </summary>
/// <param name="obj">Добавляемый объект</param>
/// <param name="position">Позиция</param>
/// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
int Insert(T obj, int position);
/// <summary>
/// Добавление объекта в коллекцию на конкретную позицию
/// </summary>
/// <param name="obj">Добавляемый объект</param>
/// <param name="position">Позиция</param>
/// <returns>true - вставка прошла удачно, false - вставка не удалась</returns>
int Insert(T obj, int position);
/// <summary>
/// Удаление объекта из коллекции с конкретной позиции
/// </summary>
/// <param name="position">Позиция</param>
/// <returns>true - удаление прошло удачно, false - удаление не удалось</returns>
T? Remove(int position);
/// <summary>
/// Удаление объекта из коллекции с конкретной позиции
/// </summary>
/// <param name="position">Позиция</param>
/// <returns>true - удаление прошло удачно, false - удаление не удалось</returns>
T? Remove(int position);
/// <summary>
/// Получение объекта по позиции
/// </summary>
/// <param name="position">Позиция</param>
/// <returns>Объект</returns>
T? Get(int position);
/// <summary>
/// Получение объекта по позиции
/// </summary>
/// <param name="position">Позиция</param>
/// <returns>Объект</returns>
T? Get(int position);
}
}

@ -0,0 +1,70 @@
using ProjectTank.CollectionGenericObjects;
/// <summary>
/// Параметризованный набор объектов
/// </summary>
/// <typeparam name="T">Параметр: ограничение - ссылочный тип</typeparam>
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)
{
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;
}
}

@ -0,0 +1,73 @@

namespace ProjectTank.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 (name == null || _storages.ContainsKey(name))
return;
switch (collectionType)
{
case CollectionType.None:
return;
case CollectionType.Massive:
_storages[name] = new MassiveGenericObjects<T>();
return;
case CollectionType.List:
_storages[name] = new ListGenericObjects<T>();
return;
}
}
/// <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 (name == null || !_storages.ContainsKey(name))
return null;
return _storages[name];
}
}
}
}

@ -1,9 +1,8 @@
using ProjectTank.Drawning;
using ProjectTank.Entities;
using ProjectTank.MovementStrategy;
using ProjectTank.Drawning;
using ProjectTank.MovementStrategy;
namespace ProjectTank
{
@ -16,14 +15,13 @@ namespace ProjectTank
/// Поле-объект для прорисовки объекта
/// </summary>
private DrawningTank? _drawningTank;
private DrawningTank? _drawningTank;
/// <summary>
/// Стратегия перемещения
/// Стратегия перемещения
/// </summary>
private AbstractStrategy? _strategy;
private AbstractStrategy? _strategy;
public DrawningTank SetTank
{
@ -51,7 +49,6 @@ namespace ProjectTank
/// </summary>
private void Draw()
{
if (_drawningTank == null)
if (_drawningTank == null)
{
return;
@ -59,37 +56,9 @@ namespace ProjectTank
Bitmap bmp = new(pictureBoxBattleTank.Width, pictureBoxBattleTank.Height);
Graphics gr = Graphics.FromImage(bmp);
_drawningTank.DrawTransport(gr);
_drawningTank.DrawTransport(gr);
pictureBoxBattleTank.Image = bmp;
}
/// <summary>
/// Создание объекта класса-перемещения
/// </summary>
/// <param name="type">Тип создаваемого объекта</param>
private void CreateObject(string type)
{
Random random = new Random();
switch (type)
{
case nameof(DrawningTank):
_drawningTank = new DrawningTank(random.Next(100, 300), random.Next(1000, 3000),
Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)));
break;
case nameof(DrawningBattleTank):
_drawningTank = new DrawningBattleTank(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)));
break;
default:
return;
}
_drawningTank.SetPictureSize(pictureBoxBattleTank.Width, pictureBoxBattleTank.Height);
_drawningTank.SetPosition(random.Next(10, 100), random.Next(10, 100));
_strategy = null;
СomboBoxStrategy.Enabled = true;
Draw();
}
/// <summary>
/// Создание объекта класса-перемещения
/// </summary>
@ -124,11 +93,6 @@ namespace ProjectTank
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void ButtonCreateButtleTank_Ckick(object sender, EventArgs e) => CreateObject(nameof(DrawningBattleTank));
private void ButtonCreateTank_Ckick(object sender, EventArgs e) => CreateObject(nameof(DrawningTank));
private void ButtonCreateButtleTank_Ckick(object sender, EventArgs e) => CreateObject(nameof(DrawningBattleTank));
private void ButtonCreateTank_Ckick(object sender, EventArgs e) => CreateObject(nameof(DrawningTank));
@ -139,7 +103,6 @@ namespace ProjectTank
/// <param name="e"></param>
private void ButtonMove_Click(object sender, EventArgs e)
{
if (_drawningTank == null)
if (_drawningTank == null)
{
return;
@ -149,19 +112,15 @@ namespace ProjectTank
switch (name)
{
case "buttonUp":
result = _drawningTank.MoveTransport(DirectionType.Up);
result = _drawningTank.MoveTransport(DirectionType.Up);
break;
case "buttonLeft":
result = _drawningTank.MoveTransport(DirectionType.Left);
result = _drawningTank.MoveTransport(DirectionType.Left);
break;
case "buttonRight":
result = _drawningTank.MoveTransport(DirectionType.Right);
result = _drawningTank.MoveTransport(DirectionType.Right);
break;
case "buttonDown":
result = _drawningTank.MoveTransport(DirectionType.Down);
result = _drawningTank.MoveTransport(DirectionType.Down);
break;
}
@ -210,45 +169,8 @@ namespace ProjectTank
}
}
/// <summary>
/// Обработка нажатия кнопки "Шаг"
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void ButtonStrategyStep_Ckick(object sender, EventArgs e)
{
if (_drawningTank == null)
{
return;
}
if (СomboBoxStrategy.Enabled)
{
_strategy = СomboBoxStrategy.SelectedIndex switch
{
0 => new MoveToCenter(),
1 => new MoveToBorder(),
_ => null,
};
if (_strategy == null)
{
return;
}
_strategy.SetData(new MoveableTank(_drawningTank),
pictureBoxBattleTank.Width, pictureBoxBattleTank.Height);
}
if (_strategy == null)
{
return;
}
СomboBoxStrategy.Enabled = false;
_strategy.MakeStep();
Draw();
if (_strategy.GetStatus() == StrategyStatus.Finish)
{
СomboBoxStrategy.Enabled = true;
_strategy = null;
}
}
}
}

@ -29,98 +29,213 @@
private void InitializeComponent()
{
groupBoxTools = new GroupBox();
buttonRefresh = new Button();
buttonGoToCheck = new Button();
buttonRemoveTank = new Button();
maskedTextBox = new MaskedTextBox();
buttonAddBattleTank = new Button();
panelCompanyTools = new Panel();
buttonAddTank = new Button();
buttonAddBattleTank = new Button();
maskedTextBox = new MaskedTextBox();
buttonRefresh = new Button();
buttonRemoveTank = new Button();
buttonGoToCheck = new Button();
buttonCreateCompany = new Button();
panelStorage = new Panel();
buttonCollectionDel = new Button();
listBoxСollection = 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(buttonRemoveTank);
groupBoxTools.Controls.Add(maskedTextBox);
groupBoxTools.Controls.Add(buttonAddBattleTank);
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(613, 0);
groupBoxTools.Location = new Point(815, 0);
groupBoxTools.Name = "groupBoxTools";
groupBoxTools.Size = new Size(187, 450);
groupBoxTools.Size = new Size(187, 610);
groupBoxTools.TabIndex = 0;
groupBoxTools.TabStop = false;
groupBoxTools.Text = "инструменты";
//
// buttonRefresh
// panelCompanyTools
//
buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
buttonRefresh.Location = new Point(6, 379);
buttonRefresh.Name = "buttonRefresh";
buttonRefresh.Size = new Size(175, 35);
buttonRefresh.TabIndex = 6;
buttonRefresh.Text = "Обновить";
buttonRefresh.UseVisualStyleBackColor = true;
buttonRefresh.Click += ButtonRefresh_Click;
panelCompanyTools.Controls.Add(buttonAddTank);
panelCompanyTools.Controls.Add(buttonAddBattleTank);
panelCompanyTools.Controls.Add(maskedTextBox);
panelCompanyTools.Controls.Add(buttonRefresh);
panelCompanyTools.Controls.Add(buttonRemoveTank);
panelCompanyTools.Controls.Add(buttonGoToCheck);
panelCompanyTools.Enabled = false;
panelCompanyTools.Location = new Point(3, 372);
panelCompanyTools.Name = "panelCompanyTools";
panelCompanyTools.Size = new Size(184, 238);
panelCompanyTools.TabIndex = 8;
//
// buttonGoToCheck
// buttonAddTank
//
buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
buttonGoToCheck.Location = new Point(6, 302);
buttonGoToCheck.Name = "buttonGoToCheck";
buttonGoToCheck.Size = new Size(175, 35);
buttonGoToCheck.TabIndex = 5;
buttonGoToCheck.Text = "Передать на тесты";
buttonGoToCheck.UseVisualStyleBackColor = true;
buttonGoToCheck.Click += ButtonGoToCheck_Click;
//
// buttonRemoveTank
//
buttonRemoveTank.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
buttonRemoveTank.Location = new Point(6, 241);
buttonRemoveTank.Name = "buttonRemoveTank";
buttonRemoveTank.Size = new Size(175, 35);
buttonRemoveTank.TabIndex = 4;
buttonRemoveTank.Text = "Удаление танка";
buttonRemoveTank.UseVisualStyleBackColor = true;
buttonRemoveTank.Click += buttonRemoveTank_Click;
//
// maskedTextBox
//
maskedTextBox.Location = new Point(6, 212);
maskedTextBox.Mask = "00";
maskedTextBox.Name = "maskedTextBox";
maskedTextBox.Size = new Size(169, 23);
maskedTextBox.TabIndex = 3;
maskedTextBox.ValidatingType = typeof(int);
buttonAddTank.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
buttonAddTank.Location = new Point(6, 3);
buttonAddTank.Name = "buttonAddTank";
buttonAddTank.Size = new Size(169, 35);
buttonAddTank.TabIndex = 1;
buttonAddTank.Text = "Добавление танка";
buttonAddTank.UseVisualStyleBackColor = true;
buttonAddTank.Click += ButtonAddTank_Click;
//
// buttonAddBattleTank
//
buttonAddBattleTank.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
buttonAddBattleTank.Location = new Point(6, 133);
buttonAddBattleTank.Location = new Point(6, 44);
buttonAddBattleTank.Name = "buttonAddBattleTank";
buttonAddBattleTank.Size = new Size(175, 35);
buttonAddBattleTank.Size = new Size(169, 35);
buttonAddBattleTank.TabIndex = 2;
buttonAddBattleTank.Text = "Добавление боевого танка";
buttonAddBattleTank.UseVisualStyleBackColor = true;
buttonAddBattleTank.Click += ButtonAddBattleTank_Click;
//
// buttonAddTank
// maskedTextBox
//
buttonAddTank.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
buttonAddTank.Location = new Point(6, 92);
buttonAddTank.Name = "buttonAddTank";
buttonAddTank.Size = new Size(175, 35);
buttonAddTank.TabIndex = 1;
buttonAddTank.Text = "Добавление танка";
buttonAddTank.UseVisualStyleBackColor = true;
buttonAddTank.Click += ButtonAddTank_Click;
maskedTextBox.Location = new Point(6, 85);
maskedTextBox.Mask = "00";
maskedTextBox.Name = "maskedTextBox";
maskedTextBox.Size = new Size(166, 23);
maskedTextBox.TabIndex = 3;
maskedTextBox.ValidatingType = typeof(int);
//
// buttonRefresh
//
buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
buttonRefresh.Location = new Point(3, 200);
buttonRefresh.Name = "buttonRefresh";
buttonRefresh.Size = new Size(166, 35);
buttonRefresh.TabIndex = 6;
buttonRefresh.Text = "Обновить";
buttonRefresh.UseVisualStyleBackColor = true;
buttonRefresh.Click += ButtonRefresh_Click;
//
// buttonRemoveTank
//
buttonRemoveTank.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
buttonRemoveTank.Location = new Point(3, 114);
buttonRemoveTank.Name = "buttonRemoveTank";
buttonRemoveTank.Size = new Size(169, 35);
buttonRemoveTank.TabIndex = 4;
buttonRemoveTank.Text = "Удаление танка";
buttonRemoveTank.UseVisualStyleBackColor = true;
buttonRemoveTank.Click += buttonRemoveTank_Click;
//
// buttonGoToCheck
//
buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
buttonGoToCheck.Location = new Point(6, 159);
buttonGoToCheck.Name = "buttonGoToCheck";
buttonGoToCheck.Size = new Size(159, 35);
buttonGoToCheck.TabIndex = 5;
buttonGoToCheck.Text = "Передать на тесты";
buttonGoToCheck.UseVisualStyleBackColor = true;
buttonGoToCheck.Click += ButtonGoToCheck_Click;
//
// buttonCreateCompany
//
buttonCreateCompany.Location = new Point(6, 334);
buttonCreateCompany.Name = "buttonCreateCompany";
buttonCreateCompany.Size = new Size(175, 32);
buttonCreateCompany.TabIndex = 7;
buttonCreateCompany.Text = "Создать компанию";
buttonCreateCompany.UseVisualStyleBackColor = true;
buttonCreateCompany.Click += buttonCreateCompany_Click;
//
// panelStorage
//
panelStorage.Controls.Add(buttonCollectionDel);
panelStorage.Controls.Add(listBoxСollection);
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, 19);
panelStorage.Name = "panelStorage";
panelStorage.Size = new Size(181, 280);
panelStorage.TabIndex = 7;
//
// buttonCollectionDel
//
buttonCollectionDel.Location = new Point(3, 235);
buttonCollectionDel.Name = "buttonCollectionDel";
buttonCollectionDel.Size = new Size(175, 31);
buttonCollectionDel.TabIndex = 6;
buttonCollectionDel.Text = "Удалить Коллекцию";
buttonCollectionDel.UseVisualStyleBackColor = true;
buttonCollectionDel.Click += buttonCollectionDel_Click;
//
// listBoxСollection
//
listBoxСollection.FormattingEnabled = true;
listBoxСollection.ItemHeight = 15;
listBoxСollection.Location = new Point(3, 123);
listBoxСollection.Name = "listBoxСollection";
listBoxСollection.Size = new Size(169, 94);
listBoxСollection.TabIndex = 5;
//
// buttonCollectionAdd
//
buttonCollectionAdd.Location = new Point(3, 94);
buttonCollectionAdd.Name = "buttonCollectionAdd";
buttonCollectionAdd.Size = new Size(175, 23);
buttonCollectionAdd.TabIndex = 4;
buttonCollectionAdd.Text = "Добавить Коллекцию";
buttonCollectionAdd.UseVisualStyleBackColor = true;
buttonCollectionAdd.Click += buttonCollectionAdd_Click;
//
// radioButtonList
//
radioButtonList.AutoSize = true;
radioButtonList.Location = new Point(106, 70);
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(13, 70);
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, 41);
textBoxCollectionName.Name = "textBoxCollectionName";
textBoxCollectionName.Size = new Size(175, 23);
textBoxCollectionName.TabIndex = 1;
//
// labelCollectionName
//
labelCollectionName.AutoSize = true;
labelCollectionName.Location = new Point(30, 13);
labelCollectionName.Name = "labelCollectionName";
labelCollectionName.Size = new Size(120, 15);
labelCollectionName.TabIndex = 0;
labelCollectionName.Text = "нвзвание коллекции";
//
// comboBoxSelectorCompany
//
@ -128,7 +243,7 @@
comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList;
comboBoxSelectorCompany.FormattingEnabled = true;
comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" });
comboBoxSelectorCompany.Location = new Point(6, 25);
comboBoxSelectorCompany.Location = new Point(6, 305);
comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
comboBoxSelectorCompany.Size = new Size(175, 23);
comboBoxSelectorCompany.TabIndex = 0;
@ -139,7 +254,7 @@
pictureBox.Dock = DockStyle.Fill;
pictureBox.Location = new Point(0, 0);
pictureBox.Name = "pictureBox";
pictureBox.Size = new Size(613, 450);
pictureBox.Size = new Size(815, 610);
pictureBox.TabIndex = 1;
pictureBox.TabStop = false;
//
@ -147,13 +262,16 @@
//
AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(800, 450);
ClientSize = new Size(1002, 610);
Controls.Add(pictureBox);
Controls.Add(groupBoxTools);
Name = "FormBattleTankCollection";
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 Button buttonRemoveTank;
private Button buttonRefresh;
private Button buttonGoToCheck;
private Panel panelStorage;
private RadioButton radioButtonList;
private RadioButton radioButtonMassive;
private TextBox textBoxCollectionName;
private Label labelCollectionName;
private Button buttonCreateCompany;
private Button buttonCollectionDel;
private ListBox listBoxСollection;
private Button buttonCollectionAdd;
private Panel panelCompanyTools;
}
}

@ -8,6 +8,10 @@ namespace ProjectTank
/// </summary>
public partial class FormBattleTankCollection : Form
{
/// <summary>
/// Хранилище коллекций
/// </summary>
private readonly StorageCollection<DrawningTank> _storageCollection;
/// <summary>
/// Компания
/// </summary>
@ -19,6 +23,7 @@ namespace ProjectTank
public FormBattleTankCollection()
{
InitializeComponent();
_storageCollection = new();
}
/// <summary>
@ -28,12 +33,7 @@ namespace ProjectTank
/// <param name="e"></param>
private void ComboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e)
{
switch (comboBoxSelectorCompany.Text)
{
case "Хранилище":
_company = new TankBase(pictureBox.Width, pictureBox.Height, new MassiveGenericObjects<DrawningTank>());
break;
}
panelCompanyTools.Enabled = false;
}
/// <summary>
@ -146,5 +146,96 @@ namespace ProjectTank
if (_company == null) return;
pictureBox.Image = _company.Show();
}
/// <summary>
/// Добавление коллекции
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
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();
}
/// <summary>
///
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void buttonCollectionDel_Click(object sender, EventArgs e)
{
if (listBoxСollection.SelectedIndex < 0 || listBoxСollection.SelectedItem == null)
{
MessageBox.Show("Коллекция не выбрана");
return;
}
if (MessageBox.Show("Удалить коллекцию?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
{
return;
}
_storageCollection.DelCollection(listBoxСollection.SelectedItem.ToString());
RerfreshListBoxItems();
}
/// <summary>
/// Обновление списка в listBoxCollection
/// </summary>
private void RerfreshListBoxItems()
{
listBoxСollection.Items.Clear();
for (int i = 0; i < _storageCollection.Keys?.Count; ++i)
{
string? colName = _storageCollection.Keys?[i];
if (!string.IsNullOrEmpty(colName))
{
listBoxСollection.Items.Add(colName);
}
}
}
/// <summary>
/// Создание компании
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void buttonCreateCompany_Click(object sender, EventArgs e)
{
if (listBoxСollection.SelectedIndex < 0 || listBoxСollection.SelectedItems == null)
{
MessageBox.Show("Коллекция не выбрана");
return;
}
ICollectionGenericObjects<DrawningTank>? collection = _storageCollection[listBoxСollection.SelectedItem.ToString() ?? string.Empty];
if (collection == null)
{
MessageBox.Show("Коллекция не проинициализирована");
return;
}
switch (comboBoxSelectorCompany.Text)
{
case "Хранилище":
_company = new TankBase(pictureBox.Width, pictureBox.Height, new MassiveGenericObjects<DrawningTank>());
break;
}
panelCompanyTools.Enabled = true;
RerfreshListBoxItems();
}
}
}