diff --git a/ProjectElectroTrans/CollectionGenericObjects/CollectionType.cs b/ProjectElectroTrans/CollectionGenericObjects/CollectionType.cs new file mode 100644 index 0000000..6306b0b --- /dev/null +++ b/ProjectElectroTrans/CollectionGenericObjects/CollectionType.cs @@ -0,0 +1,21 @@ +namespace ProjectElectroTrans.CollectionGenericObjects; +/// +/// Тип коллекции +/// +public enum CollectionType +{ + /// + /// Неопределено + /// + None = 0, + + /// + /// Массив + /// + Massive = 1, + + /// + /// Список + /// + List = 2 +} \ No newline at end of file diff --git a/ProjectElectroTrans/CollectionGenericObjects/ListGenericObjects.cs b/ProjectElectroTrans/CollectionGenericObjects/ListGenericObjects.cs new file mode 100644 index 0000000..e442bab --- /dev/null +++ b/ProjectElectroTrans/CollectionGenericObjects/ListGenericObjects.cs @@ -0,0 +1,69 @@ +namespace ProjectElectroTrans.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) + { + + if (position < 0 || position > _collection.Count - 1) + { + return null; + } + return _collection[position]; + } + + public int Insert(T obj) + { + if (_collection.Count + 1 > _maxCount) { return 0; } + _collection.Add(obj); + + return 1; + } + + public int Insert(T obj, int position) + { + if (_collection.Count + 1 < _maxCount) { return 0; } + if (position > _collection.Count || position < 0) + { + return 0; + } + _collection.Insert(position, obj); + return 1; + } + + public T Remove(int position) + { + if (position > _collection.Count || position < 0) + { + return null; + } + T temp = _collection[position]; + _collection.RemoveAt(position); + return temp; + } +} \ No newline at end of file diff --git a/ProjectElectroTrans/CollectionGenericObjects/StorageCollection.cs b/ProjectElectroTrans/CollectionGenericObjects/StorageCollection.cs new file mode 100644 index 0000000..ef5a1f9 --- /dev/null +++ b/ProjectElectroTrans/CollectionGenericObjects/StorageCollection.cs @@ -0,0 +1,74 @@ +namespace ProjectElectroTrans.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) + { + if (name == null || _storages.ContainsKey(name)) { return; } + switch (collectionType) + + { + case CollectionType.None: + return; + case CollectionType.Massive: + _storages.Add(name, new MassiveGenericObjects { }); + return; + case CollectionType.List: + _storages.Add(name, new ListGenericObjects { }); + return; + } + + } + + /// + /// Удаление коллекции + /// + /// Название коллекции + public void DelCollection(string name) + { + if (name == null || !_storages.ContainsKey(name)) { return; } + _storages.Remove(name); + } + + /// + /// Доступ к коллекции + /// + /// Название коллекции + /// + public ICollectionGenericObjects? this[string name] + { + get + { + if (name == null || !_storages.ContainsKey(name)) { return null; } + return _storages[name]; + } + } +} \ No newline at end of file diff --git a/ProjectElectroTrans/Drawnings/DrawingTrans.cs b/ProjectElectroTrans/Drawnings/DrawingTrans.cs index dcbf01f..85a7ec1 100644 --- a/ProjectElectroTrans/Drawnings/DrawingTrans.cs +++ b/ProjectElectroTrans/Drawnings/DrawingTrans.cs @@ -79,12 +79,13 @@ public class DrawingTrans /// /// Конструктор для наследников /// - /// Ширина прорисовки автомобиля - /// Высота прорисовки автомобиля - protected DrawingTrans(int drawningCarWidth, int drawningCarHeight) : this() + /// Ширина прорисовки автомобиля + /// Высота прорисовки автомобиля + protected DrawingTrans(int drawningTransWidth, int drawningTransHeight) : this() { - _drawningTransWidth = drawningCarWidth; - _pictureHeight = drawningCarHeight; + _drawningTransWidth = drawningTransWidth; + _pictureHeight = drawningTransHeight; } /// diff --git a/ProjectElectroTrans/FormElectroTrans.Designer.cs b/ProjectElectroTrans/FormElectroTrans.Designer.cs index baf4722..1abd86f 100644 --- a/ProjectElectroTrans/FormElectroTrans.Designer.cs +++ b/ProjectElectroTrans/FormElectroTrans.Designer.cs @@ -119,7 +119,8 @@ namespace ProjectElectroTrans buttonStrategyStep.UseVisualStyleBackColor = true; buttonStrategyStep.Click += ButtonStrategyStep_Click; // - // FormSportCar + // Form + // // AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; diff --git a/ProjectElectroTrans/FormElectroTrans.cs b/ProjectElectroTrans/FormElectroTrans.cs index 9d321ce..6c0f2f5 100644 --- a/ProjectElectroTrans/FormElectroTrans.cs +++ b/ProjectElectroTrans/FormElectroTrans.cs @@ -21,7 +21,8 @@ public partial class FormElectroTrans : Form /// /// /// - public DrawingTrans SetCar + public DrawingTrans SetTrans + { set { diff --git a/ProjectElectroTrans/FormTransCollection.Designer.cs b/ProjectElectroTrans/FormTransCollection.Designer.cs index d1adee7..9d8464c 100644 --- a/ProjectElectroTrans/FormTransCollection.Designer.cs +++ b/ProjectElectroTrans/FormTransCollection.Designer.cs @@ -33,26 +33,35 @@ namespace ProjectElectroTrans private void InitializeComponent() { groupBoxTools = new GroupBox(); + 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(); buttonRefresh = new Button(); buttonGoToCheck = new Button(); - buttonRemoveCar = new Button(); + buttonRemoveTrans = new Button(); maskedTextBoxPosition = new MaskedTextBox(); - buttonAddSportCar = new Button(); - buttonAddCar = new Button(); + buttonAddElectroTrans = new Button(); + buttonAddTrans = new Button(); comboBoxSelectorCompany = new ComboBox(); pictureBox = new PictureBox(); + panelCompanyTools = new Panel(); groupBoxTools.SuspendLayout(); + panelStorage.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit(); + panelCompanyTools.SuspendLayout(); SuspendLayout(); // // groupBoxTools // - groupBoxTools.Controls.Add(buttonRefresh); - groupBoxTools.Controls.Add(buttonGoToCheck); - groupBoxTools.Controls.Add(buttonRemoveCar); - groupBoxTools.Controls.Add(maskedTextBoxPosition); - groupBoxTools.Controls.Add(buttonAddSportCar); - groupBoxTools.Controls.Add(buttonAddCar); + groupBoxTools.Controls.Add(panelCompanyTools); + groupBoxTools.Controls.Add(buttonCreateCompany); + groupBoxTools.Controls.Add(panelStorage); groupBoxTools.Controls.Add(comboBoxSelectorCompany); groupBoxTools.Dock = DockStyle.Right; groupBoxTools.Location = new Point(783, 0); @@ -62,10 +71,102 @@ namespace ProjectElectroTrans groupBoxTools.TabStop = false; groupBoxTools.Text = "Инструменты"; // + // buttonCreateCompany + // + buttonCreateCompany.Location = new Point(6, 320); + buttonCreateCompany.Name = "buttonCreateCompany"; + buttonCreateCompany.Size = new Size(167, 23); + 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, 19); + panelStorage.Name = "panelStorage"; + panelStorage.Size = new Size(173, 266); + panelStorage.TabIndex = 7; + // + // buttonCollectionDel + // + buttonCollectionDel.Location = new Point(3, 227); + buttonCollectionDel.Name = "buttonCollectionDel"; + buttonCollectionDel.Size = new Size(167, 23); + buttonCollectionDel.TabIndex = 6; + buttonCollectionDel.Text = "Удалить коллекцию"; + buttonCollectionDel.UseVisualStyleBackColor = true; + buttonCollectionDel.Click += ButtonCollectionDel_Click; + // + // listBoxCollection + // + listBoxCollection.FormattingEnabled = true; + listBoxCollection.ItemHeight = 15; + listBoxCollection.Location = new Point(3, 112); + listBoxCollection.Name = "listBoxCollection"; + listBoxCollection.Size = new Size(167, 109); + listBoxCollection.TabIndex = 5; + // + // buttonCollectionAdd + // + buttonCollectionAdd.Location = new Point(3, 83); + buttonCollectionAdd.Name = "buttonCollectionAdd"; + buttonCollectionAdd.Size = new Size(167, 23); + buttonCollectionAdd.TabIndex = 4; + buttonCollectionAdd.Text = "Добавить коллекцию"; + buttonCollectionAdd.UseVisualStyleBackColor = true; + buttonCollectionAdd.Click += ButtonCollectionAdd_Click; + // + // radioButtonList + // + radioButtonList.AutoSize = true; + radioButtonList.Location = new Point(98, 58); + 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(16, 58); + 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, 29); + textBoxCollectionName.Name = "textBoxCollectionName"; + textBoxCollectionName.Size = new Size(167, 23); + textBoxCollectionName.TabIndex = 1; + // + // labelCollectionName + // + labelCollectionName.AutoSize = true; + labelCollectionName.Location = new Point(26, 11); + labelCollectionName.Name = "labelCollectionName"; + labelCollectionName.Size = new Size(125, 15); + labelCollectionName.TabIndex = 0; + labelCollectionName.Text = "Название коллекции:"; + // // buttonRefresh // buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonRefresh.Location = new Point(6, 499); + buttonRefresh.Location = new Point(3, 210); buttonRefresh.Name = "buttonRefresh"; buttonRefresh.Size = new Size(167, 40); buttonRefresh.TabIndex = 6; @@ -76,7 +177,7 @@ namespace ProjectElectroTrans // buttonGoToCheck // buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonGoToCheck.Location = new Point(6, 361); + buttonGoToCheck.Location = new Point(3, 170); buttonGoToCheck.Name = "buttonGoToCheck"; buttonGoToCheck.Size = new Size(167, 40); buttonGoToCheck.TabIndex = 5; @@ -84,47 +185,47 @@ namespace ProjectElectroTrans buttonGoToCheck.UseVisualStyleBackColor = true; buttonGoToCheck.Click += ButtonGoToCheck_Click; // - // buttonRemoveCar + // buttonRemoveTrans // - buttonRemoveCar.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonRemoveCar.Location = new Point(6, 251); - buttonRemoveCar.Name = "buttonRemoveTrans"; - buttonRemoveCar.Size = new Size(167, 40); - buttonRemoveCar.TabIndex = 4; - buttonRemoveCar.Text = "Удалить поезд"; - buttonRemoveCar.UseVisualStyleBackColor = true; - buttonRemoveCar.Click += ButtonRemoveTrans_Click; + buttonRemoveTrans.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonRemoveTrans.Location = new Point(3, 124); + buttonRemoveTrans.Name = "buttonRemoveTrans"; + buttonRemoveTrans.Size = new Size(167, 40); + buttonRemoveTrans.TabIndex = 4; + buttonRemoveTrans.Text = "Удалить поезд"; + buttonRemoveTrans.UseVisualStyleBackColor = true; + buttonRemoveTrans.Click += ButtonRemoveTrans_Click; // // maskedTextBoxPosition // - maskedTextBoxPosition.Location = new Point(6, 222); + maskedTextBoxPosition.Location = new Point(3, 95); maskedTextBoxPosition.Mask = "00"; maskedTextBoxPosition.Name = "maskedTextBoxPosition"; maskedTextBoxPosition.Size = new Size(167, 23); maskedTextBoxPosition.TabIndex = 3; maskedTextBoxPosition.ValidatingType = typeof(int); // - // buttonAddSportCar + // buttonAddElectroTrans // - buttonAddSportCar.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddSportCar.Location = new Point(6, 137); - buttonAddSportCar.Name = "buttonAddSportCar"; - buttonAddSportCar.Size = new Size(167, 40); - buttonAddSportCar.TabIndex = 2; - buttonAddSportCar.Text = "Добавление электропоезда"; - buttonAddSportCar.UseVisualStyleBackColor = true; - buttonAddSportCar.Click += ButtonAddElectroTrans_Click; + buttonAddElectroTrans.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonAddElectroTrans.Location = new Point(3, 49); + buttonAddElectroTrans.Name = "buttonAddElectroTrans"; + buttonAddElectroTrans.Size = new Size(167, 40); + buttonAddElectroTrans.TabIndex = 2; + buttonAddElectroTrans.Text = "Добавление электропоезд"; + buttonAddElectroTrans.UseVisualStyleBackColor = true; + buttonAddElectroTrans.Click += ButtonAddElectroTrans_Click; // - // buttonAddCar + // buttonAddTrans // - buttonAddCar.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddCar.Location = new Point(6, 91); - buttonAddCar.Name = "buttonAddCar"; - buttonAddCar.Size = new Size(167, 40); - buttonAddCar.TabIndex = 1; - buttonAddCar.Text = "Добавление поезда"; - buttonAddCar.UseVisualStyleBackColor = true; - buttonAddCar.Click += ButtonAddTrans_Click; + buttonAddTrans.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonAddTrans.Location = new Point(3, 3); + buttonAddTrans.Name = "buttonAddTrans"; + buttonAddTrans.Size = new Size(167, 40); + buttonAddTrans.TabIndex = 1; + buttonAddTrans.Text = "Добавление поезд"; + buttonAddTrans.UseVisualStyleBackColor = true; + buttonAddTrans.Click += ButtonAddTrans_Click; // // comboBoxSelectorCompany // @@ -132,7 +233,7 @@ namespace ProjectElectroTrans comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList; comboBoxSelectorCompany.FormattingEnabled = true; comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" }); - comboBoxSelectorCompany.Location = new Point(6, 22); + comboBoxSelectorCompany.Location = new Point(6, 291); comboBoxSelectorCompany.Name = "comboBoxSelectorCompany"; comboBoxSelectorCompany.Size = new Size(167, 23); comboBoxSelectorCompany.TabIndex = 0; @@ -147,18 +248,36 @@ namespace ProjectElectroTrans pictureBox.TabIndex = 1; pictureBox.TabStop = false; // - // FormCarCollection + // panelCompanyTools + // + panelCompanyTools.Controls.Add(buttonAddTrans); + panelCompanyTools.Controls.Add(buttonAddElectroTrans); + panelCompanyTools.Controls.Add(maskedTextBoxPosition); + panelCompanyTools.Controls.Add(buttonRefresh); + panelCompanyTools.Controls.Add(buttonRemoveTrans); + panelCompanyTools.Controls.Add(buttonGoToCheck); + panelCompanyTools.Dock = DockStyle.Bottom; + panelCompanyTools.Enabled = false; + panelCompanyTools.Location = new Point(3, 360); + panelCompanyTools.Name = "panelCompanyTools"; + panelCompanyTools.Size = new Size(173, 253); + panelCompanyTools.TabIndex = 9; + // + // FormTransCollection // AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(962, 616); Controls.Add(pictureBox); Controls.Add(groupBoxTools); - Name = "FormCarCollection"; - Text = "Коллекция автомобилей"; + Name = "FormTransCollection"; + Text = "Коллекция поездов"; groupBoxTools.ResumeLayout(false); - groupBoxTools.PerformLayout(); + panelStorage.ResumeLayout(false); + panelStorage.PerformLayout(); ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit(); + panelCompanyTools.ResumeLayout(false); + panelCompanyTools.PerformLayout(); ResumeLayout(false); } @@ -166,12 +285,22 @@ namespace ProjectElectroTrans private GroupBox groupBoxTools; private ComboBox comboBoxSelectorCompany; - private Button buttonAddSportCar; - private Button buttonAddCar; - private Button buttonRemoveCar; + private Button buttonAddElectroTrans; + private Button buttonAddTrans; + private Button buttonRemoveTrans; private MaskedTextBox maskedTextBoxPosition; private PictureBox pictureBox; private Button buttonGoToCheck; private Button buttonRefresh; + private Panel panelStorage; + private Label labelCollectionName; + private TextBox textBoxCollectionName; + private RadioButton radioButtonList; + private RadioButton radioButtonMassive; + private Button buttonCollectionAdd; + private ListBox listBoxCollection; + private Button buttonCollectionDel; + private Button buttonCreateCompany; + private Panel panelCompanyTools; } } \ No newline at end of file diff --git a/ProjectElectroTrans/FormTransCollection.cs b/ProjectElectroTrans/FormTransCollection.cs index e700e38..6d66a7a 100644 --- a/ProjectElectroTrans/FormTransCollection.cs +++ b/ProjectElectroTrans/FormTransCollection.cs @@ -9,6 +9,10 @@ namespace ProjectElectroTrans; /// public partial class FormTransCollection : Form { + /// + /// Хранилише коллекций + /// + private readonly StorageCollection _storageCollection; /// /// Компания /// @@ -20,6 +24,7 @@ public partial class FormTransCollection : Form public FormTransCollection() { InitializeComponent(); + _storageCollection = new(); } /// @@ -168,7 +173,7 @@ public partial class FormTransCollection : Form FormElectroTrans form = new() { - SetCar = car + SetTrans = car }; form.ShowDialog(); } @@ -187,4 +192,99 @@ public partial class FormTransCollection : 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 ButtonCollectionDel_Click(object sender, EventArgs e) + { + if (listBoxCollection.SelectedIndex < 0 || listBoxCollection.SelectedItem == null) + { + MessageBox.Show("Коллекция не выбрана"); + return; + } + if (MessageBox.Show("Удалить коллекцию?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes) + { + 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 TransDepoService(pictureBox.Width, pictureBox.Height, collection); + break; + } + + panelCompanyTools.Enabled = true; + RerfreshListBoxItems(); + } } \ No newline at end of file