diff --git a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/CollectionGenericObjects/AbstractCompany.cs b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/CollectionGenericObjects/AbstractCompany.cs index 377357a..348358c 100644 --- a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/CollectionGenericObjects/AbstractCompany.cs +++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/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/ProjectAircraftCarrier_/ProjectAircraftCarrier_/CollectionGenericObjects/ICollectionGenericObjects.cs b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/CollectionGenericObjects/ICollectionGenericObjects.cs index d193837..50d2abc 100644 --- a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/CollectionGenericObjects/ICollectionGenericObjects.cs +++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/CollectionGenericObjects/ICollectionGenericObjects.cs @@ -15,7 +15,8 @@ public interface ICollectionGenericObjects /// /// Установка максимального количества элементов /// - int SetMaxCount { set; } + int MaxCount { get; set; } + /// /// Добавление объекта в коллекцию @@ -45,5 +46,16 @@ public interface ICollectionGenericObjects /// Позиция /// Объект T? Get(int position); + + /// + /// Получение типа коллекции + /// + CollectionType GetCollectionType { get; } + + /// + /// Получение объектов коллекции по одному + /// + /// Поэлементый вывод элементов коллекции + IEnumerable GetItems(); } diff --git a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/CollectionGenericObjects/ListGenericObject.cs b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/CollectionGenericObjects/ListGenericObjects.cs similarity index 79% rename from ProjectAircraftCarrier_/ProjectAircraftCarrier_/CollectionGenericObjects/ListGenericObject.cs rename to ProjectAircraftCarrier_/ProjectAircraftCarrier_/CollectionGenericObjects/ListGenericObjects.cs index 565ec2d..6e0016d 100644 --- a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/CollectionGenericObjects/ListGenericObject.cs +++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/CollectionGenericObjects/ListGenericObjects.cs @@ -6,7 +6,7 @@ namespace ProjectAircraftCarrier_.CollectionGenericObjects; /// Параметризованный набор объектов /// /// Параметр: ограничение - ссылочный тип -public class ListGenericObject : ICollectionGenericObjects +public class ListGenericObjects : ICollectionGenericObjects where T : class { /// @@ -21,12 +21,14 @@ public class ListGenericObject : ICollectionGenericObjects public int Count => _collection.Count; - public int SetMaxCount { set { if (value > 0) { _maxCount = value; } } } + public int MaxCount { get { return _collection.Count; } set { if (value > 0) { _maxCount = value; } } } + + public CollectionType GetCollectionType => CollectionType.List; /// /// Конструктор /// - public ListGenericObject() + public ListGenericObjects() { _collection = new(); } @@ -75,4 +77,12 @@ public class ListGenericObject : ICollectionGenericObjects return obj; } + + public IEnumerable GetItems() + { + for (int i = 0; i < Count; ++i) + { + yield return _collection[i]; + } + } } diff --git a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/CollectionGenericObjects/MassiveGenericObjects.cs b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/CollectionGenericObjects/MassiveGenericObjects.cs index 851a207..0de3e9c 100644 --- a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/CollectionGenericObjects/MassiveGenericObjects.cs +++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/CollectionGenericObjects/MassiveGenericObjects.cs @@ -1,4 +1,5 @@ -namespace ProjectAircraftCarrier_.CollectionGenericObjects; + +namespace ProjectAircraftCarrier_.CollectionGenericObjects; /// /// Параметризованный набор объектов @@ -14,8 +15,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; + /// /// Конструктор /// @@ -107,5 +114,13 @@ public class MassiveGenericObjects : ICollectionGenericObjects _collection[position] = null; return obj; } + + public IEnumerable GetItems() + { + for (int i = 0; i < _collection.Length; ++i) + { + yield return _collection[i]; + } + } } diff --git a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/CollectionGenericObjects/StorageCollection.cs b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/CollectionGenericObjects/StorageCollection.cs index e49e591..43873af 100644 --- a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/CollectionGenericObjects/StorageCollection.cs +++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/CollectionGenericObjects/StorageCollection.cs @@ -1,6 +1,5 @@ using ProjectAircraftCarrier_.Drawnings; -using ProjectAircraftCarrier_.CollectionGenericObjects; -using System.Xml.Linq; +using System.Text; namespace ProjectAircraftCarrier_.CollectionGenericObjects; @@ -9,7 +8,7 @@ namespace ProjectAircraftCarrier_.CollectionGenericObjects; /// /// public class StorageCollection - where T : class + where T : DrawningWarship { /// /// Словарь (хранилище) с коллекциями @@ -21,6 +20,19 @@ public class StorageCollection /// public List Keys => _storages.Keys.ToList(); + /// + /// Ключевое слово, с которого должен начинаться файл + /// + private readonly string _collectionKey = "CollectionsStorage"; + /// + /// Разделитель для записи ключа и значения элемента словаря + /// + private readonly string _separatorForKeyValue = "|"; + /// + /// Разделитель для записей коллекции данных в файл + /// + private readonly string _separatorItems = ";"; + /// /// Конструктор /// @@ -48,7 +60,7 @@ public class StorageCollection if (collectionType == CollectionType.List) { - _storages.Add(name, new ListGenericObject()); + _storages.Add(name, new ListGenericObjects()); } } @@ -83,4 +95,134 @@ 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); + } + + using (StreamWriter sw = new StreamWriter(filename)) + { + sw.Write(_collectionKey); + + foreach (KeyValuePair> value in _storages) + { + sw.Write(Environment.NewLine); + // не сохраняем пустые коллекции + if (value.Value.Count == 0) + { + continue; + } + + sw.Write(value.Key); + sw.Write(_separatorForKeyValue); + sw.Write(value.Value.GetCollectionType); + sw.Write(_separatorForKeyValue); + sw.Write(value.Value.MaxCount); + sw.Write(_separatorForKeyValue); + + foreach (T? item in value.Value.GetItems()) + { + string data = item?.GetDataForSave() ?? string.Empty; + + if (string.IsNullOrEmpty(data)) + { + continue; + } + sw.Write(data); + sw.Write(_separatorItems); + } + } + } + + return true; + } + + /// + /// Загрузка информации по автомобилям в хранилище из файла + /// + /// Путь и имя файла + /// true - загрузка прошла успешно, false - ошибка при загрузке данных + public bool LoadData(string filename) + { + if (!File.Exists(filename)) + { + return false; + } + + using (StreamReader sr = new(filename)) + { + string line = sr.ReadLine(); + + if (line == null || line.Length == 0) + { + return false; + } + if (!line.Equals(_collectionKey)) + { + //если нет такой записи, то это не те данные + return false; + } + _storages.Clear(); + + while ((line = sr.ReadLine()) != null) + { + string[] record = line.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?.CreateDrawningWarship() is T warship) + { + if (collection.Insert(warship) == -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, + }; + } } \ No newline at end of file diff --git a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Drawnings/DrawningAircraftCarrier.cs b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Drawnings/DrawningAircraftCarrier.cs index 35de8bf..bd25c83 100644 --- a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Drawnings/DrawningAircraftCarrier.cs +++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Drawnings/DrawningAircraftCarrier.cs @@ -17,9 +17,20 @@ public class DrawningAircraftCarrier : DrawningWarship /// Палуба для взлета самолетов /// Рубка управления /// Истребитель - public DrawningAircraftCarrier(int speed, double weight, Color bodyColor, Color additionalColor, bool deckForAircraftTakeOff, bool controlCabin, bool fighterJet) : base(140, 50) + public DrawningAircraftCarrier(int speed, double weight, Color bodyColor, Color additionalColor, + bool deckForAircraftTakeOff, bool controlCabin, bool fighterJet) : base(140, 50) { - EntityWarship = new EntityAircraftCarrier(speed, weight, bodyColor, additionalColor, deckForAircraftTakeOff, controlCabin, fighterJet); + EntityWarship = new EntityAircraftCarrier(speed, weight, bodyColor, additionalColor, + deckForAircraftTakeOff, controlCabin, fighterJet); + } + + /// + /// Конструктор для класса Extention + /// + /// + public DrawningAircraftCarrier(EntityWarship? aircraftCarrier) : base(aircraftCarrier) + { + EntityWarship = aircraftCarrier; } public override void DrawTransport(Graphics g) diff --git a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Drawnings/DrawningWarship.cs b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Drawnings/DrawningWarship.cs index c1c8114..88041d9 100644 --- a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Drawnings/DrawningWarship.cs +++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Drawnings/DrawningWarship.cs @@ -95,6 +95,15 @@ public class DrawningWarship _drawningWarshipHeight = DrawningWarshiprierHeight; } + /// + /// Конструктор для класса Extention + /// + /// + public DrawningWarship(EntityWarship? warship) : this() + { + EntityWarship = warship; + } + /// /// Установка границ поля /// diff --git a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Drawnings/ExtentionDrawningWarship.cs b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Drawnings/ExtentionDrawningWarship.cs new file mode 100644 index 0000000..2d19078 --- /dev/null +++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Drawnings/ExtentionDrawningWarship.cs @@ -0,0 +1,56 @@ +using ProjectAircraftCarrier_.Drawnings; +using ProjectAircraftCarrier_.Entities; + +namespace ProjectAircraftCarrier_.Drawnings; + +/// +/// Расширение для класса EntityWarship +/// +public static class ExtentionDrawningWarship +{ + /// + /// Разделитель для записи информации по объекту в файл + /// + private static readonly string _separatorForObject = ":"; + + /// + /// Создание объекта из строки + /// + /// Строка с данными для создания объекта + /// Объект + public static DrawningWarship? CreateDrawningWarship(this string info) + { + string[] strs = info.Split(_separatorForObject); + EntityWarship? warship = EntityAircraftCarrier.CreateEntityAircraftCarrier(strs); + if (warship != null) + { + return new DrawningAircraftCarrier(warship); + } + + warship = EntityWarship.CreateEntityWarship(strs); + if (warship != null) + { + return new DrawningWarship(warship); + } + + return null; + } + + /// + /// Получение данных для сохранения в файл + /// + /// Сохраняемый объект + /// Строка с данными по объекту + public static string GetDataForSave(this DrawningWarship drawningWarship) + { + string[]? array = drawningWarship?.EntityWarship?.GetStringRepresentation(); + + if (array == null) + { + return string.Empty; + } + + return string.Join(_separatorForObject, array); + } + +} diff --git a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Entities/EntityAircraftCarrier.cs b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Entities/EntityAircraftCarrier.cs index 3e87b05..5c36aaf 100644 --- a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Entities/EntityAircraftCarrier.cs +++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Entities/EntityAircraftCarrier.cs @@ -51,4 +51,35 @@ public class EntityAircraftCarrier : EntityWarship { AdditionalColor = newColor; } + + public override string[] GetStringRepresentation() + { + return new[] + { + nameof(EntityAircraftCarrier), + Speed.ToString(), + Weight.ToString(), + BodyColor.Name, + AdditionalColor.Name, + DeckForAircraftTakeOff.ToString(), + ControlCabin.ToString(), + FighterJet.ToString() + }; + } + + /// + /// Создание объекта из массива строк + /// + /// + /// + public static EntityAircraftCarrier? CreateEntityAircraftCarrier(string[] strs) + { + if (strs.Length != 8 || strs[0] != nameof(EntityAircraftCarrier)) + { + return null; + } + + return new EntityAircraftCarrier(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/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Entities/EntityWarship.cs b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Entities/EntityWarship.cs index 23ab4d3..2d323b3 100644 --- a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Entities/EntityWarship.cs +++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/Entities/EntityWarship.cs @@ -46,4 +46,28 @@ public class EntityWarship { BodyColor = newColor; } + + /// + /// Получение строк со значениями свойств объекта класса-сущности + /// + /// + public virtual string[] GetStringRepresentation() + { + return new[] { nameof(EntityWarship), Speed.ToString(), Weight.ToString(), BodyColor.Name }; + } + + /// + /// Создание объекта из массива строк + /// + /// + /// + public static EntityWarship? CreateEntityWarship(string[] strs) + { + if (strs.Length != 4 || strs[0] != nameof(EntityWarship)) + { + return null; + } + + return new EntityWarship(Convert.ToInt32(strs[1]), Convert.ToDouble(strs[2]), Color.FromName(strs[3])); + } } diff --git a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/FormWarshipCollection.Designer.cs b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/FormWarshipCollection.Designer.cs index 84c88c2..6bd83ac 100644 --- a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/FormWarshipCollection.Designer.cs +++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/FormWarshipCollection.Designer.cs @@ -30,6 +30,7 @@ { groupBoxTools = new GroupBox(); panelCompanyTools = new Panel(); + buttonAddWarship = new Button(); maskedTextBoxPosition = new MaskedTextBox(); buttonRefresh = new Button(); buttonRemoveWarship = new Button(); @@ -45,11 +46,17 @@ labelCollectionName = new Label(); comboBoxSelectorCompany = new ComboBox(); pictureBox = new PictureBox(); - buttonAddWarship = new Button(); + 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(1176, 0); + groupBoxTools.Location = new Point(1176, 38); groupBoxTools.Name = "groupBoxTools"; - groupBoxTools.Size = new Size(326, 961); + groupBoxTools.Size = new Size(326, 923); groupBoxTools.TabIndex = 0; groupBoxTools.TabStop = false; groupBoxTools.Text = "Инструменты"; @@ -75,14 +82,25 @@ panelCompanyTools.Controls.Add(buttonGoToCheck); panelCompanyTools.Dock = DockStyle.Bottom; panelCompanyTools.Enabled = false; - panelCompanyTools.Location = new Point(3, 529); + panelCompanyTools.Location = new Point(3, 518); panelCompanyTools.Name = "panelCompanyTools"; - panelCompanyTools.Size = new Size(320, 429); + panelCompanyTools.Size = new Size(320, 402); panelCompanyTools.TabIndex = 9; // + // buttonAddWarship + // + buttonAddWarship.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonAddWarship.Location = new Point(3, 14); + buttonAddWarship.Name = "buttonAddWarship"; + buttonAddWarship.Size = new Size(314, 72); + buttonAddWarship.TabIndex = 1; + buttonAddWarship.Text = "Добавление военного корабля"; + buttonAddWarship.UseVisualStyleBackColor = true; + buttonAddWarship.Click += ButtonAddWarship_Click; + // // maskedTextBoxPosition // - maskedTextBoxPosition.Location = new Point(3, 159); + maskedTextBoxPosition.Location = new Point(3, 95); maskedTextBoxPosition.Mask = "00"; maskedTextBoxPosition.Name = "maskedTextBoxPosition"; maskedTextBoxPosition.Size = new Size(314, 35); @@ -92,7 +110,7 @@ // buttonRefresh // buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonRefresh.Location = new Point(3, 356); + buttonRefresh.Location = new Point(3, 292); buttonRefresh.Name = "buttonRefresh"; buttonRefresh.Size = new Size(314, 72); buttonRefresh.TabIndex = 6; @@ -103,7 +121,7 @@ // buttonRemoveWarship // buttonRemoveWarship.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonRemoveWarship.Location = new Point(3, 200); + buttonRemoveWarship.Location = new Point(3, 136); buttonRemoveWarship.Name = "buttonRemoveWarship"; buttonRemoveWarship.Size = new Size(314, 72); buttonRemoveWarship.TabIndex = 4; @@ -114,7 +132,7 @@ // buttonGoToCheck // buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonGoToCheck.Location = new Point(3, 278); + buttonGoToCheck.Location = new Point(3, 214); buttonGoToCheck.Name = "buttonGoToCheck"; buttonGoToCheck.Size = new Size(314, 72); buttonGoToCheck.TabIndex = 5; @@ -229,22 +247,52 @@ // pictureBox // pictureBox.Dock = DockStyle.Fill; - pictureBox.Location = new Point(0, 0); + pictureBox.Location = new Point(0, 38); pictureBox.Name = "pictureBox"; - pictureBox.Size = new Size(1176, 961); + pictureBox.Size = new Size(1176, 923); pictureBox.TabIndex = 1; pictureBox.TabStop = false; // - // buttonAddWarship + // menuStrip // - buttonAddWarship.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddWarship.Location = new Point(3, 3); - buttonAddWarship.Name = "buttonAddWarship"; - buttonAddWarship.Size = new Size(314, 72); - buttonAddWarship.TabIndex = 1; - buttonAddWarship.Text = "Добавление военного корабля"; - buttonAddWarship.UseVisualStyleBackColor = true; - buttonAddWarship.Click += ButtonAddWarship_Click; + menuStrip.ImageScalingSize = new Size(28, 28); + menuStrip.Items.AddRange(new ToolStripItem[] { файлToolStripMenuItem }); + menuStrip.Location = new Point(0, 0); + menuStrip.Name = "menuStrip"; + menuStrip.Size = new Size(1502, 38); + menuStrip.TabIndex = 2; + menuStrip.Text = "menuStrip"; + // + // файлToolStripMenuItem + // + файлToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { saveToolStripMenuItem, loadToolStripMenuItem }); + файлToolStripMenuItem.Name = "файлToolStripMenuItem"; + файлToolStripMenuItem.Size = new Size(80, 34); + файлToolStripMenuItem.Text = "Файл"; + // + // saveToolStripMenuItem + // + saveToolStripMenuItem.Name = "saveToolStripMenuItem"; + saveToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.S; + saveToolStripMenuItem.Size = new Size(317, 40); + saveToolStripMenuItem.Text = "Сохранение"; + saveToolStripMenuItem.Click += SaveToolStripMenuItem_Click; + // + // loadToolStripMenuItem + // + loadToolStripMenuItem.Name = "loadToolStripMenuItem"; + loadToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.L; + loadToolStripMenuItem.Size = new Size(317, 40); + loadToolStripMenuItem.Text = "Загрузка"; + loadToolStripMenuItem.Click += LoadToolStripMenuItem_Click; + // + // saveFileDialog + // + saveFileDialog.Filter = "txt file | *.txt"; + // + // openFileDialog + // + openFileDialog.Filter = "txt file | *.txt"; // // FormWarshipCollection // @@ -253,6 +301,8 @@ ClientSize = new Size(1502, 961); Controls.Add(pictureBox); Controls.Add(groupBoxTools); + Controls.Add(menuStrip); + MainMenuStrip = menuStrip; Name = "FormWarshipCollection"; Text = "Коллекция военных кораблей"; groupBoxTools.ResumeLayout(false); @@ -261,7 +311,10 @@ panelStorage.ResumeLayout(false); panelStorage.PerformLayout(); ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit(); + menuStrip.ResumeLayout(false); + menuStrip.PerformLayout(); ResumeLayout(false); + PerformLayout(); } #endregion @@ -284,5 +337,11 @@ private Button buttonCreateCompany; private Panel panelCompanyTools; private Button buttonAddWarship; + 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/ProjectAircraftCarrier_/ProjectAircraftCarrier_/FormWarshipCollection.cs b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/FormWarshipCollection.cs index e861476..63e61b7 100644 --- a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/FormWarshipCollection.cs +++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/FormWarshipCollection.cs @@ -245,4 +245,46 @@ public partial class FormWarshipCollection : 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)) + { + MessageBox.Show("Загрузка прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information); + RerfreshListBoxItems(); + } + else + { + MessageBox.Show("Не загрузилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } } diff --git a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/FormWarshipCollection.resx b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/FormWarshipCollection.resx index af32865..6097848 100644 --- a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/FormWarshipCollection.resx +++ b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/FormWarshipCollection.resx @@ -117,4 +117,13 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + + + 183, 17 + + + 398, 17 + \ No newline at end of file diff --git a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/WarshipDelegate.cs b/ProjectAircraftCarrier_/ProjectAircraftCarrier_/WarshipDelegate.cs deleted file mode 100644 index a8b6131..0000000 --- a/ProjectAircraftCarrier_/ProjectAircraftCarrier_/WarshipDelegate.cs +++ /dev/null @@ -1,9 +0,0 @@ -using ProjectAircraftCarrier_.Drawnings; - -namespace ProjectAircraftCarrier_; - -/// -/// Делегат передачи объекта класса-прорисовки -/// -/// -public delegate void WarshipDelegate(DrawningWarship warship);