From 4babf537a4a8c5ad9f253dfb937e27bfdad37ee9 Mon Sep 17 00:00:00 2001 From: vasmaae Date: Sun, 21 Apr 2024 03:02:17 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=20=E2=84=966?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AbstractCompany.cs | 2 +- .../ICollectionGenericObjects.cs | 13 +- .../ListGenericObjects.cs | 13 +- .../MassiveGenericObjects.cs | 16 +- .../StorageCollection.cs | 157 +++++++++++++++++- .../ProjectAirbus/Drawnings/DrawningAirbus.cs | 9 + .../Drawnings/DrawningBigAirbus.cs | 9 + .../Drawnings/ExtensionDrawningAirbus.cs | 55 ++++++ .../ProjectAirbus/Entities/EntityAirbus.cs | 24 +++ .../ProjectAirbus/Entities/EntityBIgAirbus.cs | 26 +++ .../FormAirbusCollection.Designer.cs | 70 +++++++- .../ProjectAirbus/FormAirbusCollection.cs | 47 +++++- .../ProjectAirbus/FormAirbusCollection.resx | 9 + 13 files changed, 435 insertions(+), 15 deletions(-) create mode 100644 ProjectAirbus/ProjectAirbus/Drawnings/ExtensionDrawningAirbus.cs diff --git a/ProjectAirbus/ProjectAirbus/CollectionGenericObjects/AbstractCompany.cs b/ProjectAirbus/ProjectAirbus/CollectionGenericObjects/AbstractCompany.cs index ff4a5ef..ce02c0d 100644 --- a/ProjectAirbus/ProjectAirbus/CollectionGenericObjects/AbstractCompany.cs +++ b/ProjectAirbus/ProjectAirbus/CollectionGenericObjects/AbstractCompany.cs @@ -48,7 +48,7 @@ public abstract class AbstractCompany _pictureWidth = picWidth; _pictureHeight = picHeight; _collection = collection; - _collection.SetMaxCount = GetMaxCount; + _collection.MaxCount = GetMaxCount; } /// diff --git a/ProjectAirbus/ProjectAirbus/CollectionGenericObjects/ICollectionGenericObjects.cs b/ProjectAirbus/ProjectAirbus/CollectionGenericObjects/ICollectionGenericObjects.cs index d0e6f13..f38d9d8 100644 --- a/ProjectAirbus/ProjectAirbus/CollectionGenericObjects/ICollectionGenericObjects.cs +++ b/ProjectAirbus/ProjectAirbus/CollectionGenericObjects/ICollectionGenericObjects.cs @@ -14,7 +14,7 @@ public interface ICollectionGenericObjects where T : class /// /// Установка максимального количества элементов /// - int SetMaxCount { set; } + int MaxCount { get; set; } /// /// Добавление объекта в коллекцию @@ -44,4 +44,15 @@ public interface ICollectionGenericObjects where T : class /// Позиция /// Объект T? Get(int position); + + /// + /// Получение типа коллекции + /// + CollectionType GetCollectionType { get; } + + /// + /// Получение объектов коллекции по одному + /// + /// Поэлементный вывод элементов коллекции + IEnumerable GetItems(); } diff --git a/ProjectAirbus/ProjectAirbus/CollectionGenericObjects/ListGenericObjects.cs b/ProjectAirbus/ProjectAirbus/CollectionGenericObjects/ListGenericObjects.cs index 5721d43..2bcc227 100644 --- a/ProjectAirbus/ProjectAirbus/CollectionGenericObjects/ListGenericObjects.cs +++ b/ProjectAirbus/ProjectAirbus/CollectionGenericObjects/ListGenericObjects.cs @@ -17,8 +17,9 @@ public class ListGenericObjects : ICollectionGenericObjects where T : clas public int Count => _collection.Count; - public int SetMaxCount + public int MaxCount { + get => _maxCount; set { if (value > 0) @@ -28,6 +29,8 @@ public class ListGenericObjects : ICollectionGenericObjects where T : clas } } + public CollectionType GetCollectionType => CollectionType.List; + /// /// Конструктор /// @@ -81,4 +84,12 @@ public class ListGenericObjects : ICollectionGenericObjects where T : clas _collection.RemoveAt(position); return obj; } + + public IEnumerable GetItems() + { + for (int i = 0; i < Count; i++) + { + yield return _collection[i]; + } + } } diff --git a/ProjectAirbus/ProjectAirbus/CollectionGenericObjects/MassiveGenericObjects.cs b/ProjectAirbus/ProjectAirbus/CollectionGenericObjects/MassiveGenericObjects.cs index 377f92a..42baffd 100644 --- a/ProjectAirbus/ProjectAirbus/CollectionGenericObjects/MassiveGenericObjects.cs +++ b/ProjectAirbus/ProjectAirbus/CollectionGenericObjects/MassiveGenericObjects.cs @@ -9,8 +9,12 @@ public class MassiveGenericObjects : ICollectionGenericObjects where T : c public int Count => _collection.Length; - public int SetMaxCount + public int MaxCount { + get + { + return _collection.Length; + } set { if (value > 0) @@ -27,6 +31,8 @@ public class MassiveGenericObjects : ICollectionGenericObjects where T : c } } + public CollectionType GetCollectionType => CollectionType.Massive; + /// /// Конструктор /// @@ -117,4 +123,12 @@ public class MassiveGenericObjects : ICollectionGenericObjects where T : c _collection[position] = null; return obj; } + + public IEnumerable GetItems() + { + for (int i = 0; i < _collection.Length; i++) + { + yield return _collection[i]; + } + } } diff --git a/ProjectAirbus/ProjectAirbus/CollectionGenericObjects/StorageCollection.cs b/ProjectAirbus/ProjectAirbus/CollectionGenericObjects/StorageCollection.cs index ab39190..8011a01 100644 --- a/ProjectAirbus/ProjectAirbus/CollectionGenericObjects/StorageCollection.cs +++ b/ProjectAirbus/ProjectAirbus/CollectionGenericObjects/StorageCollection.cs @@ -1,10 +1,13 @@ -namespace ProjectAirbus.CollectionGenericObjects; +using ProjectAirbus.Drawnings; +using System.Text; + +namespace ProjectAirbus.CollectionGenericObjects; /// /// Класс-хранилище коллекций /// /// -public class StorageCollection where T : class +public class StorageCollection where T : DrawningAirbus { /// /// Словарь (хранилище с коллекциями @@ -16,6 +19,21 @@ public class StorageCollection where T : class /// public List Keys => _storages.Keys.ToList(); + /// + /// Ключевое слово, с которого должен начинаться файл + /// + private readonly string _collectionKey = "CollectionStorage"; + + /// + /// Разделитель для записи ключа и значения элемента словаря + /// + private readonly string _separatorForKeyValue = "|"; + + /// + /// Разделитель для записей коллекции данных в файл + /// + private readonly string _separatorItems = ";"; + /// /// Конструктор /// @@ -75,4 +93,139 @@ public class StorageCollection where T : class return null; } } + + /// + /// Сохранение информации по автомобилям в хранилище в файл + /// + /// Путь и имя файла + /// true - сохранение прошло успешно, false - ошибка при сохранение данных + public bool SaveData(string filename) + { + if (_storages.Count == 0) + { + return false; + } + + if (File.Exists(filename)) + { + File.Delete(filename); + } + + using (StreamWriter writer = new StreamWriter(filename)) + { + writer.Write(_collectionKey); + foreach (KeyValuePair> value in _storages) + { + StringBuilder sb = new(); + + sb.Append(Environment.NewLine); + // не сохраняем пустые коллекции + if (value.Value.Count == 0) + { + continue; + } + + sb.Append(value.Key); + sb.Append(_separatorForKeyValue); + sb.Append(value.Value.GetCollectionType); + sb.Append(_separatorForKeyValue); + sb.Append(value.Value.MaxCount); + sb.Append(_separatorForKeyValue); + + foreach (T? item in value.Value.GetItems()) + { + string data = item?.GetDataForSave() ?? string.Empty; + if (string.IsNullOrEmpty(data)) + { + continue; + } + + sb.Append(data); + sb.Append(_separatorItems); + } + + writer.Write(sb); + } + + } + + return true; + } + + /// + /// Загрузка информации по автомобилям в хранилище из файла + /// + /// Путь и имя файла + /// true - загрузка прошла успешно, false - ошибка при загрузке данных + public bool LoadData(string filename) + { + if (!File.Exists(filename)) + { + return false; + } + + using (StreamReader fs = File.OpenText(filename)) + { + string str = fs.ReadLine(); + + if (str == null || str.Length == 0) + { + return false; + } + + if (!str.StartsWith(_collectionKey)) + { + return false; + } + + _storages.Clear(); + string strs = ""; + while ((strs = fs.ReadLine()) != null) + { + string[] record = strs.Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries); + if (record.Length != 4) + { + continue; + } + + CollectionType collectionType = (CollectionType)Enum.Parse(typeof(CollectionType), record[1]); + ICollectionGenericObjects? collection = StorageCollection.CreateCollection(collectionType); + if (collection == null) + { + return false; + } + + collection.MaxCount = Convert.ToInt32(record[2]); + + string[] set = record[3].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries); + foreach (string elem in set) + { + if (elem?.CreateDrawningAirbus() is T airbus) + { + if (collection.Insert(airbus) == -1) + { + return false; + } + } + } + _storages.Add(record[0], collection); + } + return true; + } + } + + /// + /// Создание коллекции по типа + /// + /// + /// + private static ICollectionGenericObjects? CreateCollection(CollectionType collectionType) + { + return collectionType switch + { + CollectionType.Massive => new MassiveGenericObjects(), + CollectionType.List => new ListGenericObjects(), + _ => null + }; + } } diff --git a/ProjectAirbus/ProjectAirbus/Drawnings/DrawningAirbus.cs b/ProjectAirbus/ProjectAirbus/Drawnings/DrawningAirbus.cs index 8aa644b..5d2911c 100644 --- a/ProjectAirbus/ProjectAirbus/Drawnings/DrawningAirbus.cs +++ b/ProjectAirbus/ProjectAirbus/Drawnings/DrawningAirbus.cs @@ -85,6 +85,15 @@ public class DrawningAirbus EntityAirbus = new EntityAirbus(speed, weight, bodyColor); } + /// + /// Конструктор + /// + /// Класс-сущность + public DrawningAirbus(EntityAirbus airbus) : this() + { + EntityAirbus = new EntityAirbus(airbus.Speed, airbus.Weight, airbus.BodyColor); + } + /// /// Конструктор для наследников /// diff --git a/ProjectAirbus/ProjectAirbus/Drawnings/DrawningBigAirbus.cs b/ProjectAirbus/ProjectAirbus/Drawnings/DrawningBigAirbus.cs index c73b0df..05f5559 100644 --- a/ProjectAirbus/ProjectAirbus/Drawnings/DrawningBigAirbus.cs +++ b/ProjectAirbus/ProjectAirbus/Drawnings/DrawningBigAirbus.cs @@ -21,6 +21,15 @@ public class DrawningBigAirbus : DrawningAirbus EntityAirbus = new EntityBigAirbus(speed, weight, bodyColor, additionalColor, additionalEngine, passengerCompartment); } + /// + /// Конструктор + /// + /// Класс-сущность + public DrawningBigAirbus(EntityBigAirbus airbus) : base(145, 60) + { + EntityAirbus = new EntityBigAirbus(airbus.Speed, airbus.Weight, airbus.BodyColor, airbus.AdditionalColor, airbus.AdditionalEngine, airbus.PassengerCompartment); + } + public override void DrawTransport(Graphics g) { if (EntityAirbus == null || EntityAirbus is not EntityBigAirbus bigAirbus || !_startPosX.HasValue || !_startPosY.HasValue) diff --git a/ProjectAirbus/ProjectAirbus/Drawnings/ExtensionDrawningAirbus.cs b/ProjectAirbus/ProjectAirbus/Drawnings/ExtensionDrawningAirbus.cs new file mode 100644 index 0000000..b1987bf --- /dev/null +++ b/ProjectAirbus/ProjectAirbus/Drawnings/ExtensionDrawningAirbus.cs @@ -0,0 +1,55 @@ +using ProjectAirbus.Entities; + +namespace ProjectAirbus.Drawnings; + +/// +/// Расширение для класса EntityCar +/// +public static class ExtensionDrawningAirbus +{ + /// + /// Разделитель для записи информации по объекту в файл + /// + private static readonly string _separatorForObject = ":"; + + /// + /// Создание объекта из строки + /// + /// Строка с данными для создания объекта + /// Объект + public static DrawningAirbus? CreateDrawningAirbus(this string info) + { + string[] strs = info.Split(_separatorForObject); + + EntityAirbus? airbus = EntityBigAirbus.CreateEntityBigAirbus(strs); + if (airbus != null) + { + return new DrawningBigAirbus((EntityBigAirbus)airbus); + } + + airbus = EntityAirbus.CreateEntityAirbus(strs); + if (airbus != null) + { + return new DrawningAirbus(airbus); + } + + return null; + } + + /// + /// Получение данных для сохранения в файл + /// + /// Сохраняемый объект + /// Строка с данными по объекту + public static string GetDataForSave(this DrawningAirbus drawningAirbus) + { + string[]? array = drawningAirbus?.EntityAirbus?.GetStringRepresentation(); + + if (array == null) + { + return string.Empty; + } + + return string.Join(_separatorForObject, array); + } +} diff --git a/ProjectAirbus/ProjectAirbus/Entities/EntityAirbus.cs b/ProjectAirbus/ProjectAirbus/Entities/EntityAirbus.cs index f2ab82b..2de675b 100644 --- a/ProjectAirbus/ProjectAirbus/Entities/EntityAirbus.cs +++ b/ProjectAirbus/ProjectAirbus/Entities/EntityAirbus.cs @@ -42,4 +42,28 @@ public class EntityAirbus Weight = weight; BodyColor = bodyColor; } + + /// + /// Получение строк со значениями свойств объекта класса-сущности + /// + /// + public virtual string[] GetStringRepresentation() + { + return new[] { nameof(EntityAirbus), Speed.ToString(), Weight.ToString(), BodyColor.Name }; + } + + /// + /// Создание объекта из массива строк + /// + /// + /// + public static EntityAirbus? CreateEntityAirbus(string[] strs) + { + if (strs.Length != 4 || strs[0] != nameof(EntityAirbus)) + { + return null; + } + + return new EntityAirbus(Convert.ToInt32(strs[1]), Convert.ToDouble(strs[2]), Color.FromName(strs[3])); + } } diff --git a/ProjectAirbus/ProjectAirbus/Entities/EntityBIgAirbus.cs b/ProjectAirbus/ProjectAirbus/Entities/EntityBIgAirbus.cs index 140f8d6..2b2c059 100644 --- a/ProjectAirbus/ProjectAirbus/Entities/EntityBIgAirbus.cs +++ b/ProjectAirbus/ProjectAirbus/Entities/EntityBIgAirbus.cs @@ -37,4 +37,30 @@ public class EntityBigAirbus : EntityAirbus AdditionalEngine = additionalEngine; PassengerCompartment = passengerCompartment; } + + /// + /// Получение строк со значениями свойств объекта продвинутого класса-сущности + /// + /// + public override string[] GetStringRepresentation() + { + return new[] { nameof(EntityBigAirbus), Speed.ToString(), Weight.ToString(), BodyColor.Name, + AdditionalColor.Name, AdditionalEngine.ToString(), PassengerCompartment.ToString() }; + } + + /// + /// Создание продвинутого объекта из массива строк + /// + /// + /// + public static EntityAirbus? CreateEntityBigAirbus(string[] strs) + { + if (strs.Length != 7 || strs[0] != nameof(EntityBigAirbus)) + { + return null; + } + + return new EntityBigAirbus(Convert.ToInt32(strs[1]), Convert.ToDouble(strs[2]), Color.FromName(strs[3]), + Color.FromName(strs[4]), Convert.ToBoolean(strs[5]), Convert.ToBoolean(strs[6])); + } } diff --git a/ProjectAirbus/ProjectAirbus/FormAirbusCollection.Designer.cs b/ProjectAirbus/ProjectAirbus/FormAirbusCollection.Designer.cs index 6009c95..b2662de 100644 --- a/ProjectAirbus/ProjectAirbus/FormAirbusCollection.Designer.cs +++ b/ProjectAirbus/ProjectAirbus/FormAirbusCollection.Designer.cs @@ -46,10 +46,17 @@ labelCollectionName = new Label(); comboBoxSelectorCompany = new ComboBox(); pictureBox = new PictureBox(); + menuStrip = new MenuStrip(); + файлToolStripMenuItem = new ToolStripMenuItem(); + SaveToolStripMenuItem = new ToolStripMenuItem(); + LoadToolStripMenuItem = new ToolStripMenuItem(); + saveFileDialog = new SaveFileDialog(); + openFileDialog = new OpenFileDialog(); groupBocTools.SuspendLayout(); panelCompanyTools.SuspendLayout(); panelStorage.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit(); + menuStrip.SuspendLayout(); SuspendLayout(); // // groupBocTools @@ -59,9 +66,9 @@ groupBocTools.Controls.Add(panelStorage); groupBocTools.Controls.Add(comboBoxSelectorCompany); groupBocTools.Dock = DockStyle.Right; - groupBocTools.Location = new Point(867, 0); + groupBocTools.Location = new Point(867, 24); groupBocTools.Name = "groupBocTools"; - groupBocTools.Size = new Size(172, 536); + groupBocTools.Size = new Size(172, 538); groupBocTools.TabIndex = 0; groupBocTools.TabStop = false; groupBocTools.Text = "Инструменты"; @@ -75,7 +82,7 @@ panelCompanyTools.Controls.Add(buttonRefresh); panelCompanyTools.Dock = DockStyle.Bottom; panelCompanyTools.Enabled = false; - panelCompanyTools.Location = new Point(3, 335); + panelCompanyTools.Location = new Point(3, 337); panelCompanyTools.Name = "panelCompanyTools"; panelCompanyTools.Size = new Size(166, 198); panelCompanyTools.TabIndex = 10; @@ -240,18 +247,60 @@ // pictureBox // pictureBox.Dock = DockStyle.Fill; - pictureBox.Location = new Point(0, 0); + pictureBox.Location = new Point(0, 24); pictureBox.Name = "pictureBox"; - pictureBox.Size = new Size(867, 536); + pictureBox.Size = new Size(867, 538); pictureBox.TabIndex = 7; pictureBox.TabStop = false; // + // menuStrip + // + menuStrip.Items.AddRange(new ToolStripItem[] { файлToolStripMenuItem }); + menuStrip.Location = new Point(0, 0); + menuStrip.Name = "menuStrip"; + menuStrip.Size = new Size(1039, 24); + menuStrip.TabIndex = 8; + menuStrip.Text = "menuStrip"; + // + // файлToolStripMenuItem + // + файлToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { SaveToolStripMenuItem, LoadToolStripMenuItem }); + файлToolStripMenuItem.Name = "файлToolStripMenuItem"; + файлToolStripMenuItem.Size = new Size(48, 20); + файлToolStripMenuItem.Text = "Файл"; + // + // SaveToolStripMenuItem + // + SaveToolStripMenuItem.Name = "SaveToolStripMenuItem"; + SaveToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.S; + SaveToolStripMenuItem.Size = new Size(181, 22); + SaveToolStripMenuItem.Text = "Сохранение"; + SaveToolStripMenuItem.Click += SaveToolStripMenuItem_Click; + // + // LoadToolStripMenuItem + // + LoadToolStripMenuItem.Name = "LoadToolStripMenuItem"; + LoadToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.L; + LoadToolStripMenuItem.Size = new Size(181, 22); + LoadToolStripMenuItem.Text = "Загрузка"; + LoadToolStripMenuItem.Click += LoadToolStripMenuItem_Click; + // + // saveFileDialog + // + saveFileDialog.Filter = "txt file | *.txt"; + // + // openFileDialog + // + openFileDialog.Filter = "txt file | *.txt"; + // // FormAirbusCollection // AutoScaleMode = AutoScaleMode.None; - ClientSize = new Size(1039, 536); + ClientSize = new Size(1039, 562); Controls.Add(pictureBox); Controls.Add(groupBocTools); + Controls.Add(menuStrip); + MainMenuStrip = menuStrip; Name = "FormAirbusCollection"; Text = "Коллекция аэробусов"; groupBocTools.ResumeLayout(false); @@ -260,7 +309,10 @@ panelStorage.ResumeLayout(false); panelStorage.PerformLayout(); ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit(); + menuStrip.ResumeLayout(false); + menuStrip.PerformLayout(); ResumeLayout(false); + PerformLayout(); } #endregion @@ -283,5 +335,11 @@ private Button buttonCollectionAdd; private Button buttonCreateCompany; private Panel panelCompanyTools; + private MenuStrip menuStrip; + private ToolStripMenuItem файлToolStripMenuItem; + private ToolStripMenuItem SaveToolStripMenuItem; + private ToolStripMenuItem LoadToolStripMenuItem; + private SaveFileDialog saveFileDialog; + private OpenFileDialog openFileDialog; } } \ No newline at end of file diff --git a/ProjectAirbus/ProjectAirbus/FormAirbusCollection.cs b/ProjectAirbus/ProjectAirbus/FormAirbusCollection.cs index 870f3e0..9012b97 100644 --- a/ProjectAirbus/ProjectAirbus/FormAirbusCollection.cs +++ b/ProjectAirbus/ProjectAirbus/FormAirbusCollection.cs @@ -35,7 +35,7 @@ public partial class FormAirbusCollection : Form private void ComboBoxSelectorCompany_SelectedIndexChanged(Object sender, EventArgs e) { panelCompanyTools.Enabled = false; - } + } /// /// Добавление аэробуса @@ -48,8 +48,8 @@ public partial class FormAirbusCollection : Form // TODO передать метод form.Show(); form.AddEvent(SetAirbus); - } - + } + /// /// Добавление аэробуса /// @@ -248,4 +248,45 @@ public partial class FormAirbusCollection : Form panelCompanyTools.Enabled = true; RefreshListBoxItems(); } + + /// + /// Обработка нажатия "Сохранение" + /// + /// + /// + private void SaveToolStripMenuItem_Click(object sender, EventArgs e) + { + if (saveFileDialog.ShowDialog() == DialogResult.OK) + { + if (_storageCollection.SaveData(saveFileDialog.FileName)) + { + MessageBox.Show("Сохранение прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + else + { + MessageBox.Show("Не сохранилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + /// + /// Обработка нажатия "Загрузка" + /// + /// + /// + private void LoadToolStripMenuItem_Click(object sender, EventArgs e) + { + if (openFileDialog.ShowDialog() == DialogResult.OK) + { + if (_storageCollection.LoadData(openFileDialog.FileName)) + { + MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + else + { + MessageBox.Show("Не загрузилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + RefreshListBoxItems(); + } } diff --git a/ProjectAirbus/ProjectAirbus/FormAirbusCollection.resx b/ProjectAirbus/ProjectAirbus/FormAirbusCollection.resx index af32865..8b1dfa1 100644 --- a/ProjectAirbus/ProjectAirbus/FormAirbusCollection.resx +++ b/ProjectAirbus/ProjectAirbus/FormAirbusCollection.resx @@ -117,4 +117,13 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + + + 126, 17 + + + 261, 17 + \ No newline at end of file