From 274f3b8dc39c3f189628f87791742931befd3a0c Mon Sep 17 00:00:00 2001 From: ilyaryabovv Date: Sat, 27 Apr 2024 15:13:11 +0400 Subject: [PATCH] =?UTF-8?q?6=20=D0=BB=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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AbstractCompany.cs | 2 +- .../ICollectionGenericObjects.cs | 12 +- .../ListGenericObjects.cs | 33 ++++- .../MassiveGenericObjects.cs | 24 ++- .../StorageCollection.cs | 139 +++++++++++++++++- .../Drawnings/DrawingStormtrooper.cs | 6 + .../Drawnings/DrawningBaseStormtrooper.cs | 8 + .../ExtentionDrawningStormtrooper.cs | 48 ++++++ .../Entities/EntityBaseStormtrooper.cs | 24 +++ .../Entities/EntityStormtrooper.cs | 23 +++ .../FormStormtrooperCollection.Designer.cs | 71 ++++++++- .../FormStormtrooperCollection.cs | 58 +++++++- .../FormStormtrooperCollection.resx | 12 ++ 13 files changed, 427 insertions(+), 33 deletions(-) create mode 100644 ProjectStormtrooper/ProjectStormtrooper/Drawnings/ExtentionDrawningStormtrooper.cs diff --git a/ProjectStormtrooper/ProjectStormtrooper/CollectionGenericObjects/AbstractCompany.cs b/ProjectStormtrooper/ProjectStormtrooper/CollectionGenericObjects/AbstractCompany.cs index 3062187..4d63f1a 100644 --- a/ProjectStormtrooper/ProjectStormtrooper/CollectionGenericObjects/AbstractCompany.cs +++ b/ProjectStormtrooper/ProjectStormtrooper/CollectionGenericObjects/AbstractCompany.cs @@ -51,7 +51,7 @@ public abstract class AbstractCompany _pictureWidth = picWidth; _pictureHeight = picHeight; _collection = collection; - _collection.SetMaxCount = GetMaxCount; + _collection.MaxCount = GetMaxCount; } /// diff --git a/ProjectStormtrooper/ProjectStormtrooper/CollectionGenericObjects/ICollectionGenericObjects.cs b/ProjectStormtrooper/ProjectStormtrooper/CollectionGenericObjects/ICollectionGenericObjects.cs index 372b2ce..e441b76 100644 --- a/ProjectStormtrooper/ProjectStormtrooper/CollectionGenericObjects/ICollectionGenericObjects.cs +++ b/ProjectStormtrooper/ProjectStormtrooper/CollectionGenericObjects/ICollectionGenericObjects.cs @@ -15,7 +15,7 @@ public interface ICollectionGenericObjects /// /// Установка максимального количества элементов /// - int SetMaxCount { set; } + int MaxCount { set; get; } /// /// Добавление объекта в коллекцию @@ -45,4 +45,14 @@ public interface ICollectionGenericObjects /// Позиция /// Объект T? Get(int position); + + /// + /// Получение типа коллекции + /// + CollectionType GetCollectionType { get; } + /// + /// Получение объектов коллекции по одному + /// + /// Поэлементый вывод элементов коллекции + IEnumerable GetItems(); } \ No newline at end of file diff --git a/ProjectStormtrooper/ProjectStormtrooper/CollectionGenericObjects/ListGenericObjects.cs b/ProjectStormtrooper/ProjectStormtrooper/CollectionGenericObjects/ListGenericObjects.cs index 0e15a69..43a9bbb 100644 --- a/ProjectStormtrooper/ProjectStormtrooper/CollectionGenericObjects/ListGenericObjects.cs +++ b/ProjectStormtrooper/ProjectStormtrooper/CollectionGenericObjects/ListGenericObjects.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace ProjectStormtrooper.CollectionGenericObjects; +namespace ProjectStormtrooper.CollectionGenericObjects; /// /// Параметризованный набор объектов @@ -22,7 +16,22 @@ where T : class /// private int _maxCount; public int Count => _collection.Count; - public int SetMaxCount { set { if (value > 0) { _maxCount = value; } } } + public int MaxCount { + get + { + return Count; + } + set + { + if (value > 0) + { + _maxCount = value; + } + } + } + + public CollectionType GetCollectionType => CollectionType.List; + /// /// Конструктор /// @@ -75,5 +84,13 @@ where T : class return null; } + public IEnumerable GetItems() + { + for (int i = 0; i < Count; ++i) + { + yield return _collection[i]; + } + } } + diff --git a/ProjectStormtrooper/ProjectStormtrooper/CollectionGenericObjects/MassiveGenericObjects.cs b/ProjectStormtrooper/ProjectStormtrooper/CollectionGenericObjects/MassiveGenericObjects.cs index 2556922..50248c9 100644 --- a/ProjectStormtrooper/ProjectStormtrooper/CollectionGenericObjects/MassiveGenericObjects.cs +++ b/ProjectStormtrooper/ProjectStormtrooper/CollectionGenericObjects/MassiveGenericObjects.cs @@ -1,4 +1,5 @@ using ProjectStormtrooper.Drawnings; + namespace ProjectStormtrooper.CollectionGenericObjects; /// @@ -15,8 +16,12 @@ public class MassiveGenericObjects : ICollectionGenericObjects public int Count => _collection.Length; - public int SetMaxCount + public int MaxCount { + get + { + return _collection.Length; + } set { if (value > 0) @@ -32,6 +37,8 @@ public class MassiveGenericObjects : ICollectionGenericObjects } } } + + public CollectionType GetCollectionType => CollectionType.Massive; /// /// Конструктор /// @@ -51,9 +58,10 @@ public class MassiveGenericObjects : ICollectionGenericObjects { // TODO вставка в свободное место набора int index = 0; - while(index< _collection.Length) + while (index < _collection.Length) { - if (_collection[index] == null) { + if (_collection[index] == null) + { _collection[index] = obj; return index; } @@ -107,4 +115,12 @@ public class MassiveGenericObjects : ICollectionGenericObjects _collection[position] = null; return temp; } -} \ No newline at end of file + + public IEnumerable GetItems() + { + for (int i = 0; i < _collection.Length; ++i) + { + yield return _collection[i]; + } + } +} diff --git a/ProjectStormtrooper/ProjectStormtrooper/CollectionGenericObjects/StorageCollection.cs b/ProjectStormtrooper/ProjectStormtrooper/CollectionGenericObjects/StorageCollection.cs index 0c51784..9cc8089 100644 --- a/ProjectStormtrooper/ProjectStormtrooper/CollectionGenericObjects/StorageCollection.cs +++ b/ProjectStormtrooper/ProjectStormtrooper/CollectionGenericObjects/StorageCollection.cs @@ -1,8 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Linq; +using ProjectStormtrooper.Drawnings; using System.Text; -using System.Threading.Tasks; namespace ProjectStormtrooper.CollectionGenericObjects; @@ -11,7 +8,7 @@ namespace ProjectStormtrooper.CollectionGenericObjects; /// /// public class StorageCollection -where T : class +where T : DrawningBaseStormtrooper { /// /// Словарь (хранилище) с коллекциями @@ -37,8 +34,8 @@ where T : class { // TODO проверка, что name не пустой и нет в словаре записи с таким ключом // TODO Прописать логику для добавления - if(!(collectionType == CollectionType.None) && !_storages.ContainsKey(name)){ - if(collectionType== CollectionType.List) + if (!(collectionType == CollectionType.None) && !_storages.ContainsKey(name)) { + if (collectionType == CollectionType.List) { _storages.Add(name, new ListGenericObjects()); } @@ -74,5 +71,133 @@ where T : class return null; } } + + /// + /// Ключевое слово, с которого должен начинаться файл + /// + private readonly string _collectionKey = "CollectionsStorage"; + /// + /// Разделитель для записи ключа и значения элемента словаря + /// + private readonly string _separatorForKeyValue = "|"; + /// + /// Разделитель для записей коллекции данных в файл + /// + private readonly string _separatorItems = ";"; + + /// + /// Сохранение информации по бомбардировщикам в хранилище в файл + /// + /// Путь и имя файла + /// 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) + { + writer.Write(Environment.NewLine); + if (value.Value.Count == 0) + { + continue; + } + writer.Write(value.Key); + writer.Write(_separatorForKeyValue); + writer.Write(value.Value.GetCollectionType); + writer.Write(_separatorForKeyValue); + writer.Write(value.Value.MaxCount); + writer.Write(_separatorForKeyValue); + foreach (T? item in value.Value.GetItems()) + { + string data = item?.GetDataForSave() ?? string.Empty; + if (string.IsNullOrEmpty(data)) + { + continue; + } + writer.Write(data); + writer.Write(_separatorItems); + } + } + 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?.CreateDrawningStormtrooper() is T stormtrooper) + { + if (collection.Insert(stormtrooper) == -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/ProjectStormtrooper/ProjectStormtrooper/Drawnings/DrawingStormtrooper.cs b/ProjectStormtrooper/ProjectStormtrooper/Drawnings/DrawingStormtrooper.cs index d8c1982..f8df9e2 100644 --- a/ProjectStormtrooper/ProjectStormtrooper/Drawnings/DrawingStormtrooper.cs +++ b/ProjectStormtrooper/ProjectStormtrooper/Drawnings/DrawingStormtrooper.cs @@ -19,6 +19,12 @@ public class DrawingStormtrooper : DrawningBaseStormtrooper { EntityBaseStormtrooper = new EntityStormtrooper(speed, weight, bodyColor, additionalColor, bombs, rockets); } + + public DrawingStormtrooper(EntityStormtrooper entityBaseStormtrooper) : base(140, 135) + { + EntityBaseStormtrooper = new EntityStormtrooper(entityBaseStormtrooper.Speed, entityBaseStormtrooper.Weight, entityBaseStormtrooper.BodyColor, entityBaseStormtrooper.AdditionalColor, entityBaseStormtrooper.Bombs, entityBaseStormtrooper.Rockets); + } + /// /// Прорисовка объекта /// diff --git a/ProjectStormtrooper/ProjectStormtrooper/Drawnings/DrawningBaseStormtrooper.cs b/ProjectStormtrooper/ProjectStormtrooper/Drawnings/DrawningBaseStormtrooper.cs index c6d6575..6e17b5f 100644 --- a/ProjectStormtrooper/ProjectStormtrooper/Drawnings/DrawningBaseStormtrooper.cs +++ b/ProjectStormtrooper/ProjectStormtrooper/Drawnings/DrawningBaseStormtrooper.cs @@ -87,6 +87,11 @@ public class DrawningBaseStormtrooper _drawningStormtrooperWidth= drawningStormtrooperWidth; } + public DrawningBaseStormtrooper(EntityBaseStormtrooper entityBaseStormtrooper) : this() + { + EntityBaseStormtrooper = new EntityBaseStormtrooper(entityBaseStormtrooper.Speed,entityBaseStormtrooper.Weight,entityBaseStormtrooper.BodyColor); + } + /// /// Установка границ поля /// @@ -243,5 +248,8 @@ public class DrawningBaseStormtrooper Nose[2].X = _startPosX.Value + 20; Nose[2].Y = _startPosY.Value + 60; g.FillPolygon(bodyColorBrush, Nose); } + + + } diff --git a/ProjectStormtrooper/ProjectStormtrooper/Drawnings/ExtentionDrawningStormtrooper.cs b/ProjectStormtrooper/ProjectStormtrooper/Drawnings/ExtentionDrawningStormtrooper.cs new file mode 100644 index 0000000..9b34fcc --- /dev/null +++ b/ProjectStormtrooper/ProjectStormtrooper/Drawnings/ExtentionDrawningStormtrooper.cs @@ -0,0 +1,48 @@ +using ProjectStormtrooper.Entities; +namespace ProjectStormtrooper.Drawnings; +/// +/// Расширение для класса EntityStormtrooper +/// +public static class ExtentionDrawningStormtrooper +{ + /// + /// Разделитель для записи информации по объекту в файл + /// + private static readonly string _separatorForObject = ":"; + /// + /// Создание объекта из строки + /// + /// Строка с данными для создания объекта + /// Объект + public static DrawningBaseStormtrooper? CreateDrawningStormtrooper(this string info) + { + string[] strs = info.Split(_separatorForObject); + EntityBaseStormtrooper? stormtrooper = EntityStormtrooper.CreateEntityStormtrooper(strs); + if (stormtrooper != null) + { + return new DrawingStormtrooper((EntityStormtrooper)stormtrooper); + } + + stormtrooper = EntityBaseStormtrooper.CreateEntityBaseStormtrooper(strs); + + if (stormtrooper != null) + { + return new DrawningBaseStormtrooper(stormtrooper); + } + return null; + } + /// + /// Получение данных для сохранения в файл + /// + /// Сохраняемый объект + /// Строка с данными по объекту + public static string GetDataForSave(this DrawningBaseStormtrooper drawningBaseStormtrooper) + { + string[]? array = drawningBaseStormtrooper?.EntityBaseStormtrooper?.GetStringRepresentation(); + if (array == null) + { + return string.Empty; + } + return string.Join(_separatorForObject, array); + } +} diff --git a/ProjectStormtrooper/ProjectStormtrooper/Entities/EntityBaseStormtrooper.cs b/ProjectStormtrooper/ProjectStormtrooper/Entities/EntityBaseStormtrooper.cs index b2bc6e9..09f0239 100644 --- a/ProjectStormtrooper/ProjectStormtrooper/Entities/EntityBaseStormtrooper.cs +++ b/ProjectStormtrooper/ProjectStormtrooper/Entities/EntityBaseStormtrooper.cs @@ -41,4 +41,28 @@ public class EntityBaseStormtrooper Weight = weight; BodyColor = bodyColor; } + + /// + /// Получение строк со значениями свойств объекта класса-сущности + /// + /// + public virtual string[] GetStringRepresentation() + { + return new[] { nameof(EntityBaseStormtrooper), Speed.ToString(),Weight.ToString(), BodyColor.Name }; + } + + /// + /// Создание объекта из массива строк + /// + /// + /// + public static EntityBaseStormtrooper? CreateEntityBaseStormtrooper(string[] strs) + { + if (strs.Length != 4 || strs[0] != nameof(EntityBaseStormtrooper)) + { + return null; + } + return new EntityBaseStormtrooper(Convert.ToInt32(strs[1]), Convert.ToDouble(strs[2]), Color.FromName(strs[3])); + } + } diff --git a/ProjectStormtrooper/ProjectStormtrooper/Entities/EntityStormtrooper.cs b/ProjectStormtrooper/ProjectStormtrooper/Entities/EntityStormtrooper.cs index bb0f400..b658b9f 100644 --- a/ProjectStormtrooper/ProjectStormtrooper/Entities/EntityStormtrooper.cs +++ b/ProjectStormtrooper/ProjectStormtrooper/Entities/EntityStormtrooper.cs @@ -40,6 +40,29 @@ public class EntityStormtrooper : EntityBaseStormtrooper Bombs = bombs; Rockets = rockets; } + + /// + /// Получение строк со значениями свойств объекта класса-сущности + /// + /// + public override string[] GetStringRepresentation() + { + return new[] { nameof(EntityStormtrooper), Speed.ToString(), Weight.ToString(), BodyColor.Name, AdditionalColor.Name,Bombs.ToString(),Rockets.ToString() }; + } + + /// + /// Создание объекта из массива строк + /// + /// + /// + public static EntityStormtrooper? CreateEntityStormtrooper(string[] strs) + { + if (strs.Length != 7 || strs[0] != nameof(EntityStormtrooper)) + { + return null; + } + return new EntityStormtrooper(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/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooperCollection.Designer.cs b/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooperCollection.Designer.cs index 8288043..4467095 100644 --- a/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooperCollection.Designer.cs +++ b/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooperCollection.Designer.cs @@ -46,10 +46,17 @@ labelCollectionName = new Label(); comboBoxSelectorCompany = new ComboBox(); pictureBox = new PictureBox(); + menuStrip = new MenuStrip(); + fileToolStripMenuItem = new ToolStripMenuItem(); + saveToolStripMenuItem = new ToolStripMenuItem(); + loadToolStripMenuItem = new ToolStripMenuItem(); + saveFileDialog = new SaveFileDialog(); + openFileDialog = new OpenFileDialog(); groupBoxTools.SuspendLayout(); panelCompanyTools.SuspendLayout(); panelStorage.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit(); + menuStrip.SuspendLayout(); SuspendLayout(); // // groupBoxTools @@ -58,9 +65,9 @@ groupBoxTools.Controls.Add(panelStorage); groupBoxTools.Controls.Add(comboBoxSelectorCompany); groupBoxTools.Dock = DockStyle.Right; - groupBoxTools.Location = new Point(898, 0); + groupBoxTools.Location = new Point(935, 24); groupBoxTools.Name = "groupBoxTools"; - groupBoxTools.Size = new Size(225, 659); + groupBoxTools.Size = new Size(225, 654); groupBoxTools.TabIndex = 0; groupBoxTools.TabStop = false; groupBoxTools.Text = "Инструменты"; @@ -75,7 +82,7 @@ panelCompanyTools.Controls.Add(buttonRemoveStormtrooper); panelCompanyTools.Dock = DockStyle.Bottom; panelCompanyTools.Enabled = false; - panelCompanyTools.Location = new Point(3, 299); + panelCompanyTools.Location = new Point(3, 294); panelCompanyTools.Name = "panelCompanyTools"; panelCompanyTools.Size = new Size(219, 357); panelCompanyTools.TabIndex = 8; @@ -236,19 +243,62 @@ // pictureBox // pictureBox.Dock = DockStyle.Fill; - pictureBox.Location = new Point(0, 0); + pictureBox.Location = new Point(0, 24); pictureBox.Name = "pictureBox"; - pictureBox.Size = new Size(898, 659); + pictureBox.Size = new Size(935, 654); pictureBox.TabIndex = 1; pictureBox.TabStop = false; // + // menuStrip + // + menuStrip.Items.AddRange(new ToolStripItem[] { fileToolStripMenuItem }); + menuStrip.Location = new Point(0, 0); + menuStrip.Name = "menuStrip"; + menuStrip.Size = new Size(1160, 24); + menuStrip.TabIndex = 2; + menuStrip.Text = "menuStrip"; + // + // fileToolStripMenuItem + // + fileToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { saveToolStripMenuItem, loadToolStripMenuItem }); + fileToolStripMenuItem.Name = "fileToolStripMenuItem"; + fileToolStripMenuItem.Size = new Size(48, 20); + fileToolStripMenuItem.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.FileName = "openFileDialog1"; + openFileDialog.Filter = "txt file | *.txt"; + // // FormStormtrooperCollection // AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(1123, 659); + ClientSize = new Size(1160, 678); Controls.Add(pictureBox); Controls.Add(groupBoxTools); + Controls.Add(menuStrip); + MainMenuStrip = menuStrip; Name = "FormStormtrooperCollection"; Text = "Коллекция бомбардировщиков"; groupBoxTools.ResumeLayout(false); @@ -257,7 +307,10 @@ panelStorage.ResumeLayout(false); panelStorage.PerformLayout(); ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit(); + menuStrip.ResumeLayout(false); + menuStrip.PerformLayout(); ResumeLayout(false); + PerformLayout(); } #endregion @@ -280,5 +333,11 @@ private ListBox listBoxCollection; private Button buttonCollectionAdd; private Panel panelCompanyTools; + private MenuStrip menuStrip; + private ToolStripMenuItem fileToolStripMenuItem; + private ToolStripMenuItem saveToolStripMenuItem; + private ToolStripMenuItem loadToolStripMenuItem; + private SaveFileDialog saveFileDialog; + private OpenFileDialog openFileDialog; } } \ No newline at end of file diff --git a/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooperCollection.cs b/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooperCollection.cs index bd14a40..65ca676 100644 --- a/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooperCollection.cs +++ b/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooperCollection.cs @@ -33,17 +33,17 @@ public partial class FormStormtrooperCollection : Form { panelCompanyTools.Enabled = true; } - /// - /// Добавление бомбардировщика в коллекцию - /// - /// + /// + /// Добавление бомбардировщика в коллекцию + /// + /// private void SetStormtrooper(DrawningBaseStormtrooper stormtrooper) { if (_company == null || stormtrooper == null) { return; } - if (_company + stormtrooper !=-1) + if (_company + stormtrooper != -1) { MessageBox.Show("Объект добавлен"); pictureBox.Image = _company.Show(); @@ -59,7 +59,8 @@ public partial class FormStormtrooperCollection : Form /// /// /// - private void buttonAddBaseStormtrooper_Click(object sender, EventArgs e) { + private void buttonAddBaseStormtrooper_Click(object sender, EventArgs e) + { FormStormtrooperConfig form = new(); form.Show(); @@ -237,6 +238,51 @@ public partial class FormStormtrooperCollection : Form } } } + /// + /// Обработка нажатия "Сохранение" + /// + /// + /// + 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) + { + //TODO продумать логику + if (openFileDialog.ShowDialog() == DialogResult.OK) + { + if (_storageCollection.LoadData(openFileDialog.FileName)) + { + MessageBox.Show("Загрузка прошла успешно", + "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information); + RerfreshListBoxItems(); + } + else + { + MessageBox.Show("Загрузка не удалась", "Результат", + MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + } } diff --git a/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooperCollection.resx b/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooperCollection.resx index af32865..d8e8b97 100644 --- a/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooperCollection.resx +++ b/ProjectStormtrooper/ProjectStormtrooper/FormStormtrooperCollection.resx @@ -117,4 +117,16 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + + + 126, 17 + + + 261, 17 + + + 26 + \ No newline at end of file