This commit is contained in:
kirkorovka 2024-04-21 13:31:58 +04:00
parent ed5ff92d41
commit aee0c3cbc4
7 changed files with 409 additions and 93 deletions

View File

@ -0,0 +1,18 @@
using System;
using System.Collections.Generic;
using System.Diagnostics.Tracing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Project_SelfPropelledArtilleryUnit.CollectionGenericObjects;
public enum CollectionType
{
None = 0,
Massive = 1,
List = 2
}

View File

@ -0,0 +1,54 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Project_SelfPropelledArtilleryUnit.CollectionGenericObjects;
public class ListGenericObjects<T> : ICollectionGenericObjects<T>
where T : class
{
private readonly List<T?> _collection;
private int _maxCount;
public int MaxCount => _maxCount;
public int Count => _collection.Count;
public int SetMaxCount { set { if (value > 0) { _maxCount = value; } } }
public ListGenericObjects()
{
_collection = new();
}
public T? Get(int position)
{
if (position < 0 || position >= _collection.Count || _collection == null || _collection.Count == 0) return null;
return _collection[position];
}
public int Insert(T obj)
{
if (Count == _maxCount) return -1;
_collection.Add(obj);
return _collection.Count;
}
public int Insert(T obj, int position)
{
if (Count == _maxCount || position < 0 || position > Count) return -1;
_collection.Insert(position, obj);
return position;
}
public T? Remove(int position)
{
if (_collection == null || position < 0 || position >= _collection.Count) return null;
T? obj = _collection[position];
_collection[position] = null;
return obj;
}
}

View File

@ -22,7 +22,7 @@ public class MassiveGenericObjects <T> : ICollectionGenericObjects<T>
public T? Get(int position) public T? Get(int position)
{ {
// TODO проверка позиции
if (position >= _collection.Length || position < 0) if (position >= _collection.Length || position < 0)
{ {
return null; return null;
@ -32,7 +32,7 @@ public class MassiveGenericObjects <T> : ICollectionGenericObjects<T>
public int Insert(T obj) public int Insert(T obj)
{ {
// TODO вставка в свободное место набора
int index = 0; int index = 0;
while (index < _collection.Length) while (index < _collection.Length)
{ {
@ -52,10 +52,10 @@ public class MassiveGenericObjects <T> : ICollectionGenericObjects<T>
if (position >= _collection.Length || position < 0) if (position >= _collection.Length || position < 0)
return -1; return -1;
//проверка, что элемент массива по этой позиции пустой
if (_collection[position] != null) if (_collection[position] != null)
{ {
// проверка, что после вставляемого элемента в массиве есть пустой элемент
int nullIndex = -1; int nullIndex = -1;
for (int i = position + 1; i < Count; i++) for (int i = position + 1; i < Count; i++)
{ {
@ -65,12 +65,12 @@ public class MassiveGenericObjects <T> : ICollectionGenericObjects<T>
break; break;
} }
} }
// Если пустого элемента нет, то выходим
if (nullIndex < 0) if (nullIndex < 0)
{ {
return -1; return -1;
} }
// сдвиг всех объектов, находящихся справа от позиции до первого пустого элемента
int j = nullIndex - 1; int j = nullIndex - 1;
while (j >= position) while (j >= position)
{ {
@ -78,15 +78,14 @@ public class MassiveGenericObjects <T> : ICollectionGenericObjects<T>
j--; j--;
} }
} }
//вставка по позиции
_collection[position] = obj; _collection[position] = obj;
return position; return position;
} }
public T? Remove(int position) public T? Remove(int position)
{ {
//проверка позиции
//удаление объекта из массива, присвоив элементу массива значение null
if (position >= _collection.Length || position < 0) if (position >= _collection.Length || position < 0)
{ {
return null; return null;

View File

@ -0,0 +1,51 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Project_SelfPropelledArtilleryUnit.CollectionGenericObjects;
internal class StorageCollection<T>
where T : class
{
private Dictionary<string, ICollectionGenericObjects<T>> _storages;
public List<string> Keys => _storages.Keys.ToList();
public StorageCollection()
{
_storages = new Dictionary<string, ICollectionGenericObjects<T>>();
}
public void AddCollection(string name, CollectionType collectionType)
{
if (_storages.ContainsKey(name) || name == "") return;
if (collectionType == CollectionType.Massive)
{
_storages[name] = new MassiveGenericObjects<T>();
}
else
{
_storages[name] = new ListGenericObjects<T>();
}
}
public void DelCollection(string name)
{
_storages.Remove(name);
}
public ICollectionGenericObjects<T>? this[string name]
{
get
{
if (name == "")
{
return null;
}
return _storages[name];
}
}
}

View File

@ -29,116 +29,226 @@
private void InitializeComponent() private void InitializeComponent()
{ {
groupBoxTools = new GroupBox(); groupBoxTools = new GroupBox();
buttonUpdate = new Button(); panelCompanyTools = new Panel();
buttonGoToCheck = new Button();
buttonRemoveSAU = new Button();
maskedTextBox = new MaskedTextBox();
buttonAddSAU = new Button();
buttonAddBaseSAU = new Button(); buttonAddBaseSAU = new Button();
buttonUpdate = new Button();
buttonAddSAU = new Button();
buttonGoToCheck = new Button();
maskedTextBox = new MaskedTextBox();
buttonRemoveSAU = new Button();
panelStorage = new Panel();
buttonCreateCompany = new Button();
buttonCollectionDel = new Button();
comboBoxSelectorCompany = new ComboBox(); comboBoxSelectorCompany = new ComboBox();
listBoxCollection = new ListBox();
buttonCollectionAdd = new Button();
radioButtonList = new RadioButton();
radioButtonMassive = new RadioButton();
textBoxCollectionName = new TextBox();
labelCollectionName = new Label();
pictureBox = new PictureBox(); pictureBox = new PictureBox();
groupBoxTools.SuspendLayout(); groupBoxTools.SuspendLayout();
panelCompanyTools.SuspendLayout();
panelStorage.SuspendLayout();
((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit(); ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
SuspendLayout(); SuspendLayout();
// //
// groupBoxTools // groupBoxTools
// //
groupBoxTools.Controls.Add(buttonUpdate); groupBoxTools.Controls.Add(panelCompanyTools);
groupBoxTools.Controls.Add(buttonGoToCheck); groupBoxTools.Controls.Add(panelStorage);
groupBoxTools.Controls.Add(buttonRemoveSAU);
groupBoxTools.Controls.Add(maskedTextBox);
groupBoxTools.Controls.Add(buttonAddSAU);
groupBoxTools.Controls.Add(buttonAddBaseSAU);
groupBoxTools.Controls.Add(comboBoxSelectorCompany);
groupBoxTools.Dock = DockStyle.Right; groupBoxTools.Dock = DockStyle.Right;
groupBoxTools.Location = new Point(1113, 0); groupBoxTools.Location = new Point(1123, 0);
groupBoxTools.Name = "groupBoxTools"; groupBoxTools.Name = "groupBoxTools";
groupBoxTools.Size = new Size(218, 591); groupBoxTools.Size = new Size(218, 636);
groupBoxTools.TabIndex = 0; groupBoxTools.TabIndex = 0;
groupBoxTools.TabStop = false; groupBoxTools.TabStop = false;
groupBoxTools.Text = "Инструменты"; groupBoxTools.Text = "Инструменты";
// //
// buttonUpdate // panelCompanyTools
// //
buttonUpdate.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; panelCompanyTools.Controls.Add(buttonAddBaseSAU);
buttonUpdate.Location = new Point(6, 544); panelCompanyTools.Controls.Add(buttonUpdate);
buttonUpdate.Name = "buttonUpdate"; panelCompanyTools.Controls.Add(buttonAddSAU);
buttonUpdate.Size = new Size(206, 41); panelCompanyTools.Controls.Add(buttonGoToCheck);
buttonUpdate.TabIndex = 8; panelCompanyTools.Controls.Add(maskedTextBox);
buttonUpdate.Text = "Обновить"; panelCompanyTools.Controls.Add(buttonRemoveSAU);
buttonUpdate.UseVisualStyleBackColor = true; panelCompanyTools.Dock = DockStyle.Bottom;
buttonUpdate.Click += buttonUpdate_Click; panelCompanyTools.Enabled = false;
// panelCompanyTools.Location = new Point(3, 364);
// buttonGoToCheck panelCompanyTools.Name = "panelCompanyTools";
// panelCompanyTools.Size = new Size(212, 269);
buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; panelCompanyTools.TabIndex = 10;
buttonGoToCheck.Location = new Point(6, 497);
buttonGoToCheck.Name = "buttonGoToCheck";
buttonGoToCheck.Size = new Size(206, 41);
buttonGoToCheck.TabIndex = 7;
buttonGoToCheck.Text = "Передать на тесты";
buttonGoToCheck.UseVisualStyleBackColor = true;
buttonGoToCheck.Click += buttonGoToCheck_Click;
//
// buttonRemoveSAU
//
buttonRemoveSAU.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
buttonRemoveSAU.Location = new Point(6, 259);
buttonRemoveSAU.Name = "buttonRemoveSAU";
buttonRemoveSAU.Size = new Size(206, 41);
buttonRemoveSAU.TabIndex = 6;
buttonRemoveSAU.Text = "Удаление САУ";
buttonRemoveSAU.UseVisualStyleBackColor = true;
buttonRemoveSAU.Click += buttonRemoveSAU_Click;
//
// maskedTextBox
//
maskedTextBox.Location = new Point(6, 226);
maskedTextBox.Mask = "00";
maskedTextBox.Name = "maskedTextBox";
maskedTextBox.Size = new Size(206, 27);
maskedTextBox.TabIndex = 5;
maskedTextBox.ValidatingType = typeof(int);
//
// buttonAddSAU
//
buttonAddSAU.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
buttonAddSAU.Location = new Point(6, 128);
buttonAddSAU.Name = "buttonAddSAU";
buttonAddSAU.Size = new Size(206, 41);
buttonAddSAU.TabIndex = 3;
buttonAddSAU.Text = "Добавление САУ";
buttonAddSAU.UseVisualStyleBackColor = true;
buttonAddSAU.Click += buttonAddSAU_Click;
// //
// buttonAddBaseSAU // buttonAddBaseSAU
// //
buttonAddBaseSAU.Location = new Point(6, 81); buttonAddBaseSAU.Location = new Point(3, 6);
buttonAddBaseSAU.Name = "buttonAddBaseSAU"; buttonAddBaseSAU.Name = "buttonAddBaseSAU";
buttonAddBaseSAU.Size = new Size(206, 41); buttonAddBaseSAU.Size = new Size(203, 41);
buttonAddBaseSAU.TabIndex = 2; buttonAddBaseSAU.TabIndex = 2;
buttonAddBaseSAU.Text = "Добавление базовой САУ"; buttonAddBaseSAU.Text = "Добавление базовой САУ";
buttonAddBaseSAU.UseVisualStyleBackColor = true; buttonAddBaseSAU.UseVisualStyleBackColor = true;
buttonAddBaseSAU.Click += buttonAddBaseSAU_Click; buttonAddBaseSAU.Click += buttonAddBaseSAU_Click;
// //
// buttonUpdate
//
buttonUpdate.Location = new Point(3, 224);
buttonUpdate.Name = "buttonUpdate";
buttonUpdate.Size = new Size(203, 41);
buttonUpdate.TabIndex = 8;
buttonUpdate.Text = "Обновить";
buttonUpdate.UseVisualStyleBackColor = true;
buttonUpdate.Click += buttonUpdate_Click;
//
// buttonAddSAU
//
buttonAddSAU.Location = new Point(3, 50);
buttonAddSAU.Name = "buttonAddSAU";
buttonAddSAU.Size = new Size(203, 41);
buttonAddSAU.TabIndex = 3;
buttonAddSAU.Text = "Добавление САУ";
buttonAddSAU.UseVisualStyleBackColor = true;
buttonAddSAU.Click += buttonAddSAU_Click;
//
// buttonGoToCheck
//
buttonGoToCheck.Location = new Point(3, 177);
buttonGoToCheck.Name = "buttonGoToCheck";
buttonGoToCheck.Size = new Size(203, 41);
buttonGoToCheck.TabIndex = 7;
buttonGoToCheck.Text = "Передать на тесты";
buttonGoToCheck.UseVisualStyleBackColor = true;
buttonGoToCheck.Click += buttonGoToCheck_Click;
//
// maskedTextBox
//
maskedTextBox.Location = new Point(3, 97);
maskedTextBox.Mask = "00";
maskedTextBox.Name = "maskedTextBox";
maskedTextBox.Size = new Size(203, 27);
maskedTextBox.TabIndex = 5;
maskedTextBox.ValidatingType = typeof(int);
//
// buttonRemoveSAU
//
buttonRemoveSAU.Location = new Point(3, 130);
buttonRemoveSAU.Name = "buttonRemoveSAU";
buttonRemoveSAU.Size = new Size(203, 41);
buttonRemoveSAU.TabIndex = 6;
buttonRemoveSAU.Text = "Удаление САУ";
buttonRemoveSAU.UseVisualStyleBackColor = true;
buttonRemoveSAU.Click += buttonRemoveSAU_Click;
//
// panelStorage
//
panelStorage.Controls.Add(buttonCreateCompany);
panelStorage.Controls.Add(buttonCollectionDel);
panelStorage.Controls.Add(comboBoxSelectorCompany);
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, 23);
panelStorage.Name = "panelStorage";
panelStorage.Size = new Size(212, 341);
panelStorage.TabIndex = 5;
//
// buttonCreateCompany
//
buttonCreateCompany.Location = new Point(3, 306);
buttonCreateCompany.Name = "buttonCreateCompany";
buttonCreateCompany.Size = new Size(203, 29);
buttonCreateCompany.TabIndex = 9;
buttonCreateCompany.Text = "Создать компанию";
buttonCreateCompany.UseVisualStyleBackColor = true;
buttonCreateCompany.Click += buttonCreateCompany_Click;
//
// buttonCollectionDel
//
buttonCollectionDel.Location = new Point(3, 241);
buttonCollectionDel.Name = "buttonCollectionDel";
buttonCollectionDel.Size = new Size(206, 29);
buttonCollectionDel.TabIndex = 6;
buttonCollectionDel.Text = "Удалить коллекцию";
buttonCollectionDel.UseVisualStyleBackColor = true;
buttonCollectionDel.Click += buttonCollectionDel_Click;
//
// comboBoxSelectorCompany // comboBoxSelectorCompany
// //
comboBoxSelectorCompany.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList; comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList;
comboBoxSelectorCompany.FormattingEnabled = true; comboBoxSelectorCompany.FormattingEnabled = true;
comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" }); comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" });
comboBoxSelectorCompany.Location = new Point(6, 26); comboBoxSelectorCompany.Location = new Point(3, 276);
comboBoxSelectorCompany.Name = "comboBoxSelectorCompany"; comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
comboBoxSelectorCompany.Size = new Size(206, 28); comboBoxSelectorCompany.Size = new Size(203, 28);
comboBoxSelectorCompany.TabIndex = 1; comboBoxSelectorCompany.TabIndex = 1;
comboBoxSelectorCompany.SelectedIndexChanged += comboBoxSelectorCompany_SelectedIndexChanged; comboBoxSelectorCompany.SelectedIndexChanged += comboBoxSelectorCompany_SelectedIndexChanged;
// //
// listBoxCollection
//
listBoxCollection.FormattingEnabled = true;
listBoxCollection.Location = new Point(3, 131);
listBoxCollection.Name = "listBoxCollection";
listBoxCollection.Size = new Size(206, 104);
listBoxCollection.TabIndex = 5;
//
// buttonCollectionAdd
//
buttonCollectionAdd.Location = new Point(3, 96);
buttonCollectionAdd.Name = "buttonCollectionAdd";
buttonCollectionAdd.Size = new Size(206, 29);
buttonCollectionAdd.TabIndex = 4;
buttonCollectionAdd.Text = "Добавить коллекцию";
buttonCollectionAdd.UseVisualStyleBackColor = true;
buttonCollectionAdd.Click += buttonCollectionAdd_Click;
//
// radioButtonList
//
radioButtonList.AutoSize = true;
radioButtonList.Location = new Point(123, 66);
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(3, 66);
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(3, 33);
textBoxCollectionName.Name = "textBoxCollectionName";
textBoxCollectionName.Size = new Size(206, 27);
textBoxCollectionName.TabIndex = 1;
//
// labelCollectionName
//
labelCollectionName.AutoSize = true;
labelCollectionName.Location = new Point(3, 10);
labelCollectionName.Name = "labelCollectionName";
labelCollectionName.Size = new Size(158, 20);
labelCollectionName.TabIndex = 0;
labelCollectionName.Text = "Название коллекции:";
//
// pictureBox // pictureBox
// //
pictureBox.Dock = DockStyle.Fill; pictureBox.Dock = DockStyle.Fill;
pictureBox.Location = new Point(0, 0); pictureBox.Location = new Point(0, 0);
pictureBox.Name = "pictureBox"; pictureBox.Name = "pictureBox";
pictureBox.Size = new Size(1113, 591); pictureBox.Size = new Size(1123, 636);
pictureBox.TabIndex = 4; pictureBox.TabIndex = 4;
pictureBox.TabStop = false; pictureBox.TabStop = false;
// //
@ -146,13 +256,16 @@
// //
AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font; AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(1331, 591); ClientSize = new Size(1341, 636);
Controls.Add(pictureBox); Controls.Add(pictureBox);
Controls.Add(groupBoxTools); Controls.Add(groupBoxTools);
Name = "FormSAUCollection"; Name = "FormSAUCollection";
Text = "FormSAUCollection"; Text = "FormSAUCollection";
groupBoxTools.ResumeLayout(false); groupBoxTools.ResumeLayout(false);
groupBoxTools.PerformLayout(); panelCompanyTools.ResumeLayout(false);
panelCompanyTools.PerformLayout();
panelStorage.ResumeLayout(false);
panelStorage.PerformLayout();
((System.ComponentModel.ISupportInitialize)pictureBox).EndInit(); ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
ResumeLayout(false); ResumeLayout(false);
} }
@ -168,5 +281,15 @@
private Button buttonRemoveSAU; private Button buttonRemoveSAU;
private MaskedTextBox maskedTextBox; private MaskedTextBox maskedTextBox;
private Button buttonUpdate; private Button buttonUpdate;
private Panel panelStorage;
private Label labelCollectionName;
private ListBox listBoxCollection;
private Button buttonCollectionAdd;
private RadioButton radioButtonList;
private RadioButton radioButtonMassive;
private TextBox textBoxCollectionName;
private Button buttonCollectionDel;
private Button buttonCreateCompany;
private Panel panelCompanyTools;
} }
} }

View File

@ -6,6 +6,7 @@ using System.ComponentModel;
using System.Data; using System.Data;
using System.Drawing; using System.Drawing;
using System.Linq; using System.Linq;
using System.Runtime.InteropServices;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
@ -14,21 +15,19 @@ namespace Project_SelfPropelledArtilleryUnit;
public partial class FormSAUCollection : Form public partial class FormSAUCollection : Form
{ {
private AbstractCompany? _company; private readonly StorageCollection<DrawingBase> _storageCollection;
private AbstractCompany? _company = null;
public FormSAUCollection() public FormSAUCollection()
{ {
InitializeComponent(); 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 SAUSharingService(pictureBox.Width, pictureBox.Height, new MassiveGenericObjects<DrawingBase>());
break;
}
} }
private void CreateObject(string type) private void CreateObject(string type)
@ -137,4 +136,76 @@ public partial class FormSAUCollection : Form
pictureBox.Image = _company.Show(); 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);
UpdateListBoxItems();
}
private void UpdateListBoxItems()
{
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)
{
}
private void buttonCreateCompany_Click(object sender, EventArgs e)
{
if (listBoxCollection.SelectedIndex < 0 || listBoxCollection.SelectedItem == null)
{
MessageBox.Show("Коллекция не выбрана");
return;
}
ICollectionGenericObjects<DrawingBase>? collection =
_storageCollection[listBoxCollection.SelectedItem.ToString() ?? string.Empty];
if (collection == null)
{
MessageBox.Show("Коллекция не проинициализирована");
return;
}
switch (comboBoxSelectorCompany.Text)
{
case "Хранилище":
_company = new SAUSharingService(pictureBox.Width,
pictureBox.Height, collection);
break;
}
panelCompanyTools.Enabled = true;
UpdateListBoxItems();
}
private void maskedTextBox_MaskInputRejected(object sender, MaskInputRejectedEventArgs e)
{
}
} }