From 7f7e5253a3f9df2e3c65b54a84c93af330c20670 Mon Sep 17 00:00:00 2001 From: user <732603@gmail.com> Date: Wed, 24 Apr 2024 21:25:45 +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 | 24 ++- .../MassiveGenericObjects.cs | 18 +- .../StorageCollection.cs | 159 +++++++++++++++++- .../ProjectMotorBoat/Drawings/DrawingBoat.cs | 7 + .../Drawings/DrawingMotorBoat.cs | 5 + .../Drawings/ExtentionDrawingBoat.cs | 56 ++++++ .../ProjectMotorBoat/Entities/EntityBoat.cs | 30 ++++ .../Entities/EntityMotorBoat.cs | 40 +++++ .../FormBoatCollection.Designer.cs | 78 +++++++-- .../ProjectMotorBoat/FormBoatCollection.cs | 42 +++++ .../ProjectMotorBoat/FormBoatCollection.resx | 9 + 13 files changed, 467 insertions(+), 16 deletions(-) create mode 100644 ProjectMotorBoat/ProjectMotorBoat/Drawings/ExtentionDrawingBoat.cs diff --git a/ProjectMotorBoat/ProjectMotorBoat/CollectionGenericObjects/AbstractCompany.cs b/ProjectMotorBoat/ProjectMotorBoat/CollectionGenericObjects/AbstractCompany.cs index 1403f66..5a87d1f 100644 --- a/ProjectMotorBoat/ProjectMotorBoat/CollectionGenericObjects/AbstractCompany.cs +++ b/ProjectMotorBoat/ProjectMotorBoat/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/ProjectMotorBoat/ProjectMotorBoat/CollectionGenericObjects/ICollectionGenericObjects.cs b/ProjectMotorBoat/ProjectMotorBoat/CollectionGenericObjects/ICollectionGenericObjects.cs index f5e51e7..b405892 100644 --- a/ProjectMotorBoat/ProjectMotorBoat/CollectionGenericObjects/ICollectionGenericObjects.cs +++ b/ProjectMotorBoat/ProjectMotorBoat/CollectionGenericObjects/ICollectionGenericObjects.cs @@ -15,7 +15,7 @@ public interface ICollectionGenericObjects /// /// Установка максимального количества элементов /// - int SetMaxCount { set; } + int MaxCount { get; set; } /// /// Добавление объекта в коллекцию @@ -45,4 +45,15 @@ public interface ICollectionGenericObjects /// Позиция /// Объект T? Get(int position); + + /// + /// Получение типа коллекции + /// + CollectionType GetCollectionType { get; } + + /// + /// Получение объектов коллекции по одному + /// + /// Поэлементый вывод элементов коллекции + IEnumerable GetItems(); } diff --git a/ProjectMotorBoat/ProjectMotorBoat/CollectionGenericObjects/ListGenericObjects.cs b/ProjectMotorBoat/ProjectMotorBoat/CollectionGenericObjects/ListGenericObjects.cs index ddb1ebe..f815ab9 100644 --- a/ProjectMotorBoat/ProjectMotorBoat/CollectionGenericObjects/ListGenericObjects.cs +++ b/ProjectMotorBoat/ProjectMotorBoat/CollectionGenericObjects/ListGenericObjects.cs @@ -13,7 +13,21 @@ public class ListGenericObjects : ICollectionGenericObjects public int Count => _collection.Count; - public int SetMaxCount { set { if (value > 0) { _maxCount = value; } } } + public int MaxCount { + get + { + return _maxCount; + } + set + { + if (value > 0) + { + _maxCount = value; + } + } + } + + public CollectionType GetCollectionType => CollectionType.List; /// /// Конструктор @@ -68,4 +82,12 @@ public class ListGenericObjects : ICollectionGenericObjects } return null; } + + public IEnumerable GetItems() + { + for (int i = 0; i < Count; ++i) + { + yield return _collection[i]; + } + } } diff --git a/ProjectMotorBoat/ProjectMotorBoat/CollectionGenericObjects/MassiveGenericObjects.cs b/ProjectMotorBoat/ProjectMotorBoat/CollectionGenericObjects/MassiveGenericObjects.cs index 27b3f31..27cc790 100644 --- a/ProjectMotorBoat/ProjectMotorBoat/CollectionGenericObjects/MassiveGenericObjects.cs +++ b/ProjectMotorBoat/ProjectMotorBoat/CollectionGenericObjects/MassiveGenericObjects.cs @@ -14,8 +14,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 +36,8 @@ public class MassiveGenericObjects : ICollectionGenericObjects } } + public CollectionType GetCollectionType => CollectionType.Massive; + /// /// Конструктор /// @@ -58,7 +64,7 @@ public class MassiveGenericObjects : ICollectionGenericObjects if (_collection[i] == null) { _collection[i] = obj; - return i; + return Count; } } return -1; @@ -108,4 +114,12 @@ public class MassiveGenericObjects : ICollectionGenericObjects return null; } + + public IEnumerable GetItems() + { + for (int i = 0; i < _collection.Length; ++i) + { + yield return _collection[i]; + } + } } diff --git a/ProjectMotorBoat/ProjectMotorBoat/CollectionGenericObjects/StorageCollection.cs b/ProjectMotorBoat/ProjectMotorBoat/CollectionGenericObjects/StorageCollection.cs index eabc5d7..8001079 100644 --- a/ProjectMotorBoat/ProjectMotorBoat/CollectionGenericObjects/StorageCollection.cs +++ b/ProjectMotorBoat/ProjectMotorBoat/CollectionGenericObjects/StorageCollection.cs @@ -1,5 +1,6 @@ using ProjectMotorBoat.Drawings; using ProjectMotorBoat.MovementStrategy; +using System.Text; using System.Windows.Forms; namespace ProjectMotorBoat.CollectionGenericObjects; @@ -9,7 +10,7 @@ namespace ProjectMotorBoat.CollectionGenericObjects; /// /// public class StorageCollection - where T : class + where T : DrawingBoat { /// /// Словарь (хранилище) с коллекциями @@ -21,6 +22,21 @@ public class StorageCollection /// public List Keys => _storages.Keys.ToList(); + /// + /// Ключевое слово, с которого должен начинаться файл + /// + private readonly string _collectionKey = "CollectionsStorage"; + + /// + /// Разделитель для записи ключа и значения элемента словаря + /// + private readonly string _separatorForKeyValue = "|"; + + /// + /// Разделитель для записей коллекции данных в файл + /// + private readonly string _separatorItems = ";"; + /// /// Конструктор /// @@ -82,4 +98,145 @@ public class StorageCollection return null; } } + + /// + /// Сохранение информации по автомобилям в хранилище в файл + /// + /// Путь и имя файла + /// true - сохранение прошло успешно, false - ошибка при сохранении данных + public bool SaveData(string filename) + { + if (_storages.Count == 0) + { + return false; + } + + if (File.Exists(filename)) + { + File.Delete(filename); + } + + StringBuilder sb = new(); + + sb.Append(_collectionKey); + foreach (KeyValuePair> value in _storages) + { + 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); + } + } + + using FileStream fs = new(filename, FileMode.Create); + byte[] info = new UTF8Encoding(true).GetBytes(sb.ToString()); + fs.Write(info, 0, info.Length); + return true; + } + + /// + /// Загрузка информации по автомобилям в хранилище из файла + /// + /// Путь и имя файла + /// true - загрузка прошла успешно, false - ошибка при загрузке данных + public bool LoadData(string filename) + { + if (!File.Exists(filename)) + { + return false; + } + + string bufferTextFromFile = ""; + using (FileStream fs = new(filename, FileMode.Open)) + { + byte[] b = new byte[fs.Length]; + UTF8Encoding temp = new(true); + while (fs.Read(b, 0, b.Length) > 0) + { + bufferTextFromFile += temp.GetString(b); + } + } + + string[] strs = bufferTextFromFile.Split(new char[] { '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries); + if (strs == null || strs.Length == 0) + { + return false; + } + + if (!strs[0].Equals(_collectionKey)) + { + // Если нет такой записи, то это не те данные + return false; + } + + _storages.Clear(); + foreach (string data in strs) + { + string[] record = data.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?.CreateDrawingBoat() is T boat) + { + if (collection.Insert(boat) == 0) + { + 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/ProjectMotorBoat/ProjectMotorBoat/Drawings/DrawingBoat.cs b/ProjectMotorBoat/ProjectMotorBoat/Drawings/DrawingBoat.cs index 6d91165..76981e8 100644 --- a/ProjectMotorBoat/ProjectMotorBoat/Drawings/DrawingBoat.cs +++ b/ProjectMotorBoat/ProjectMotorBoat/Drawings/DrawingBoat.cs @@ -84,6 +84,13 @@ public class DrawingBoat EntityBoat = new EntityBoat(speed, weight, bodyColor); } + public DrawingBoat(EntityBoat entityBoat) + { + EntityBoat = entityBoat; + } + + + /// /// Конструктор для наследников /// diff --git a/ProjectMotorBoat/ProjectMotorBoat/Drawings/DrawingMotorBoat.cs b/ProjectMotorBoat/ProjectMotorBoat/Drawings/DrawingMotorBoat.cs index f939b5f..b4d7838 100644 --- a/ProjectMotorBoat/ProjectMotorBoat/Drawings/DrawingMotorBoat.cs +++ b/ProjectMotorBoat/ProjectMotorBoat/Drawings/DrawingMotorBoat.cs @@ -23,6 +23,11 @@ public class DrawingMotorBoat : DrawingBoat EntityBoat = new EntityMotorBoat(speed, weight, bodyColor, additionalColor, inboardEngine, oar, protectiveGlass); } + public DrawingMotorBoat(EntityBoat entityBoat) : base(100, 50) + { + EntityBoat = entityBoat; + } + /// /// Прорисовка объекта /// diff --git a/ProjectMotorBoat/ProjectMotorBoat/Drawings/ExtentionDrawingBoat.cs b/ProjectMotorBoat/ProjectMotorBoat/Drawings/ExtentionDrawingBoat.cs new file mode 100644 index 0000000..04c757d --- /dev/null +++ b/ProjectMotorBoat/ProjectMotorBoat/Drawings/ExtentionDrawingBoat.cs @@ -0,0 +1,56 @@ +using ProjectMotorBoat.Entities; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectMotorBoat.Drawings; + +/// +/// Расширение для класса EntityBoat +/// +public static class ExtentionDrawingBoat +{ + /// + /// Разделитель для записи информации по объекту в файл + /// + private static readonly string _separatorForObject = ":"; + + /// + /// Создание объекта из строки + /// + /// Строка с данными для создания объекта + /// Объект + public static DrawingBoat? CreateDrawingBoat(this string info) + { + string[] strs = info.Split(_separatorForObject); + EntityBoat? boat = EntityMotorBoat.CreateEntityMotorBoat(strs); + + if (boat != null) + //return new DrawingMotorBoat(1,2,Color.Black,Color.Black,true,true,true); + return new DrawingMotorBoat(boat); + + boat = EntityBoat.CreateEntityBoat(strs); + if (boat != null) + //return new DrawingBoat(1, 2, Color.Black); + return new DrawingBoat(boat); + + return null; + } + + /// + /// Получение данных для сохранения в файл + /// + /// Сохраняемый объект + /// Строка с данными по объекту + public static string GetDataForSave(this DrawingBoat drawingBoat) + { + string[]? array = drawingBoat?.EntityBoat?.GetStringRepresentation(); + + if (array == null) + return string.Empty; + + return string.Join(_separatorForObject, array); + } +} diff --git a/ProjectMotorBoat/ProjectMotorBoat/Entities/EntityBoat.cs b/ProjectMotorBoat/ProjectMotorBoat/Entities/EntityBoat.cs index d98c381..3aff601 100644 --- a/ProjectMotorBoat/ProjectMotorBoat/Entities/EntityBoat.cs +++ b/ProjectMotorBoat/ProjectMotorBoat/Entities/EntityBoat.cs @@ -44,4 +44,34 @@ public class EntityBoat { BodyColor = name; } + + /// + /// Поолучение строк с значениями свойств объекта класса-сущности + /// + /// + public virtual string[] GetStringRepresentation() + { + return new[] + { + nameof(EntityBoat), + Speed.ToString(), + Weight.ToString(), + BodyColor.Name + }; + } + + /// + /// Создание объекта из массива строк + /// + /// + /// + public static EntityBoat? CreateEntityBoat(string[] strs) + { + if (strs.Length != 4 || strs[0] != nameof(EntityBoat)) + { + return null; + } + + return new EntityBoat(Convert.ToInt32(strs[1]), Convert.ToDouble(strs[2]), Color.FromName(strs[3])); + } } diff --git a/ProjectMotorBoat/ProjectMotorBoat/Entities/EntityMotorBoat.cs b/ProjectMotorBoat/ProjectMotorBoat/Entities/EntityMotorBoat.cs index 5489678..6551861 100644 --- a/ProjectMotorBoat/ProjectMotorBoat/Entities/EntityMotorBoat.cs +++ b/ProjectMotorBoat/ProjectMotorBoat/Entities/EntityMotorBoat.cs @@ -48,4 +48,44 @@ public class EntityMotorBoat : EntityBoat { AdditionalColor = name; } + + /// + /// Поолучение строк с значениями свойств объекта класса-сущности + /// + /// + public override string[] GetStringRepresentation() + { + return new[] + { + nameof(EntityMotorBoat), + Speed.ToString(), + Weight.ToString(), + BodyColor.Name,AdditionalColor.Name, + InboardEngine.ToString(), + Oar.ToString(), + ProtectiveGlass.ToString() + }; + } + + /// + /// Создание объекта из массива строк + /// + /// + /// + public static EntityMotorBoat? CreateEntityMotorBoat(string[] strs) + { + if (strs.Length != 8 || strs[0] != nameof(EntityMotorBoat)) + { + return null; + } + + return new EntityMotorBoat( + Convert.ToInt32(strs[1]), + Convert.ToDouble(strs[2]), + Color.FromName(strs[3]), + Color.FromName(strs[4]), + Convert.ToBoolean(strs[5]), + Convert.ToBoolean(strs[6]), + Convert.ToBoolean(strs[7])); + } } \ No newline at end of file diff --git a/ProjectMotorBoat/ProjectMotorBoat/FormBoatCollection.Designer.cs b/ProjectMotorBoat/ProjectMotorBoat/FormBoatCollection.Designer.cs index 1cf8d06..fcf7995 100644 --- a/ProjectMotorBoat/ProjectMotorBoat/FormBoatCollection.Designer.cs +++ b/ProjectMotorBoat/ProjectMotorBoat/FormBoatCollection.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(); groupBoxTools.SuspendLayout(); panelCompanyTools.SuspendLayout(); panelStorage.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit(); + menuStrip.SuspendLayout(); SuspendLayout(); // // groupBoxTools @@ -59,9 +66,9 @@ groupBoxTools.Controls.Add(panelStorage); groupBoxTools.Controls.Add(comboBoxSelectorCompany); groupBoxTools.Dock = DockStyle.Right; - groupBoxTools.Location = new Point(777, 0); + groupBoxTools.Location = new Point(777, 24); groupBoxTools.Name = "groupBoxTools"; - groupBoxTools.Size = new Size(201, 585); + groupBoxTools.Size = new Size(201, 561); groupBoxTools.TabIndex = 0; groupBoxTools.TabStop = false; groupBoxTools.Text = "Инструменты"; @@ -77,13 +84,13 @@ panelCompanyTools.Enabled = false; panelCompanyTools.Location = new Point(3, 329); panelCompanyTools.Name = "panelCompanyTools"; - panelCompanyTools.Size = new Size(195, 253); + panelCompanyTools.Size = new Size(195, 229); panelCompanyTools.TabIndex = 8; // // buttonAddBoat // buttonAddBoat.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddBoat.Location = new Point(3, 3); + buttonAddBoat.Location = new Point(3, 4); buttonAddBoat.Name = "buttonAddBoat"; buttonAddBoat.Size = new Size(184, 32); buttonAddBoat.TabIndex = 1; @@ -94,7 +101,7 @@ // buttonRefresh // buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonRefresh.Location = new Point(3, 184); + buttonRefresh.Location = new Point(3, 177); buttonRefresh.Name = "buttonRefresh"; buttonRefresh.Size = new Size(184, 32); buttonRefresh.TabIndex = 6; @@ -104,7 +111,7 @@ // // maskedTextBoxPosition // - maskedTextBoxPosition.Location = new Point(3, 79); + maskedTextBoxPosition.Location = new Point(3, 72); maskedTextBoxPosition.Mask = "00"; maskedTextBoxPosition.Name = "maskedTextBoxPosition"; maskedTextBoxPosition.Size = new Size(189, 23); @@ -114,7 +121,7 @@ // buttonGoToCheck // buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonGoToCheck.Location = new Point(3, 146); + buttonGoToCheck.Location = new Point(3, 139); buttonGoToCheck.Name = "buttonGoToCheck"; buttonGoToCheck.Size = new Size(184, 32); buttonGoToCheck.TabIndex = 5; @@ -125,7 +132,7 @@ // buttonRemoveBoat // buttonRemoveBoat.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonRemoveBoat.Location = new Point(3, 108); + buttonRemoveBoat.Location = new Point(3, 101); buttonRemoveBoat.Name = "buttonRemoveBoat"; buttonRemoveBoat.Size = new Size(184, 32); buttonRemoveBoat.TabIndex = 4; @@ -240,12 +247,52 @@ // pictureBox // pictureBox.Dock = DockStyle.Fill; - pictureBox.Location = new Point(0, 0); + pictureBox.Location = new Point(0, 24); pictureBox.Name = "pictureBox"; - pictureBox.Size = new Size(777, 585); + pictureBox.Size = new Size(777, 561); pictureBox.TabIndex = 1; pictureBox.TabStop = false; // + // menuStrip + // + menuStrip.Items.AddRange(new ToolStripItem[] { файлToolStripMenuItem }); + menuStrip.Location = new Point(0, 0); + menuStrip.Name = "menuStrip"; + menuStrip.Size = new Size(978, 24); + menuStrip.TabIndex = 2; + menuStrip.Text = "menuStrip1"; + // + // файл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"; + // // FormBoatCollection // AutoScaleDimensions = new SizeF(7F, 15F); @@ -253,6 +300,8 @@ ClientSize = new Size(978, 585); Controls.Add(pictureBox); Controls.Add(groupBoxTools); + Controls.Add(menuStrip); + MainMenuStrip = menuStrip; Name = "FormBoatCollection"; Text = " Коллекция лодок"; groupBoxTools.ResumeLayout(false); @@ -261,7 +310,10 @@ panelStorage.ResumeLayout(false); panelStorage.PerformLayout(); ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit(); + menuStrip.ResumeLayout(false); + menuStrip.PerformLayout(); ResumeLayout(false); + PerformLayout(); } #endregion @@ -284,5 +336,11 @@ private Label labelCollectionName; 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/ProjectMotorBoat/ProjectMotorBoat/FormBoatCollection.cs b/ProjectMotorBoat/ProjectMotorBoat/FormBoatCollection.cs index 22684bd..a830c41 100644 --- a/ProjectMotorBoat/ProjectMotorBoat/FormBoatCollection.cs +++ b/ProjectMotorBoat/ProjectMotorBoat/FormBoatCollection.cs @@ -247,4 +247,46 @@ public partial class FormBoatCollection : Form panelCompanyTools.Enabled = true; RerfreshListBoxItems(); } + + /// + /// Обработка нажатия "Сохранение" + /// + /// + /// + 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)) + { + RerfreshListBoxItems(); + MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + else + { + MessageBox.Show("Не загрузилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } } diff --git a/ProjectMotorBoat/ProjectMotorBoat/FormBoatCollection.resx b/ProjectMotorBoat/ProjectMotorBoat/FormBoatCollection.resx index af32865..8b1dfa1 100644 --- a/ProjectMotorBoat/ProjectMotorBoat/FormBoatCollection.resx +++ b/ProjectMotorBoat/ProjectMotorBoat/FormBoatCollection.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