From 74ad5870623c9a6def2f127f8d15f024d66f8d2e Mon Sep 17 00:00:00 2001 From: bekodeg Date: Wed, 25 Oct 2023 10:25:50 +0400 Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=BC=D0=B5=D0=B6=D1=83?= =?UTF-8?q?=D1=82=D0=BE=D1=87=D0=BD=D1=8B=D0=B9=20=D1=80=D0=B5=D0=B7=D1=83?= =?UTF-8?q?=D0=BB=D1=8C=D1=82=D0=B0=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FormLocomotiveCollection.Designer.cs | 74 ++++++++++-- .../Generics/LocomotivesGenericCollection.cs | 11 +- ElectricLocomotive/Generics/SetGeneric.cs | 72 ++++++++---- .../LogicFormLocomotiveCollection.cs | 108 ++++++++++++++++-- 4 files changed, 224 insertions(+), 41 deletions(-) diff --git a/ElectricLocomotive/FormLocomotiveCollection.Designer.cs b/ElectricLocomotive/FormLocomotiveCollection.Designer.cs index 792d6cd..388d09e 100644 --- a/ElectricLocomotive/FormLocomotiveCollection.Designer.cs +++ b/ElectricLocomotive/FormLocomotiveCollection.Designer.cs @@ -31,13 +31,19 @@ tableLayoutPanel1 = new TableLayoutPanel(); pictureBoxCollection = new PictureBox(); groupBox1 = new GroupBox(); + groupBox2 = new GroupBox(); + listBoxStorages = new ListBox(); + button1 = new Button(); + textBoxStorageName = new TextBox(); maskedTextBoxNumber = new MaskedTextBox(); buttonRefreshCollection = new Button(); buttonRemoveLocomotive = new Button(); buttonAddLocomotive = new Button(); + button2 = new Button(); tableLayoutPanel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)pictureBoxCollection).BeginInit(); groupBox1.SuspendLayout(); + groupBox2.SuspendLayout(); SuspendLayout(); // // tableLayoutPanel1 @@ -69,7 +75,7 @@ // groupBox1 // groupBox1.Anchor = AnchorStyles.Top | AnchorStyles.Right; - groupBox1.AutoSize = true; + groupBox1.Controls.Add(groupBox2); groupBox1.Controls.Add(maskedTextBoxNumber); groupBox1.Controls.Add(buttonRefreshCollection); groupBox1.Controls.Add(buttonRemoveLocomotive); @@ -78,14 +84,52 @@ groupBox1.MaximumSize = new Size(200, 1000000); groupBox1.MinimumSize = new Size(200, 200); groupBox1.Name = "groupBox1"; - groupBox1.Size = new Size(200, 220); + groupBox1.Size = new Size(200, 444); groupBox1.TabIndex = 0; groupBox1.TabStop = false; groupBox1.Text = "Инструменты"; // + // groupBox2 + // + groupBox2.Controls.Add(button2); + groupBox2.Controls.Add(listBoxStorages); + groupBox2.Controls.Add(button1); + groupBox2.Controls.Add(textBoxStorageName); + groupBox2.Location = new Point(6, 26); + groupBox2.Name = "groupBox2"; + groupBox2.Size = new Size(188, 244); + groupBox2.TabIndex = 5; + groupBox2.TabStop = false; + groupBox2.Text = "Наборы"; + // + // listBoxStorages + // + listBoxStorages.FormattingEnabled = true; + listBoxStorages.ItemHeight = 20; + listBoxStorages.Location = new Point(6, 94); + listBoxStorages.Name = "listBoxStorages"; + listBoxStorages.Size = new Size(174, 104); + listBoxStorages.TabIndex = 2; + // + // button1 + // + button1.Location = new Point(4, 59); + button1.Name = "button1"; + button1.Size = new Size(176, 29); + button1.TabIndex = 1; + button1.Text = "Добавить набор"; + button1.UseVisualStyleBackColor = true; + // + // textBoxStorageName + // + textBoxStorageName.Location = new Point(6, 26); + textBoxStorageName.Name = "textBoxStorageName"; + textBoxStorageName.Size = new Size(176, 27); + textBoxStorageName.TabIndex = 0; + // // maskedTextBoxNumber // - maskedTextBoxNumber.Location = new Point(6, 97); + maskedTextBoxNumber.Location = new Point(10, 328); maskedTextBoxNumber.Mask = "00000"; maskedTextBoxNumber.Name = "maskedTextBoxNumber"; maskedTextBoxNumber.Size = new Size(184, 27); @@ -94,7 +138,7 @@ // // buttonRefreshCollection // - buttonRefreshCollection.Location = new Point(6, 165); + buttonRefreshCollection.Location = new Point(10, 396); buttonRefreshCollection.Name = "buttonRefreshCollection"; buttonRefreshCollection.Size = new Size(184, 29); buttonRefreshCollection.TabIndex = 3; @@ -104,7 +148,7 @@ // // buttonRemoveLocomotive // - buttonRemoveLocomotive.Location = new Point(6, 130); + buttonRemoveLocomotive.Location = new Point(10, 361); buttonRemoveLocomotive.Name = "buttonRemoveLocomotive"; buttonRemoveLocomotive.Size = new Size(184, 29); buttonRemoveLocomotive.TabIndex = 2; @@ -114,13 +158,21 @@ // // buttonAddLocomotive // - buttonAddLocomotive.Location = new Point(6, 26); + buttonAddLocomotive.Location = new Point(10, 293); buttonAddLocomotive.Name = "buttonAddLocomotive"; buttonAddLocomotive.Size = new Size(184, 29); buttonAddLocomotive.TabIndex = 0; buttonAddLocomotive.Text = "Добавить локомотив"; buttonAddLocomotive.UseVisualStyleBackColor = true; - buttonAddLocomotive.Click += buttonAddLocomotive_Click; + // + // button2 + // + button2.Location = new Point(4, 204); + button2.Name = "button2"; + button2.Size = new Size(176, 29); + button2.TabIndex = 3; + button2.Text = "Добавить набор"; + button2.UseVisualStyleBackColor = true; // // FormLocomotiveCollection // @@ -132,10 +184,11 @@ Name = "FormLocomotiveCollection"; Text = "FormLocomotiveCollection"; tableLayoutPanel1.ResumeLayout(false); - tableLayoutPanel1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)pictureBoxCollection).EndInit(); groupBox1.ResumeLayout(false); groupBox1.PerformLayout(); + groupBox2.ResumeLayout(false); + groupBox2.PerformLayout(); ResumeLayout(false); PerformLayout(); } @@ -149,5 +202,10 @@ private Button buttonRemoveLocomotive; private Button buttonRefreshCollection; private MaskedTextBox maskedTextBoxNumber; + private GroupBox groupBox2; + private TextBox textBoxStorageName; + private Button button1; + private ListBox listBoxStorages; + private Button button2; } } \ No newline at end of file diff --git a/ElectricLocomotive/Generics/LocomotivesGenericCollection.cs b/ElectricLocomotive/Generics/LocomotivesGenericCollection.cs index 182f1f0..5cd4d0a 100644 --- a/ElectricLocomotive/Generics/LocomotivesGenericCollection.cs +++ b/ElectricLocomotive/Generics/LocomotivesGenericCollection.cs @@ -91,7 +91,7 @@ namespace ProjectElectricLocomotive.Generics /// public U? GetU(int pos) { - return (U?)_collection.Get(pos)?.GetMoveableObject; + return (U?)_collection[pos]?.GetMoveableObject; } /// @@ -133,12 +133,13 @@ namespace ProjectElectricLocomotive.Generics /// private void DrawObjects(Graphics g) { - for (int i = 0; i < _collection.Count; i++) + foreach (var locomotive in _collection.GetLocomotives()) { - DrawningLocomotive drawningLocomotive = _collection.Get(i); - if (drawningLocomotive == null) + if (locomotive != null) { - continue; + //int widthCount = _pictureHeight / _placeSizeHeight; + //locomotive.SetPosition((i / widthCount) * _placeSizeWidth, (i % widthCount) * _placeSizeHeight); + locomotive.DrawTransport(g); } int ColumnCount = _pictureWidth / _placeSizeWidth; diff --git a/ElectricLocomotive/Generics/SetGeneric.cs b/ElectricLocomotive/Generics/SetGeneric.cs index 0750fd2..c944c32 100644 --- a/ElectricLocomotive/Generics/SetGeneric.cs +++ b/ElectricLocomotive/Generics/SetGeneric.cs @@ -14,20 +14,25 @@ namespace ProjectElectricLocomotive.Generics where T : class { /// - /// Массив объектов, которые храним + /// Список объектов, которые храним /// - private readonly T?[] _places; + private readonly List _places; /// /// Количество объектов в массиве /// - public int Count => _places.Length; + public int Count => _places.Count; + /// + /// Максимальное количество объектов в списке + /// + private readonly int _maxCount; /// /// Конструктор /// /// public SetGeneric(int count) { - _places = new T?[count]; + _maxCount = count; + _places = new List(count); } /// @@ -36,11 +41,11 @@ namespace ProjectElectricLocomotive.Generics /// Первый элемент /// Второй элемент /// - private void swap(ref T first, ref T second) + private void swap(int index1, int index2) { - T temp = first; - first = second; - second = temp; + T temp = _places[index1]; + _places[index1] = _places[index2]; + _places[index2] = temp; } /// @@ -50,8 +55,8 @@ namespace ProjectElectricLocomotive.Generics /// public bool Insert(T locomotive) { - int end = _places.Length; - for (int i = 0; i < _places.Length; ++i) + int end = Count; + for (int i = 0; i < Count; ++i) { if (_places[i] == null) { @@ -59,7 +64,7 @@ namespace ProjectElectricLocomotive.Generics break; } } - if (end == _places.Length) + if (end == Count) { return false; } @@ -78,7 +83,7 @@ namespace ProjectElectricLocomotive.Generics /// public bool Insert(T locomotive, int position) { - if (position >= _places.Length || position < 0) + if (position >= Count || position < 0) { return false; } @@ -87,8 +92,8 @@ namespace ProjectElectricLocomotive.Generics _places[position] = locomotive; return true; } - int end = _places.Length; - for (int i = position; i < _places.Length; ++i) + int end = Count; + for (int i = position; i < Count; ++i) { if (_places[i] == null) { @@ -96,14 +101,14 @@ namespace ProjectElectricLocomotive.Generics break; } } - if (end == _places.Length) + if (end == Count) { return false; } _places[end] = locomotive; for (int i = position; i < end; ++i) { - swap(ref _places[i], ref _places[end]); + swap(i, end); } return true; } @@ -114,7 +119,7 @@ namespace ProjectElectricLocomotive.Generics /// public bool Remove(int position) { - if (position >= _places.Length || position < 0) + if (position >= Count || position < 0) { return false; } @@ -128,13 +133,38 @@ namespace ProjectElectricLocomotive.Generics /// /// /// - public T? Get(int position) + public T? this[int position] { - if (position >= _places.Length || position < 0) + get { - return null; + if (position >= Count || position < 0) + { + return null; + } + return _places[position]; + } + set + { + // TODO проверка позиции + // TODO проверка свободных мест в списке + // TODO вставка в список по позиции + } + } + + /// + /// Проход по списку + /// + /// + public IEnumerable GetLocomotives(int? maxLocomotives = null) + { + for (int i = 0; i < _places.Count; ++i) + { + yield return _places[i]; + if (maxLocomotives.HasValue && i == maxLocomotives.Value) + { + yield break; + } } - return _places[position]; } } diff --git a/ElectricLocomotive/LogicFormLocomotiveCollection.cs b/ElectricLocomotive/LogicFormLocomotiveCollection.cs index 065adab..a81861f 100644 --- a/ElectricLocomotive/LogicFormLocomotiveCollection.cs +++ b/ElectricLocomotive/LogicFormLocomotiveCollection.cs @@ -18,19 +18,88 @@ namespace ProjectElectricLocomotive /// /// Набор объектов /// - private readonly LocomotivesGenericCollection< - DrawningLocomotive, DrawningObjectLocomotive> _locomotives; + private readonly LocomotivesGenericStorage _storage; /// /// Конструктор /// public FormLocomotiveCollection() { InitializeComponent(); - _locomotives = new LocomotivesGenericCollection( - pictureBoxCollection.Width, pictureBoxCollection.Height + _storage = new LocomotivesGenericStorage( + pictureBoxCollection.Width, + pictureBoxCollection.Height ); } + /// + /// Заполнение listBoxObjects + /// + private void ReloadObjects() + { + int index = listBoxStorages.SelectedIndex; + listBoxStorages.Items.Clear(); + for (int i = 0; i < _storage.Keys.Count; i++) + { + listBoxStorages.Items.Add(_storage.Keys[i]); + } + if (listBoxStorages.Items.Count > 0 && (index == -1 || index + >= listBoxStorages.Items.Count)) + { + listBoxStorages.SelectedIndex = 0; + } + else if (listBoxStorages.Items.Count > 0 && index > -1 && + index < listBoxStorages.Items.Count) + { + listBoxStorages.SelectedIndex = index; + } + } + /// + /// Добавление набора в коллекцию + /// + /// + /// + private void ButtonAddObject_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(textBoxStorageName.Text)) + { + MessageBox.Show("Не все данные заполнены", "Ошибка", + MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + _storage.AddSet(textBoxStorageName.Text); + ReloadObjects(); + } + + /// + /// Выбор набора + /// + /// + /// + private void ListBoxObjects_SelectedIndexChanged(object sender, EventArgs e) + { + pictureBoxCollection.Image = + _storage[listBoxStorages.SelectedItem?.ToString() ?? string.Empty]?.ShowLocomotives(); + } + /// + /// Удаление набора + /// + /// + /// + private void ButtonDelObject_Click(object sender, EventArgs e) + { + if (listBoxStorages.SelectedIndex == -1) + { + return; + } + if (MessageBox.Show($"Удалить объект {listBoxStorages.SelectedItem}?", + "Удаление", MessageBoxButtons.YesNo, + MessageBoxIcon.Question) == DialogResult.Yes) + { + _storage.DelSet(listBoxStorages.SelectedItem.ToString() ?? string.Empty); + ReloadObjects(); + } + } + /// /// Добавление объекта в набор /// @@ -38,13 +107,23 @@ namespace ProjectElectricLocomotive /// private void ButtonAddLocomotive_Click(object sender, EventArgs e) { + if (listBoxStorages.SelectedIndex == -1) + { + return; + } + var obj = _storage[listBoxStorages.SelectedItem.ToString() ?? string.Empty]; + if (obj == null) + { + return; + } + FormLocomotive form = new(); if (form.ShowDialog() == DialogResult.OK) { if (_locomotives + form.SelectedLocomotive > 0) { MessageBox.Show("Объект добавлен"); - pictureBoxCollection.Image = _locomotives.ShowLocomotives(); + pictureBoxCollection.Image = obj.ShowLocomotives(); } else { @@ -59,6 +138,15 @@ namespace ProjectElectricLocomotive /// private void ButtonRemoveLocomotive_Click(object sender, EventArgs e) { + if (listBoxStorages.SelectedIndex == -1) + { + return; + } + var obj = _storage[listBoxStorages.SelectedItem.ToString() ?? string.Empty]; + if (obj == null) + { + return; + } if (MessageBox.Show( "Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) @@ -69,7 +157,7 @@ namespace ProjectElectricLocomotive if (_locomotives - pos != -1) { MessageBox.Show("Объект удален"); - pictureBoxCollection.Image = _locomotives.ShowLocomotives(); + pictureBoxCollection.Image = obj.ShowLocomotives(); } else { @@ -83,7 +171,13 @@ namespace ProjectElectricLocomotive /// private void ButtonRefreshCollection_Click(object sender, EventArgs e) { - pictureBoxCollection.Image = _locomotives.ShowLocomotives(); + if (listBoxStorages.SelectedIndex == -1) + { + return; + } + var obj = _storage[listBoxStorages.SelectedItem.ToString() ?? string.Empty]; + + pictureBoxCollection.Image = obj.ShowLocomotives(); } } }