From 017a4aec3e4a6077cf0e44f63160d3f1d26cfaf3 Mon Sep 17 00:00:00 2001 From: Anastasia-Sin Date: Mon, 13 May 2024 12:59:51 +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 | 13 +- .../ListGenericObjects.cs | 23 +- .../MassiveGenericObjects.cs | 16 +- .../StorageCollection.cs | 143 ++++++- ProjectCruiser/CruiserDelegate.cs | 10 + ProjectCruiser/Drawnings/DrawningCruiser.cs | 16 +- .../Drawnings/DrawningMilitaryCruiser.cs | 8 + .../Drawnings/ExtentionDrawningCruiser.cs | 50 +++ ProjectCruiser/Entities/EntityCruiser.cs | 31 ++ .../Entities/EntityMilitaryCruiser.cs | 32 ++ ProjectCruiser/FormCruiserConfing.Designer.cs | 370 ++++++++++++++++++ ProjectCruiser/FormCruiserConfing.cs | 176 +++++++++ ProjectCruiser/FormCruiserConfing.resx | 120 ++++++ .../FormCruisersCollection.Designer.cs | 83 +++- ProjectCruiser/FormCruisersCollection.cs | 111 +++--- ProjectCruiser/FormCruisersCollection.resx | 12 + 17 files changed, 1137 insertions(+), 79 deletions(-) create mode 100644 ProjectCruiser/CruiserDelegate.cs create mode 100644 ProjectCruiser/Drawnings/ExtentionDrawningCruiser.cs create mode 100644 ProjectCruiser/FormCruiserConfing.Designer.cs create mode 100644 ProjectCruiser/FormCruiserConfing.cs create mode 100644 ProjectCruiser/FormCruiserConfing.resx diff --git a/ProjectCruiser/CollectionGenericObjects/AbstractCompany.cs b/ProjectCruiser/CollectionGenericObjects/AbstractCompany.cs index 0193272..6431470 100644 --- a/ProjectCruiser/CollectionGenericObjects/AbstractCompany.cs +++ b/ProjectCruiser/CollectionGenericObjects/AbstractCompany.cs @@ -49,7 +49,7 @@ namespace ProjectCruiser.CollectionGenericObjects _pictureWidth = picWidth; _pictureHeight = picHeight; _collection = collection; - _collection.SetMaxCount = GetMaxCount; + _collection.MaxCount = GetMaxCount; } /// diff --git a/ProjectCruiser/CollectionGenericObjects/ICollectionGenericObjects.cs b/ProjectCruiser/CollectionGenericObjects/ICollectionGenericObjects.cs index 93f8c9d..d92a50c 100644 --- a/ProjectCruiser/CollectionGenericObjects/ICollectionGenericObjects.cs +++ b/ProjectCruiser/CollectionGenericObjects/ICollectionGenericObjects.cs @@ -15,7 +15,7 @@ /// /// Установка максимального количества элементов /// - int SetMaxCount { set; } + int MaxCount { get; set; } /// /// Добавление объекта в коллекцию @@ -45,6 +45,17 @@ /// Позиция /// Объект T? Get(int position); + + /// + /// Получение типа коллекции + /// + CollectionType GetCollectionType { get; } + /// + /// Получение объектов коллекции по одному + /// + /// Поэлементый вывод элементов коллекции + IEnumerable GetItems(); + } } diff --git a/ProjectCruiser/CollectionGenericObjects/ListGenericObjects.cs b/ProjectCruiser/CollectionGenericObjects/ListGenericObjects.cs index bb8ccd9..31863d1 100644 --- a/ProjectCruiser/CollectionGenericObjects/ListGenericObjects.cs +++ b/ProjectCruiser/CollectionGenericObjects/ListGenericObjects.cs @@ -16,7 +16,20 @@ /// private int _maxCount; public int Count => _collection.Count; - public int SetMaxCount { set { if (value > 0) { _maxCount = value; } } } + public int MaxCount + { + get => _maxCount; + set + { + if (value > 0) + { + _maxCount = value; + } + } + } + + public CollectionType GetCollectionType => CollectionType.List; + /// /// Конструктор /// @@ -61,5 +74,13 @@ _collection.RemoveAt(position); return obj; } + + public IEnumerable GetItems() + { + for (int i = 0; i < _collection.Count; ++i) + { + yield return _collection[i]; + } + } } } diff --git a/ProjectCruiser/CollectionGenericObjects/MassiveGenericObjects.cs b/ProjectCruiser/CollectionGenericObjects/MassiveGenericObjects.cs index e0a110e..d256937 100644 --- a/ProjectCruiser/CollectionGenericObjects/MassiveGenericObjects.cs +++ b/ProjectCruiser/CollectionGenericObjects/MassiveGenericObjects.cs @@ -14,8 +14,12 @@ namespace ProjectCruiser.CollectionGenericObjects /// private T?[] _collection; public int Count => _collection.Length; - public int SetMaxCount + public int MaxCount { + get + { + return _collection.Length; + } set { if (value > 0) @@ -32,6 +36,8 @@ namespace ProjectCruiser.CollectionGenericObjects } } + public CollectionType GetCollectionType => CollectionType.Massive; + /// /// Конструктор /// @@ -111,5 +117,13 @@ namespace ProjectCruiser.CollectionGenericObjects _collection[position] = null; return obj; } + + public IEnumerable GetItems() + { + for (int i = 0; i < _collection.Length; ++i) + { + yield return _collection[i]; + } + } } } diff --git a/ProjectCruiser/CollectionGenericObjects/StorageCollection.cs b/ProjectCruiser/CollectionGenericObjects/StorageCollection.cs index d099cd9..6bb2401 100644 --- a/ProjectCruiser/CollectionGenericObjects/StorageCollection.cs +++ b/ProjectCruiser/CollectionGenericObjects/StorageCollection.cs @@ -1,10 +1,13 @@ -namespace ProjectCruiser.CollectionGenericObjects +using ProjectCruiser.Drawnings; +using System.Text; + +namespace ProjectCruiser.CollectionGenericObjects { // Класс-хранилище коллекций /// /// public class StorageCollection - where T : class + where T : DrawningCruiser { /// /// Словарь (хранилище) с коллекциями @@ -16,6 +19,21 @@ /// public List Keys => _storages.Keys.ToList(); + /// + /// Ключевое слово, с которого должен начинаться файл + /// + private readonly string _collectionKey = "CollectionsStorage"; + + /// + /// Разделитель для записи ключа и значения элемента словаря + /// + private readonly string _separatorForKeyValue = "|"; + + /// + /// Разделитель для записей коллекции данных в файл + /// + private readonly string _separatorItems = ";"; + /// /// Конструктор /// @@ -69,5 +87,126 @@ 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?.CreateDrawningCruiser() is T cruiser) + { + if (collection.Insert(cruiser) == -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/ProjectCruiser/CruiserDelegate.cs b/ProjectCruiser/CruiserDelegate.cs new file mode 100644 index 0000000..bf1a09d --- /dev/null +++ b/ProjectCruiser/CruiserDelegate.cs @@ -0,0 +1,10 @@ +using ProjectCruiser.Drawnings; + +namespace ProjectCruiser; + +/// +/// Делегат передачи объекта класса-прорисвоки +/// +/// +public delegate void CruiserDelegate(DrawningCruiser cruiser); + diff --git a/ProjectCruiser/Drawnings/DrawningCruiser.cs b/ProjectCruiser/Drawnings/DrawningCruiser.cs index b8cbec0..ece51ce 100644 --- a/ProjectCruiser/Drawnings/DrawningCruiser.cs +++ b/ProjectCruiser/Drawnings/DrawningCruiser.cs @@ -19,11 +19,11 @@ public class DrawningCruiser /// private int? _pictureHeight; /// - /// Левая координата прорисовки автомобиля + /// Левая координата прорисовки крейсера /// protected int? _startPosX; /// - /// Верхняя кооридната прорисовки автомобиля + /// Верхняя кооридната прорисовки крейсера /// protected int? _startPosY; @@ -57,7 +57,7 @@ public class DrawningCruiser /// /// Пустой онструктор /// - private DrawningCruiser() + public DrawningCruiser() { _pictureWidth = null; _pictureHeight = null; @@ -86,6 +86,15 @@ public class DrawningCruiser _pictureHeight = drawningCarHeight; } + /// + /// конструктор + /// + /// + public DrawningCruiser(EntityCruiser entityCruiser) + { + EntityCruiser = entityCruiser; + } + /// /// Установка границ поля /// @@ -183,6 +192,7 @@ public class DrawningCruiser return false; } } + /// /// Прорисовка объекта /// diff --git a/ProjectCruiser/Drawnings/DrawningMilitaryCruiser.cs b/ProjectCruiser/Drawnings/DrawningMilitaryCruiser.cs index a21ade3..efd9cce 100644 --- a/ProjectCruiser/Drawnings/DrawningMilitaryCruiser.cs +++ b/ProjectCruiser/Drawnings/DrawningMilitaryCruiser.cs @@ -22,6 +22,14 @@ namespace ProjectCruiser.Drawnings EntityCruiser = new EntityMilitaryCruiser(speed, weight, bodyColor, additionalColor, helicopterArea, boat, weapon); } + public DrawningMilitaryCruiser(EntityCruiser entityCruiser) + { + if (entityCruiser != null) + { + EntityCruiser = entityCruiser; + } + } + public override void DrawTransport(Graphics g) { if (EntityCruiser == null || EntityCruiser is not EntityMilitaryCruiser entityMilitaryCruiser || !_startPosX.HasValue || diff --git a/ProjectCruiser/Drawnings/ExtentionDrawningCruiser.cs b/ProjectCruiser/Drawnings/ExtentionDrawningCruiser.cs new file mode 100644 index 0000000..4be9fa2 --- /dev/null +++ b/ProjectCruiser/Drawnings/ExtentionDrawningCruiser.cs @@ -0,0 +1,50 @@ +using ProjectCruiser.Entities; + +namespace ProjectCruiser.Drawnings +{ + public static class ExtentionDrawningCruiser + { + /// + /// Разделитель для записи информации по объекту в файл + /// + private static readonly string _separatorForObject = ":"; + + /// + /// Создание объекта из строки + /// + /// Строка с данными для создания объекта + /// Объект + public static DrawningCruiser? CreateDrawningCruiser(this string info) + { + string[] strs = info.Split(_separatorForObject); + EntityCruiser? cruiser = EntityMilitaryCruiser.CreateEntityMilitaryCruiser(strs); + if (cruiser != null) + { + return new DrawningMilitaryCruiser(cruiser); + } + + cruiser = EntityCruiser.CreateEntityCruiser(strs); + if (cruiser != null) + { + return new DrawningCruiser(cruiser); + } + return null; + } + + /// + /// Получение данных для сохранения в файл + /// + /// Сохраняемый объект + /// Строка с данными по объекту + public static string GetDataForSave(this DrawningCruiser drawningCrusier) + { + string[]? array = drawningCrusier?.EntityCruiser?.GetStringRepresentation(); + if (array == null) + { + return string.Empty; + } + return string.Join(_separatorForObject, array); + } + + } +} diff --git a/ProjectCruiser/Entities/EntityCruiser.cs b/ProjectCruiser/Entities/EntityCruiser.cs index d7e81bc..3c9c942 100644 --- a/ProjectCruiser/Entities/EntityCruiser.cs +++ b/ProjectCruiser/Entities/EntityCruiser.cs @@ -10,19 +10,26 @@ public class EntityCruiser /// Скорость /// public int Speed { get; private set; } + /// /// Вес /// public double Weight { get; private set; } + /// /// Основной цвет /// public Color BodyColor { get; private set; } + public void setBodyColor(Color color) + { + BodyColor = color; + } /// /// Шаг перемещения автомобиля /// public double Step => Speed * 100 / Weight; + /// /// Инициализация полей объекта-класса крейсера /// @@ -35,4 +42,28 @@ public class EntityCruiser Weight = weight; BodyColor = bodyColor; } + + /// + /// Получение строк со значениями свойств объекта класса-сущности + /// + /// + public virtual string[] GetStringRepresentation() + { + return new[] { nameof(EntityCruiser), Speed.ToString(), Weight.ToString(), BodyColor.Name }; + } + + /// + /// Создание объекта из массива строк + /// + /// + /// + public static EntityCruiser? CreateEntityCruiser(string[] strs) + { + if (strs.Length != 4 || strs[0] != nameof(EntityCruiser)) + { + return null; + } + + return new EntityCruiser(Convert.ToInt32(strs[1]), Convert.ToDouble(strs[2]), Color.FromName(strs[3])); + } } diff --git a/ProjectCruiser/Entities/EntityMilitaryCruiser.cs b/ProjectCruiser/Entities/EntityMilitaryCruiser.cs index 46925ff..b833355 100644 --- a/ProjectCruiser/Entities/EntityMilitaryCruiser.cs +++ b/ProjectCruiser/Entities/EntityMilitaryCruiser.cs @@ -6,18 +6,25 @@ /// Признак (опция) наличие вертолетной площадки /// public bool HelicopterArea { get; private set; } + /// /// Признак (опция) наличие шлюпок /// public bool Boat { get; private set; } + /// /// Признак (опция) наличие пушки /// public bool Weapon { get; private set; } + /// /// Дополнительный цвет (для опциональных элементов) /// public Color AdditionalColor { get; private set; } + public void setAdditionalColor(Color color) + { + AdditionalColor = color; + } public EntityMilitaryCruiser(int speed, double weight, Color bodyColor, Color additionalColor, bool helicopterArea, bool boat, bool weapon) : base(speed, weight, bodyColor) { @@ -26,5 +33,30 @@ Boat = boat; Weapon = weapon; } + + /// + /// Получение строк со значениями свойств объекта класса-сущности + /// + /// + public override string[] GetStringRepresentation() + { + return new[] { nameof(EntityCruiser), Speed.ToString(), Weight.ToString(), BodyColor.Name, AdditionalColor.Name, + HelicopterArea.ToString(), Boat.ToString(), Weapon.ToString() }; + } + + /// + /// Создание объекта из массива строк + /// + /// + /// + public static EntityCruiser? CreateEntityMilitaryCruiser(string[] strs) + { + if (strs.Length != 8 || strs[0] != nameof(EntityCruiser)) + { + return null; + } + return new EntityMilitaryCruiser(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])); + } } } diff --git a/ProjectCruiser/FormCruiserConfing.Designer.cs b/ProjectCruiser/FormCruiserConfing.Designer.cs new file mode 100644 index 0000000..aee4338 --- /dev/null +++ b/ProjectCruiser/FormCruiserConfing.Designer.cs @@ -0,0 +1,370 @@ +namespace ProjectCruiser +{ + partial class FormCruiserConfing + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + groupBoxConfing = new GroupBox(); + groupBoxColors = new GroupBox(); + panelPurple = new Panel(); + panelBlack = new Panel(); + panelGray = new Panel(); + panelWhite = new Panel(); + panelYellow = new Panel(); + panelBlue = new Panel(); + panelGreen = new Panel(); + panelRed = new Panel(); + checkBoxWeapon = new CheckBox(); + checkBoxBoat = new CheckBox(); + checkBoxHelicopterArea = new CheckBox(); + numericUpDownWeight = new NumericUpDown(); + labelWeight = new Label(); + numericUpDownSpeed = new NumericUpDown(); + labelSpeed = new Label(); + labelModifiedObject = new Label(); + labelSimpleObject = new Label(); + pictureBoxObject = new PictureBox(); + buttonAdd = new Button(); + buttonCancel = new Button(); + panelObject = new Panel(); + labelAdditionalColor = new Label(); + labelBodyColor = new Label(); + groupBoxConfing.SuspendLayout(); + groupBoxColors.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).BeginInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).BeginInit(); + ((System.ComponentModel.ISupportInitialize)pictureBoxObject).BeginInit(); + panelObject.SuspendLayout(); + SuspendLayout(); + // + // groupBoxConfing + // + groupBoxConfing.Controls.Add(groupBoxColors); + groupBoxConfing.Controls.Add(checkBoxWeapon); + groupBoxConfing.Controls.Add(checkBoxBoat); + groupBoxConfing.Controls.Add(checkBoxHelicopterArea); + groupBoxConfing.Controls.Add(numericUpDownWeight); + groupBoxConfing.Controls.Add(labelWeight); + groupBoxConfing.Controls.Add(numericUpDownSpeed); + groupBoxConfing.Controls.Add(labelSpeed); + groupBoxConfing.Controls.Add(labelModifiedObject); + groupBoxConfing.Controls.Add(labelSimpleObject); + groupBoxConfing.Dock = DockStyle.Left; + groupBoxConfing.Location = new Point(0, 0); + groupBoxConfing.Name = "groupBoxConfing"; + groupBoxConfing.Size = new Size(626, 262); + groupBoxConfing.TabIndex = 0; + groupBoxConfing.TabStop = false; + groupBoxConfing.Text = "Параметры"; + // + // groupBoxColors + // + groupBoxColors.Controls.Add(panelPurple); + groupBoxColors.Controls.Add(panelBlack); + groupBoxColors.Controls.Add(panelGray); + groupBoxColors.Controls.Add(panelWhite); + groupBoxColors.Controls.Add(panelYellow); + groupBoxColors.Controls.Add(panelBlue); + groupBoxColors.Controls.Add(panelGreen); + groupBoxColors.Controls.Add(panelRed); + groupBoxColors.Location = new Point(327, 26); + groupBoxColors.Name = "groupBoxColors"; + groupBoxColors.Size = new Size(280, 154); + groupBoxColors.TabIndex = 9; + groupBoxColors.TabStop = false; + groupBoxColors.Text = "Цвета"; + // + // panelPurple + // + panelPurple.BackColor = Color.Purple; + panelPurple.Location = new Point(217, 96); + panelPurple.Name = "panelPurple"; + panelPurple.Size = new Size(48, 47); + panelPurple.TabIndex = 1; + // + // panelBlack + // + panelBlack.BackColor = Color.Black; + panelBlack.Location = new Point(149, 96); + panelBlack.Name = "panelBlack"; + panelBlack.Size = new Size(48, 47); + panelBlack.TabIndex = 1; + // + // panelGray + // + panelGray.BackColor = Color.Gray; + panelGray.Location = new Point(82, 96); + panelGray.Name = "panelGray"; + panelGray.Size = new Size(48, 47); + panelGray.TabIndex = 1; + // + // panelWhite + // + panelWhite.BackColor = Color.White; + panelWhite.Location = new Point(17, 96); + panelWhite.Name = "panelWhite"; + panelWhite.Size = new Size(48, 47); + panelWhite.TabIndex = 1; + // + // panelYellow + // + panelYellow.BackColor = Color.Yellow; + panelYellow.Location = new Point(217, 31); + panelYellow.Name = "panelYellow"; + panelYellow.Size = new Size(48, 47); + panelYellow.TabIndex = 1; + // + // panelBlue + // + panelBlue.BackColor = Color.Blue; + panelBlue.Location = new Point(149, 31); + panelBlue.Name = "panelBlue"; + panelBlue.Size = new Size(48, 47); + panelBlue.TabIndex = 1; + // + // panelGreen + // + panelGreen.BackColor = Color.Green; + panelGreen.Location = new Point(82, 31); + panelGreen.Name = "panelGreen"; + panelGreen.Size = new Size(48, 47); + panelGreen.TabIndex = 1; + // + // panelRed + // + panelRed.BackColor = Color.Red; + panelRed.Location = new Point(17, 31); + panelRed.Name = "panelRed"; + panelRed.Size = new Size(48, 47); + panelRed.TabIndex = 0; + // + // checkBoxWeapon + // + checkBoxWeapon.AutoSize = true; + checkBoxWeapon.Location = new Point(6, 217); + checkBoxWeapon.Name = "checkBoxWeapon"; + checkBoxWeapon.Size = new Size(202, 24); + checkBoxWeapon.TabIndex = 8; + checkBoxWeapon.Text = "Признак наличие пушки"; + checkBoxWeapon.UseVisualStyleBackColor = true; + // + // checkBoxBoat + // + checkBoxBoat.AutoSize = true; + checkBoxBoat.Location = new Point(6, 169); + checkBoxBoat.Name = "checkBoxBoat"; + checkBoxBoat.Size = new Size(215, 24); + checkBoxBoat.TabIndex = 7; + checkBoxBoat.Text = "Признак наличие шлюпок"; + checkBoxBoat.UseVisualStyleBackColor = true; + // + // checkBoxHelicopterArea + // + checkBoxHelicopterArea.AutoSize = true; + checkBoxHelicopterArea.Location = new Point(6, 123); + checkBoxHelicopterArea.Name = "checkBoxHelicopterArea"; + checkBoxHelicopterArea.Size = new Size(321, 24); + checkBoxHelicopterArea.TabIndex = 6; + checkBoxHelicopterArea.Text = "Признак наличие вертолетной площадки"; + checkBoxHelicopterArea.UseVisualStyleBackColor = true; + // + // numericUpDownWeight + // + numericUpDownWeight.Location = new Point(94, 68); + numericUpDownWeight.Maximum = new decimal(new int[] { 1000, 0, 0, 0 }); + numericUpDownWeight.Minimum = new decimal(new int[] { 100, 0, 0, 0 }); + numericUpDownWeight.Name = "numericUpDownWeight"; + numericUpDownWeight.Size = new Size(114, 27); + numericUpDownWeight.TabIndex = 5; + numericUpDownWeight.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelWeight + // + labelWeight.AutoSize = true; + labelWeight.Location = new Point(27, 70); + labelWeight.Name = "labelWeight"; + labelWeight.Size = new Size(36, 20); + labelWeight.TabIndex = 4; + labelWeight.Text = "Вес:"; + // + // numericUpDownSpeed + // + numericUpDownSpeed.Location = new Point(94, 32); + numericUpDownSpeed.Maximum = new decimal(new int[] { 1000, 0, 0, 0 }); + numericUpDownSpeed.Minimum = new decimal(new int[] { 100, 0, 0, 0 }); + numericUpDownSpeed.Name = "numericUpDownSpeed"; + numericUpDownSpeed.Size = new Size(114, 27); + numericUpDownSpeed.TabIndex = 3; + numericUpDownSpeed.Value = new decimal(new int[] { 100, 0, 0, 0 }); + // + // labelSpeed + // + labelSpeed.AutoSize = true; + labelSpeed.Location = new Point(12, 32); + labelSpeed.Name = "labelSpeed"; + labelSpeed.Size = new Size(76, 20); + labelSpeed.TabIndex = 2; + labelSpeed.Text = "Скорость:"; + // + // labelModifiedObject + // + labelModifiedObject.BorderStyle = BorderStyle.FixedSingle; + labelModifiedObject.Location = new Point(476, 203); + labelModifiedObject.Name = "labelModifiedObject"; + labelModifiedObject.Size = new Size(131, 44); + labelModifiedObject.TabIndex = 1; + labelModifiedObject.Text = "Продвинутый"; + labelModifiedObject.TextAlign = ContentAlignment.MiddleCenter; + labelModifiedObject.MouseDown += labelObject_MouseDown; + // + // labelSimpleObject + // + labelSimpleObject.BorderStyle = BorderStyle.FixedSingle; + labelSimpleObject.Location = new Point(327, 203); + labelSimpleObject.Name = "labelSimpleObject"; + labelSimpleObject.Size = new Size(130, 44); + labelSimpleObject.TabIndex = 0; + labelSimpleObject.Text = "Простой"; + labelSimpleObject.TextAlign = ContentAlignment.MiddleCenter; + labelSimpleObject.MouseDown += labelObject_MouseDown; + // + // pictureBoxObject + // + pictureBoxObject.Location = new Point(11, 56); + pictureBoxObject.Name = "pictureBoxObject"; + pictureBoxObject.Size = new Size(183, 125); + pictureBoxObject.TabIndex = 1; + pictureBoxObject.TabStop = false; + // + // buttonAdd + // + buttonAdd.Location = new Point(632, 212); + buttonAdd.Name = "buttonAdd"; + buttonAdd.Size = new Size(94, 29); + buttonAdd.TabIndex = 2; + buttonAdd.Text = "Добавить"; + buttonAdd.UseVisualStyleBackColor = true; + buttonAdd.Click += buttonAdd_Click; + // + // buttonCancel + // + buttonCancel.Location = new Point(740, 212); + buttonCancel.Name = "buttonCancel"; + buttonCancel.Size = new Size(94, 29); + buttonCancel.TabIndex = 3; + buttonCancel.Text = "Отмена"; + buttonCancel.UseVisualStyleBackColor = true; + // + // panelObject + // + panelObject.AllowDrop = true; + panelObject.Controls.Add(labelAdditionalColor); + panelObject.Controls.Add(labelBodyColor); + panelObject.Controls.Add(pictureBoxObject); + panelObject.Location = new Point(632, 12); + panelObject.Name = "panelObject"; + panelObject.Size = new Size(205, 194); + panelObject.TabIndex = 4; + panelObject.DragDrop += PanelObject_DragDrop; + panelObject.DragEnter += PanelObject_DragEnter; + // + // labelAdditionalColor + // + labelAdditionalColor.AllowDrop = true; + labelAdditionalColor.BorderStyle = BorderStyle.FixedSingle; + labelAdditionalColor.Location = new Point(108, 11); + labelAdditionalColor.Name = "labelAdditionalColor"; + labelAdditionalColor.Size = new Size(83, 36); + labelAdditionalColor.TabIndex = 3; + labelAdditionalColor.Text = "Доп. цвет"; + labelAdditionalColor.TextAlign = ContentAlignment.MiddleCenter; + labelAdditionalColor.DragDrop += labelAdditionalColor_DragDrop; + labelAdditionalColor.DragEnter += labelAdditionalColor_DragEnter; + // + // labelBodyColor + // + labelBodyColor.AllowDrop = true; + labelBodyColor.BorderStyle = BorderStyle.FixedSingle; + labelBodyColor.Location = new Point(11, 11); + labelBodyColor.Name = "labelBodyColor"; + labelBodyColor.Size = new Size(83, 36); + labelBodyColor.TabIndex = 2; + labelBodyColor.Text = "Цвет"; + labelBodyColor.TextAlign = ContentAlignment.MiddleCenter; + labelBodyColor.DragDrop += labelBodyColor_DragDrop; + labelBodyColor.DragEnter += labelBodyColor_DragEnter; + // + // FormCruiserConfing + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(838, 262); + Controls.Add(panelObject); + Controls.Add(buttonCancel); + Controls.Add(buttonAdd); + Controls.Add(groupBoxConfing); + Name = "FormCruiserConfing"; + Text = "Создание объекта"; + groupBoxConfing.ResumeLayout(false); + groupBoxConfing.PerformLayout(); + groupBoxColors.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)numericUpDownWeight).EndInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDownSpeed).EndInit(); + ((System.ComponentModel.ISupportInitialize)pictureBoxObject).EndInit(); + panelObject.ResumeLayout(false); + ResumeLayout(false); + } + + #endregion + + private GroupBox groupBoxConfing; + private Label labelSimpleObject; + private Label labelModifiedObject; + private Label labelWeight; + private NumericUpDown numericUpDownSpeed; + private Label labelSpeed; + private NumericUpDown numericUpDownWeight; + private CheckBox checkBoxHelicopterArea; + private CheckBox checkBoxBoat; + private CheckBox checkBoxWeapon; + private GroupBox groupBoxColors; + private Panel panelPurple; + private Panel panelBlack; + private Panel panelGray; + private Panel panelWhite; + private Panel panelYellow; + private Panel panelBlue; + private Panel panelGreen; + private Panel panelRed; + private PictureBox pictureBoxObject; + private Button buttonAdd; + private Button buttonCancel; + private Panel panelObject; + private Label labelBodyColor; + private Label labelAdditionalColor; + } +} \ No newline at end of file diff --git a/ProjectCruiser/FormCruiserConfing.cs b/ProjectCruiser/FormCruiserConfing.cs new file mode 100644 index 0000000..fe9b6c1 --- /dev/null +++ b/ProjectCruiser/FormCruiserConfing.cs @@ -0,0 +1,176 @@ +using ProjectCruiser.Drawnings; +using ProjectCruiser.Entities; + +namespace ProjectCruiser +{ + /// + /// Форма конфигурации объекта + /// + public partial class FormCruiserConfing : Form + { + /// + /// Объект - прорисовка крейсера + /// + private DrawningCruiser _cruiser; + + /// + /// Событие для передачи объекта + /// + private event Action? CruiserDelegate; + + /// + /// Привязка внешнего метода к событию + /// + /// + public void AddEvent(Action cruiserDelegate) + { + CruiserDelegate += cruiserDelegate; + } + + /// + /// Конструктор + /// + public FormCruiserConfing() + { + InitializeComponent(); + + panelRed.MouseDown += Panel_MouseDown; + panelGreen.MouseDown += Panel_MouseDown; + panelBlue.MouseDown += Panel_MouseDown; + panelYellow.MouseDown += Panel_MouseDown; + panelWhite.MouseDown += Panel_MouseDown; + panelGray.MouseDown += Panel_MouseDown; + panelBlack.MouseDown += Panel_MouseDown; + panelPurple.MouseDown += Panel_MouseDown; + //TODO buttonCancel.Click with lambda с закрытием формы + buttonCancel.Click += (sender, e) => Close(); + } + + /// + /// Прорисовка объекта + /// + private void DrawObject() + { + Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height); + Graphics gr = Graphics.FromImage(bmp); + _cruiser?.SetPictureSize(pictureBoxObject.Width, pictureBoxObject.Height); + _cruiser?.SetPosition(15, 15); + _cruiser?.DrawTransport(gr); + pictureBoxObject.Image = bmp; + } + + /// + /// Передаем информацию при нажатии на Label + /// + /// labelSimpleObject + /// labelSimpleObject + private void labelObject_MouseDown(object sender, MouseEventArgs e) + { + (sender as Label)?.DoDragDrop((sender as Label)?.Name ?? string.Empty, DragDropEffects.Move | DragDropEffects.Copy); + } + + /// + /// Проверка получаемой информации (ее типа на соответствие требуемому) + /// + /// + /// + private void PanelObject_DragEnter(object sender, DragEventArgs e) + { + e.Effect = e.Data?.GetDataPresent(DataFormats.Text) ?? false ? DragDropEffects.Copy : DragDropEffects.None; + + } + + /// + /// Действия при приеме перетаскиваемой информации + /// + /// + /// + private void PanelObject_DragDrop(object sender, DragEventArgs e) + { + switch (e.Data?.GetData(DataFormats.Text)?.ToString()) + { + case "labelSimpleObject": + _cruiser = new DrawningCruiser((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White); + break; + case "labelModifiedObject": + _cruiser = new + DrawningMilitaryCruiser((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White, + Color.Black, checkBoxHelicopterArea.Checked, checkBoxBoat.Checked, checkBoxWeapon.Checked); + break; + } + DrawObject(); + } + + /// + /// Передаем информацию при нажатии на Panel + /// + /// + /// + private void Panel_MouseDown(object sender, MouseEventArgs e) + { + //TODO отправка цвета в Drag&Drop + (sender as Control)?.DoDragDrop((sender as Control).BackColor, DragDropEffects.Move | DragDropEffects.Copy); + } + + // TODO Реализовать логику смены цветов: основного и дополнительного (для продвинутого объекта) + + private void labelBodyColor_DragEnter(object sender, DragEventArgs e) + { + if (e.Data.GetDataPresent(typeof(Color))) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + } + + private void labelBodyColor_DragDrop(object sender, DragEventArgs e) + { + if (_cruiser != null) + { + _cruiser.EntityCruiser.setBodyColor((Color)e.Data.GetData(typeof(Color))); + DrawObject(); + } + } + + private void labelAdditionalColor_DragEnter(object sender, DragEventArgs e) + { + if (_cruiser is DrawningCruiser) + { + if (e.Data.GetDataPresent(typeof(Color))) + { + e.Effect = DragDropEffects.Copy; + } + else + { + e.Effect = DragDropEffects.None; + } + } + } + + private void labelAdditionalColor_DragDrop(object sender, DragEventArgs e) + { + if (_cruiser.EntityCruiser is EntityMilitaryCruiser militaryCruiser) + { + militaryCruiser.setAdditionalColor((Color)e.Data.GetData(typeof(Color))); + } + DrawObject(); + } + + /// + /// Передача объекта + /// + /// + /// + private void buttonAdd_Click(object sender, EventArgs e) + { + if (_cruiser != null) + { + CruiserDelegate?.Invoke(_cruiser); + Close(); + } + } + } +} diff --git a/ProjectCruiser/FormCruiserConfing.resx b/ProjectCruiser/FormCruiserConfing.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/ProjectCruiser/FormCruiserConfing.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/ProjectCruiser/FormCruisersCollection.Designer.cs b/ProjectCruiser/FormCruisersCollection.Designer.cs index d4100d4..21dab30 100644 --- a/ProjectCruiser/FormCruisersCollection.Designer.cs +++ b/ProjectCruiser/FormCruisersCollection.Designer.cs @@ -41,16 +41,22 @@ comboBoxSelectorCompany = new ComboBox(); panelCompanyTools = new Panel(); ButtonAddCruiser = new Button(); - ButtonAddMilitaryCruiser = new Button(); buttonRefresh = new Button(); ButtonRemoveCruiser = new Button(); maskedTextBoxPosision = new MaskedTextBox(); buttonGetToTest = new Button(); pictureBoxCruiser = new PictureBox(); + menuStrip = new MenuStrip(); + файлToolStripMenuItem = new ToolStripMenuItem(); + saveToolStripMenuItem = new ToolStripMenuItem(); + loadToolStripMenuItem = new ToolStripMenuItem(); + saveFileDialog = new SaveFileDialog(); + openFileDialog = new OpenFileDialog(); groupBoxTools.SuspendLayout(); panelStorage.SuspendLayout(); panelCompanyTools.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)pictureBoxCruiser).BeginInit(); + menuStrip.SuspendLayout(); SuspendLayout(); // // groupBoxTools @@ -60,9 +66,9 @@ groupBoxTools.Controls.Add(comboBoxSelectorCompany); groupBoxTools.Controls.Add(panelCompanyTools); groupBoxTools.Dock = DockStyle.Right; - groupBoxTools.Location = new Point(583, 0); + groupBoxTools.Location = new Point(631, 28); groupBoxTools.Name = "groupBoxTools"; - groupBoxTools.Size = new Size(222, 653); + groupBoxTools.Size = new Size(222, 651); groupBoxTools.TabIndex = 0; groupBoxTools.TabStop = false; groupBoxTools.Text = "инструменты"; @@ -173,7 +179,6 @@ // panelCompanyTools // panelCompanyTools.Controls.Add(ButtonAddCruiser); - panelCompanyTools.Controls.Add(ButtonAddMilitaryCruiser); panelCompanyTools.Controls.Add(buttonRefresh); panelCompanyTools.Controls.Add(ButtonRemoveCruiser); panelCompanyTools.Controls.Add(maskedTextBoxPosision); @@ -196,17 +201,6 @@ ButtonAddCruiser.UseVisualStyleBackColor = true; ButtonAddCruiser.Click += ButtonAddCruiser_Click; // - // ButtonAddMilitaryCruiser - // - ButtonAddMilitaryCruiser.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - ButtonAddMilitaryCruiser.Location = new Point(18, 49); - ButtonAddMilitaryCruiser.Name = "ButtonAddMilitaryCruiser"; - ButtonAddMilitaryCruiser.Size = new Size(186, 51); - ButtonAddMilitaryCruiser.TabIndex = 2; - ButtonAddMilitaryCruiser.Text = "добваление военного крейсера"; - ButtonAddMilitaryCruiser.UseVisualStyleBackColor = true; - ButtonAddMilitaryCruiser.Click += ButtonAddMilitaryCruiser_Click; - // // buttonRefresh // buttonRefresh.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; @@ -252,19 +246,62 @@ // pictureBoxCruiser // pictureBoxCruiser.Dock = DockStyle.Fill; - pictureBoxCruiser.Location = new Point(0, 0); + pictureBoxCruiser.Location = new Point(0, 28); pictureBoxCruiser.Name = "pictureBoxCruiser"; - pictureBoxCruiser.Size = new Size(583, 653); + pictureBoxCruiser.Size = new Size(631, 651); pictureBoxCruiser.TabIndex = 1; pictureBoxCruiser.TabStop = false; // + // menuStrip + // + menuStrip.ImageScalingSize = new Size(20, 20); + menuStrip.Items.AddRange(new ToolStripItem[] { файлToolStripMenuItem }); + menuStrip.Location = new Point(0, 0); + menuStrip.Name = "menuStrip"; + menuStrip.Size = new Size(853, 28); + menuStrip.TabIndex = 2; + menuStrip.Text = "menuStrip1"; + // + // файлToolStripMenuItem + // + файлToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { saveToolStripMenuItem, loadToolStripMenuItem }); + файлToolStripMenuItem.Name = "файлToolStripMenuItem"; + файлToolStripMenuItem.Size = new Size(59, 24); + файлToolStripMenuItem.Text = "Файл"; + // + // saveToolStripMenuItem + // + saveToolStripMenuItem.Name = "saveToolStripMenuItem"; + saveToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.S; + saveToolStripMenuItem.Size = new Size(227, 26); + saveToolStripMenuItem.Text = "Сохранение"; + saveToolStripMenuItem.Click += SaveToolStripMenuItem_Click; + // + // loadToolStripMenuItem + // + loadToolStripMenuItem.Name = "loadToolStripMenuItem"; + loadToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.L; + loadToolStripMenuItem.Size = new Size(227, 26); + loadToolStripMenuItem.Text = "Загрузка"; + loadToolStripMenuItem.Click += LoadToolStripMenuItem_Click; + // + // saveFileDialog + // + saveFileDialog.Filter = "txt file|*.txt"; + // + // openFileDialog + // + openFileDialog.Filter = "txt file|*.txt"; + // // FormCruisersCollection // AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(805, 653); + ClientSize = new Size(853, 679); Controls.Add(pictureBoxCruiser); Controls.Add(groupBoxTools); + Controls.Add(menuStrip); + MainMenuStrip = menuStrip; Name = "FormCruisersCollection"; Text = "FormCruisersCollection"; groupBoxTools.ResumeLayout(false); @@ -273,14 +310,16 @@ panelCompanyTools.ResumeLayout(false); panelCompanyTools.PerformLayout(); ((System.ComponentModel.ISupportInitialize)pictureBoxCruiser).EndInit(); + menuStrip.ResumeLayout(false); + menuStrip.PerformLayout(); ResumeLayout(false); + PerformLayout(); } #endregion private GroupBox groupBoxTools; private ComboBox comboBoxSelectorCompany; - private Button ButtonAddMilitaryCruiser; private Button ButtonAddCruiser; private Button ButtonRemoveCruiser; private Button buttonRefresh; @@ -297,5 +336,11 @@ private Button buttonCreateCompany; private Button buttonCollectionDel; 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/ProjectCruiser/FormCruisersCollection.cs b/ProjectCruiser/FormCruisersCollection.cs index 726ccc5..0779cc5 100644 --- a/ProjectCruiser/FormCruisersCollection.cs +++ b/ProjectCruiser/FormCruisersCollection.cs @@ -34,33 +34,27 @@ namespace ProjectCruiser panelCompanyTools.Enabled = false; } - /// - /// Создание объекта класса-перемещения - /// - /// Тип создаваемого объекта - private void CreateObject(string type) + private void ButtonAddCruiser_Click(object sender, EventArgs e) { - if (_company == null) + FormCruiserConfing form = new(); + // TODO передать метод + + form.Show(); + form.AddEvent(SetCruiser); + } + + /// + /// Добавление крейсера в коллекцию + /// + /// + private void SetCruiser(DrawningCruiser? cruiser) + { + if (_company == null || cruiser == null) { return; } - Random random = new(); - DrawningCruiser drawningCruiser; - switch (type) - { - case nameof(DrawningCruiser): - drawningCruiser = new DrawningCruiser(random.Next(100, 300), random.Next(1000, 3000), GetColor(random)); - break; - case nameof(DrawningMilitaryCruiser): - // TODO вызов диалогового окна для выбора цвета - drawningCruiser = new DrawningMilitaryCruiser(random.Next(100, 300), random.Next(1000, 3000), - GetColor(random), GetColor(random), - Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2))); - break; - default: - return; - } - if (_company + drawningCruiser != -1) + + if (_company + cruiser != -1) { MessageBox.Show("Объект добавлен"); pictureBoxCruiser.Image = _company.Show(); @@ -72,35 +66,10 @@ namespace ProjectCruiser } /// - /// Получение цвета + /// Удаление объекта /// - /// Генератор случайных чисел - /// - private static Color GetColor(Random random) - { - Color color = Color.FromArgb(random.Next(0, 256), random.Next(0, - 256), random.Next(0, 256)); - ColorDialog dialog = new(); - if (dialog.ShowDialog() == DialogResult.OK) - { - color = dialog.Color; - } - return color; - } - - //private void ButtonAddCruiser_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningCruiser)); - - //private void ButtonAddMilitaryCruiser_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningMilitaryCruiser)); - private void ButtonAddCruiser_Click(object sender, EventArgs e) - { - CreateObject(nameof(DrawningCruiser)); - } - - private void ButtonAddMilitaryCruiser_Click(object sender, EventArgs e) - { - CreateObject(nameof(DrawningMilitaryCruiser)); - } - + /// + /// private void ButtonRemoveCruiser_Click(object sender, EventArgs e) { if (string.IsNullOrEmpty(maskedTextBoxPosision.Text) || _company == null) @@ -253,8 +222,48 @@ namespace ProjectCruiser } panelCompanyTools.Enabled = true; + } + /// + /// Обработка нажатия "Сохранение" + /// + /// + /// + 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); + RerfreshListBoxItems(); + } + else + { + MessageBox.Show("Не загрузилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } } } diff --git a/ProjectCruiser/FormCruisersCollection.resx b/ProjectCruiser/FormCruisersCollection.resx index af32865..b5b741b 100644 --- a/ProjectCruiser/FormCruisersCollection.resx +++ b/ProjectCruiser/FormCruisersCollection.resx @@ -117,4 +117,16 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 1 + + + 145, 1 + + + 310, 1 + + + 25 + \ No newline at end of file