diff --git a/ProjectCruiser/CollectionGenericObjects/AbstractCompany.cs b/ProjectCruiser/CollectionGenericObjects/AbstractCompany.cs
index 6ccac33..0193272 100644
--- a/ProjectCruiser/CollectionGenericObjects/AbstractCompany.cs
+++ b/ProjectCruiser/CollectionGenericObjects/AbstractCompany.cs
@@ -28,7 +28,7 @@ namespace ProjectCruiser.CollectionGenericObjects
protected readonly int _pictureHeight;
///
- /// Коллекция автомобилей
+ /// Коллекция крейсеров
///
protected ICollectionGenericObjects? _collection = null;
diff --git a/ProjectCruiser/CollectionGenericObjects/CollectionType.cs b/ProjectCruiser/CollectionGenericObjects/CollectionType.cs
new file mode 100644
index 0000000..ddde682
--- /dev/null
+++ b/ProjectCruiser/CollectionGenericObjects/CollectionType.cs
@@ -0,0 +1,18 @@
+namespace ProjectCruiser.CollectionGenericObjects
+{
+ public enum CollectionType
+ {
+ ///
+ /// Неопределено
+ ///
+ None = 0,
+ ///
+ /// Массив
+ ///
+ Massive = 1,
+ ///
+ /// Список
+ ///
+ List = 2
+ }
+}
diff --git a/ProjectCruiser/CollectionGenericObjects/ICollectionGenericObjects.cs b/ProjectCruiser/CollectionGenericObjects/ICollectionGenericObjects.cs
index d2dcef6..93f8c9d 100644
--- a/ProjectCruiser/CollectionGenericObjects/ICollectionGenericObjects.cs
+++ b/ProjectCruiser/CollectionGenericObjects/ICollectionGenericObjects.cs
@@ -11,16 +11,19 @@
/// Количество объектов в коллекции
///
int Count { get; }
+
///
/// Установка максимального количества элементов
///
int SetMaxCount { set; }
+
///
/// Добавление объекта в коллекцию
///
/// Добавляемый объект
/// true - вставка прошла удачно, false - вставка не удалась
int Insert(T obj);
+
///
/// Добавление объекта в коллекцию на конкретную позицию
///
@@ -28,12 +31,14 @@
/// Позиция
/// true - вставка прошла удачно, false - вставка не удалась
int Insert(T obj, int position);
+
///
/// Удаление объекта из коллекции с конкретной позиции
///
/// Позиция
/// true - удаление прошло удачно, false - удаление не удалось
T? Remove(int position);
+
///
/// Получение объекта по позиции
///
diff --git a/ProjectCruiser/CollectionGenericObjects/ListGenericObjects.cs b/ProjectCruiser/CollectionGenericObjects/ListGenericObjects.cs
new file mode 100644
index 0000000..bb8ccd9
--- /dev/null
+++ b/ProjectCruiser/CollectionGenericObjects/ListGenericObjects.cs
@@ -0,0 +1,65 @@
+namespace ProjectCruiser.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 || 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;
+ }
+ }
+}
diff --git a/ProjectCruiser/CollectionGenericObjects/MassiveGenericObjects.cs b/ProjectCruiser/CollectionGenericObjects/MassiveGenericObjects.cs
index f67c2be..e0a110e 100644
--- a/ProjectCruiser/CollectionGenericObjects/MassiveGenericObjects.cs
+++ b/ProjectCruiser/CollectionGenericObjects/MassiveGenericObjects.cs
@@ -14,7 +14,23 @@ namespace ProjectCruiser.CollectionGenericObjects
///
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];
+ }
+ }
+ }
+ }
///
/// Конструктор
@@ -27,11 +43,10 @@ namespace ProjectCruiser.CollectionGenericObjects
{
// TODO проверка позиции
if (position >= _collection.Length || position < 0)
- {
- return null;
- }
+ { return null; }
return _collection[position];
}
+
public int Insert(T obj)
{
// TODO вставка в свободное место набора
@@ -43,16 +58,18 @@ namespace ProjectCruiser.CollectionGenericObjects
_collection[index] = obj;
return index;
}
+
index++;
}
return -1;
}
+
public int Insert(T obj, int position)
{
// TODO проверка позиции
// TODO проверка, что элемент массива по этой позиции пустой, если нет, то
- // ищется свободное место после этой позиции и идет вставка туда
- // если нет после, ищем до
+ // ищется свободное место после этой позиции и идет вставка туда
+ // если нет после, ищем до
// TODO вставка
if (position >= _collection.Length || position < 0)
{ return -1; }
@@ -83,15 +100,16 @@ namespace ProjectCruiser.CollectionGenericObjects
}
return -1;
}
+
public T Remove(int position)
{
// TODO проверка позиции
// TODO удаление объекта из массива, присвоив элементу массива значение null
if (position >= _collection.Length || position < 0)
{ return null; }
- T drawningCruiser = _collection[position];
+ T obj = _collection[position];
_collection[position] = null;
- return drawningCruiser;
+ return obj;
}
}
}
diff --git a/ProjectCruiser/CollectionGenericObjects/StorageCollection.cs b/ProjectCruiser/CollectionGenericObjects/StorageCollection.cs
new file mode 100644
index 0000000..d099cd9
--- /dev/null
+++ b/ProjectCruiser/CollectionGenericObjects/StorageCollection.cs
@@ -0,0 +1,73 @@
+namespace ProjectCruiser.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 (_storages.ContainsKey(name)) return;
+
+ if (collectionType == CollectionType.None) return;
+ else if (collectionType == CollectionType.Massive)
+ _storages[name] = new MassiveGenericObjects();
+ else if (collectionType == CollectionType.List)
+ _storages[name] = new ListGenericObjects();
+ }
+
+ ///
+ /// Удаление коллекции
+ ///
+ /// Название коллекции
+ public void DelCollection(string name)
+ {
+ // TODO Прописать логику для удаления коллекции
+ if (_storages.ContainsKey(name))
+ _storages.Remove(name);
+ }
+
+ ///
+ /// Доступ к коллекции
+ ///
+ /// Название коллекции
+ ///
+ public ICollectionGenericObjects? this[string name]
+ {
+ get
+ {
+ // TODO Продумать логику получения объекта
+ if (_storages.ContainsKey(name))
+ return _storages[name];
+ return null;
+ }
+ }
+ }
+}
diff --git a/ProjectCruiser/FormCruisersCollection.Designer.cs b/ProjectCruiser/FormCruisersCollection.Designer.cs
index afd6bed..d4100d4 100644
--- a/ProjectCruiser/FormCruisersCollection.Designer.cs
+++ b/ProjectCruiser/FormCruisersCollection.Designer.cs
@@ -29,93 +29,166 @@
private void InitializeComponent()
{
groupBoxTools = new GroupBox();
- maskedTextBoxPosision = new MaskedTextBox();
- buttonRefresh = new Button();
- buttonGetToTest = new Button();
- ButtonRemoveCruiser = new Button();
- ButtonAddMilitaryCruiser = new Button();
- ButtonAddCruiser = new Button();
+ buttonCreateCompany = new Button();
+ panelStorage = new Panel();
+ buttonCollectionDel = new Button();
+ listBoxCollection = new ListBox();
+ buttonCollecctionAdd = new Button();
+ radioButtonList = new RadioButton();
+ radioButtonMassive = new RadioButton();
+ textBoxCollectionName = new TextBox();
+ labelCollectionName = new Label();
comboBoxSelectorCompany = new ComboBox();
+ panelCompanyTools = new Panel();
+ ButtonAddCruiser = new Button();
+ ButtonAddMilitaryCruiser = new Button();
+ buttonRefresh = new Button();
+ ButtonRemoveCruiser = new Button();
+ maskedTextBoxPosision = new MaskedTextBox();
+ buttonGetToTest = new Button();
pictureBoxCruiser = new PictureBox();
groupBoxTools.SuspendLayout();
+ panelStorage.SuspendLayout();
+ panelCompanyTools.SuspendLayout();
((System.ComponentModel.ISupportInitialize)pictureBoxCruiser).BeginInit();
SuspendLayout();
//
// groupBoxTools
//
- groupBoxTools.Controls.Add(maskedTextBoxPosision);
- groupBoxTools.Controls.Add(buttonRefresh);
- groupBoxTools.Controls.Add(buttonGetToTest);
- groupBoxTools.Controls.Add(ButtonRemoveCruiser);
- groupBoxTools.Controls.Add(ButtonAddMilitaryCruiser);
- groupBoxTools.Controls.Add(ButtonAddCruiser);
+ groupBoxTools.Controls.Add(buttonCreateCompany);
+ groupBoxTools.Controls.Add(panelStorage);
groupBoxTools.Controls.Add(comboBoxSelectorCompany);
+ groupBoxTools.Controls.Add(panelCompanyTools);
groupBoxTools.Dock = DockStyle.Right;
- groupBoxTools.Location = new Point(596, 0);
+ groupBoxTools.Location = new Point(583, 0);
groupBoxTools.Name = "groupBoxTools";
- groupBoxTools.Size = new Size(222, 574);
+ groupBoxTools.Size = new Size(222, 653);
groupBoxTools.TabIndex = 0;
groupBoxTools.TabStop = false;
groupBoxTools.Text = "инструменты";
//
- // maskedTextBoxPosision
+ // buttonCreateCompany
//
- maskedTextBoxPosision.Location = new Point(20, 229);
- maskedTextBoxPosision.Mask = "00";
- maskedTextBoxPosision.Name = "maskedTextBoxPosision";
- maskedTextBoxPosision.Size = new Size(186, 27);
- maskedTextBoxPosision.TabIndex = 2;
- maskedTextBoxPosision.ValidatingType = typeof(int);
+ buttonCreateCompany.Location = new Point(21, 345);
+ buttonCreateCompany.Name = "buttonCreateCompany";
+ buttonCreateCompany.Size = new Size(186, 27);
+ buttonCreateCompany.TabIndex = 7;
+ buttonCreateCompany.Text = "Создать компанию";
+ buttonCreateCompany.UseVisualStyleBackColor = true;
+ buttonCreateCompany.Click += ButtonCreateCompany_Click;
//
- // buttonRefresh
+ // panelStorage
//
- buttonRefresh.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
- buttonRefresh.Location = new Point(20, 479);
- buttonRefresh.Name = "buttonRefresh";
- buttonRefresh.Size = new Size(186, 40);
- buttonRefresh.TabIndex = 5;
- buttonRefresh.Text = "обновить";
- buttonRefresh.UseVisualStyleBackColor = true;
- buttonRefresh.Click += ButtonRefresh_Click;
+ panelStorage.Controls.Add(buttonCollectionDel);
+ panelStorage.Controls.Add(listBoxCollection);
+ panelStorage.Controls.Add(buttonCollecctionAdd);
+ 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, 23);
+ panelStorage.Name = "panelStorage";
+ panelStorage.Size = new Size(216, 283);
+ panelStorage.TabIndex = 6;
//
- // buttonGetToTest
+ // buttonCollectionDel
//
- buttonGetToTest.Anchor = AnchorStyles.Right;
- buttonGetToTest.Location = new Point(20, 366);
- buttonGetToTest.Name = "buttonGetToTest";
- buttonGetToTest.Size = new Size(186, 40);
- buttonGetToTest.TabIndex = 4;
- buttonGetToTest.Text = "передать на тесты";
- buttonGetToTest.UseVisualStyleBackColor = true;
- buttonGetToTest.Click += ButtonGetToTest_Click;
+ buttonCollectionDel.Location = new Point(17, 247);
+ buttonCollectionDel.Name = "buttonCollectionDel";
+ buttonCollectionDel.Size = new Size(186, 27);
+ buttonCollectionDel.TabIndex = 6;
+ buttonCollectionDel.Text = "Удалить коллекцию";
+ buttonCollectionDel.UseVisualStyleBackColor = true;
+ buttonCollectionDel.Click += ButtonCollectionDel_Click;
//
- // ButtonRemoveCruiser
+ // listBoxCollection
//
- ButtonRemoveCruiser.Anchor = AnchorStyles.Right;
- ButtonRemoveCruiser.Location = new Point(20, 271);
- ButtonRemoveCruiser.Name = "ButtonRemoveCruiser";
- ButtonRemoveCruiser.Size = new Size(186, 40);
- ButtonRemoveCruiser.TabIndex = 3;
- ButtonRemoveCruiser.Text = "удалить крейсер";
- ButtonRemoveCruiser.UseVisualStyleBackColor = true;
- ButtonRemoveCruiser.Click += ButtonRemoveCruiser_Click;
+ listBoxCollection.FormattingEnabled = true;
+ listBoxCollection.ItemHeight = 20;
+ listBoxCollection.Location = new Point(17, 137);
+ listBoxCollection.Name = "listBoxCollection";
+ listBoxCollection.Size = new Size(186, 104);
+ listBoxCollection.TabIndex = 5;
//
- // ButtonAddMilitaryCruiser
+ // buttonCollecctionAdd
//
- ButtonAddMilitaryCruiser.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
- ButtonAddMilitaryCruiser.Location = new Point(20, 152);
- ButtonAddMilitaryCruiser.Name = "ButtonAddMilitaryCruiser";
- ButtonAddMilitaryCruiser.Size = new Size(186, 50);
- ButtonAddMilitaryCruiser.TabIndex = 2;
- ButtonAddMilitaryCruiser.Text = "добваление военного крейсера";
- ButtonAddMilitaryCruiser.UseVisualStyleBackColor = true;
- ButtonAddMilitaryCruiser.Click += ButtonAddMilitaryCruiser_Click;
+ buttonCollecctionAdd.Location = new Point(17, 104);
+ buttonCollecctionAdd.Name = "buttonCollecctionAdd";
+ buttonCollecctionAdd.Size = new Size(186, 27);
+ buttonCollecctionAdd.TabIndex = 4;
+ buttonCollecctionAdd.Text = "Добавить коллекцию";
+ buttonCollecctionAdd.UseVisualStyleBackColor = true;
+ buttonCollecctionAdd.Click += ButtonCollecctionAdd_Click;
+ //
+ // radioButtonList
+ //
+ radioButtonList.AutoSize = true;
+ radioButtonList.Location = new Point(123, 75);
+ radioButtonList.Name = "radioButtonList";
+ radioButtonList.Size = new Size(80, 24);
+ radioButtonList.TabIndex = 3;
+ radioButtonList.TabStop = true;
+ radioButtonList.Text = "Список";
+ radioButtonList.UseVisualStyleBackColor = true;
+ //
+ // radioButtonMassive
+ //
+ radioButtonMassive.AutoSize = true;
+ radioButtonMassive.Location = new Point(17, 75);
+ radioButtonMassive.Name = "radioButtonMassive";
+ radioButtonMassive.Size = new Size(82, 24);
+ radioButtonMassive.TabIndex = 2;
+ radioButtonMassive.TabStop = true;
+ radioButtonMassive.Text = "Массив";
+ radioButtonMassive.UseVisualStyleBackColor = true;
+ //
+ // textBoxCollectionName
+ //
+ textBoxCollectionName.Location = new Point(17, 32);
+ textBoxCollectionName.Name = "textBoxCollectionName";
+ textBoxCollectionName.Size = new Size(186, 27);
+ textBoxCollectionName.TabIndex = 1;
+ //
+ // labelCollectionName
+ //
+ labelCollectionName.AutoSize = true;
+ labelCollectionName.Location = new Point(26, 9);
+ labelCollectionName.Name = "labelCollectionName";
+ labelCollectionName.Size = new Size(155, 20);
+ labelCollectionName.TabIndex = 0;
+ labelCollectionName.Text = "Название коллекции";
+ //
+ // comboBoxSelectorCompany
+ //
+ comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList;
+ comboBoxSelectorCompany.FormattingEnabled = true;
+ comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" });
+ comboBoxSelectorCompany.Location = new Point(21, 311);
+ comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
+ comboBoxSelectorCompany.Size = new Size(186, 28);
+ comboBoxSelectorCompany.TabIndex = 0;
+ comboBoxSelectorCompany.SelectedIndexChanged += comboBoxSelectorCompany_SelectedIndexChanged_1;
+ //
+ // panelCompanyTools
+ //
+ panelCompanyTools.Controls.Add(ButtonAddCruiser);
+ panelCompanyTools.Controls.Add(ButtonAddMilitaryCruiser);
+ panelCompanyTools.Controls.Add(buttonRefresh);
+ panelCompanyTools.Controls.Add(ButtonRemoveCruiser);
+ panelCompanyTools.Controls.Add(maskedTextBoxPosision);
+ panelCompanyTools.Controls.Add(buttonGetToTest);
+ panelCompanyTools.Enabled = false;
+ panelCompanyTools.Location = new Point(3, 379);
+ panelCompanyTools.Name = "panelCompanyTools";
+ panelCompanyTools.Size = new Size(216, 274);
+ panelCompanyTools.TabIndex = 8;
//
// ButtonAddCruiser
//
ButtonAddCruiser.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
ButtonAddCruiser.BackgroundImageLayout = ImageLayout.Center;
- ButtonAddCruiser.Location = new Point(20, 106);
+ ButtonAddCruiser.Location = new Point(18, 3);
ButtonAddCruiser.Name = "ButtonAddCruiser";
ButtonAddCruiser.Size = new Size(186, 40);
ButtonAddCruiser.TabIndex = 1;
@@ -123,23 +196,65 @@
ButtonAddCruiser.UseVisualStyleBackColor = true;
ButtonAddCruiser.Click += ButtonAddCruiser_Click;
//
- // comboBoxSelectorCompany
+ // ButtonAddMilitaryCruiser
//
- comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList;
- comboBoxSelectorCompany.FormattingEnabled = true;
- comboBoxSelectorCompany.Items.AddRange(new object[] { "хранилище" });
- comboBoxSelectorCompany.Location = new Point(20, 26);
- comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
- comboBoxSelectorCompany.Size = new Size(186, 28);
- comboBoxSelectorCompany.TabIndex = 0;
- comboBoxSelectorCompany.SelectedIndexChanged += comboBoxSelectorCompany_SelectedIndexChanged_1;
+ ButtonAddMilitaryCruiser.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+ ButtonAddMilitaryCruiser.Location = new Point(18, 49);
+ ButtonAddMilitaryCruiser.Name = "ButtonAddMilitaryCruiser";
+ ButtonAddMilitaryCruiser.Size = new Size(186, 51);
+ ButtonAddMilitaryCruiser.TabIndex = 2;
+ ButtonAddMilitaryCruiser.Text = "добваление военного крейсера";
+ ButtonAddMilitaryCruiser.UseVisualStyleBackColor = true;
+ ButtonAddMilitaryCruiser.Click += ButtonAddMilitaryCruiser_Click;
+ //
+ // buttonRefresh
+ //
+ buttonRefresh.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+ buttonRefresh.Location = new Point(18, 227);
+ buttonRefresh.Name = "buttonRefresh";
+ buttonRefresh.Size = new Size(186, 41);
+ buttonRefresh.TabIndex = 5;
+ buttonRefresh.Text = "обновить";
+ buttonRefresh.UseVisualStyleBackColor = true;
+ buttonRefresh.Click += ButtonRefresh_Click;
+ //
+ // ButtonRemoveCruiser
+ //
+ ButtonRemoveCruiser.Anchor = AnchorStyles.Right;
+ ButtonRemoveCruiser.Location = new Point(18, 138);
+ ButtonRemoveCruiser.Name = "ButtonRemoveCruiser";
+ ButtonRemoveCruiser.Size = new Size(186, 40);
+ ButtonRemoveCruiser.TabIndex = 3;
+ ButtonRemoveCruiser.Text = "удалить крейсер";
+ ButtonRemoveCruiser.UseVisualStyleBackColor = true;
+ ButtonRemoveCruiser.Click += ButtonRemoveCruiser_Click;
+ //
+ // maskedTextBoxPosision
+ //
+ maskedTextBoxPosision.Location = new Point(17, 105);
+ maskedTextBoxPosision.Mask = "00";
+ maskedTextBoxPosision.Name = "maskedTextBoxPosision";
+ maskedTextBoxPosision.Size = new Size(187, 27);
+ maskedTextBoxPosision.TabIndex = 2;
+ maskedTextBoxPosision.ValidatingType = typeof(int);
+ //
+ // buttonGetToTest
+ //
+ buttonGetToTest.Anchor = AnchorStyles.Right;
+ buttonGetToTest.Location = new Point(18, 184);
+ buttonGetToTest.Name = "buttonGetToTest";
+ buttonGetToTest.Size = new Size(186, 40);
+ buttonGetToTest.TabIndex = 4;
+ buttonGetToTest.Text = "передать на тесты";
+ buttonGetToTest.UseVisualStyleBackColor = true;
+ buttonGetToTest.Click += ButtonGetToTest_Click;
//
// pictureBoxCruiser
//
pictureBoxCruiser.Dock = DockStyle.Fill;
pictureBoxCruiser.Location = new Point(0, 0);
pictureBoxCruiser.Name = "pictureBoxCruiser";
- pictureBoxCruiser.Size = new Size(596, 574);
+ pictureBoxCruiser.Size = new Size(583, 653);
pictureBoxCruiser.TabIndex = 1;
pictureBoxCruiser.TabStop = false;
//
@@ -147,13 +262,16 @@
//
AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font;
- ClientSize = new Size(818, 574);
+ ClientSize = new Size(805, 653);
Controls.Add(pictureBoxCruiser);
Controls.Add(groupBoxTools);
Name = "FormCruisersCollection";
Text = "FormCruisersCollection";
groupBoxTools.ResumeLayout(false);
- groupBoxTools.PerformLayout();
+ panelStorage.ResumeLayout(false);
+ panelStorage.PerformLayout();
+ panelCompanyTools.ResumeLayout(false);
+ panelCompanyTools.PerformLayout();
((System.ComponentModel.ISupportInitialize)pictureBoxCruiser).EndInit();
ResumeLayout(false);
}
@@ -169,5 +287,15 @@
private Button buttonGetToTest;
private PictureBox pictureBoxCruiser;
private MaskedTextBox maskedTextBoxPosision;
+ private Panel panelStorage;
+ private TextBox textBoxCollectionName;
+ private Label labelCollectionName;
+ private ListBox listBoxCollection;
+ private Button buttonCollecctionAdd;
+ private RadioButton radioButtonList;
+ private RadioButton radioButtonMassive;
+ private Button buttonCreateCompany;
+ private Button buttonCollectionDel;
+ private Panel panelCompanyTools;
}
}
\ No newline at end of file
diff --git a/ProjectCruiser/FormCruisersCollection.cs b/ProjectCruiser/FormCruisersCollection.cs
index 73e80a0..726ccc5 100644
--- a/ProjectCruiser/FormCruisersCollection.cs
+++ b/ProjectCruiser/FormCruisersCollection.cs
@@ -5,16 +5,23 @@ namespace ProjectCruiser
{
public partial class FormCruisersCollection : Form
{
+ ///
+ /// Хранилише коллекций
+ ///
+ private readonly StorageCollection _storageCollection;
+
///
/// Компания
///
private AbstractCompany? _company = null;
+
///
/// Конструктор
///
public FormCruisersCollection()
{
InitializeComponent();
+ _storageCollection = new();
}
///
@@ -24,13 +31,7 @@ namespace ProjectCruiser
///
private void comboBoxSelectorCompany_SelectedIndexChanged_1(object sender, EventArgs e)
{
- switch (comboBoxSelectorCompany.Text)
- {
- case "хранилище":
- _company = new CruiserDockingService(pictureBoxCruiser.Width,
- pictureBoxCruiser.Height, new MassiveGenericObjects());
- break;
- }
+ panelCompanyTools.Enabled = false;
}
///
@@ -51,23 +52,22 @@ namespace ProjectCruiser
drawningCruiser = new DrawningCruiser(random.Next(100, 300), random.Next(1000, 3000), GetColor(random));
break;
case nameof(DrawningMilitaryCruiser):
+ // TODO вызов диалогового окна для выбора цвета
drawningCruiser = new DrawningMilitaryCruiser(random.Next(100, 300), random.Next(1000, 3000),
- GetColor(random),
- GetColor(random),
- Convert.ToBoolean(random.Next(0, 2)),
- Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
+ GetColor(random), GetColor(random),
+ Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
break;
default:
return;
}
if (_company + drawningCruiser != -1)
{
- MessageBox.Show("объект добавлен");
+ MessageBox.Show("Объект добавлен");
pictureBoxCruiser.Image = _company.Show();
}
else
{
- MessageBox.Show("не удалось добавить объект");
+ MessageBox.Show("Не удалось добавить объект");
}
}
@@ -164,6 +164,97 @@ namespace ProjectCruiser
pictureBoxCruiser.Image = _company.Show();
}
+ ///
+ /// Добавление коллекции
+ ///
+ ///
+ ///
+ private void ButtonCollecctionAdd_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 ButtonCollectionDel_Click(object sender, EventArgs e)
+ {
+ 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();
+ }
+
+ ///
+ /// Обновление списка в listBoxCollection
+ ///
+ 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 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 CruiserDockingService(pictureBoxCruiser.Width, pictureBoxCruiser.Height, collection);
+ break;
+ }
+ panelCompanyTools.Enabled = true;
+
+ }
+
}
}