diff --git a/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/AbstractCompany.cs b/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/AbstractCompany.cs index d6c9fae..ffbcce3 100644 --- a/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/AbstractCompany.cs +++ b/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/AbstractCompany.cs @@ -52,7 +52,7 @@ public abstract class AbstractCompany _pictureWidth = picWidth; _pictureHeight = picHeight; _collection = collection; - _collection.SetMaxCount = GetMaxCount; + _collection.MaxCount = GetMaxCount; } /// diff --git a/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/ICollectionGenericObjects.cs b/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/ICollectionGenericObjects.cs index 72890aa..d81d917 100644 --- a/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/ICollectionGenericObjects.cs +++ b/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/ICollectionGenericObjects.cs @@ -15,7 +15,8 @@ public interface ICollectionGenericObjects /// /// Установка максимального количества элементов /// - int SetMaxCount { set; } + /// + int MaxCount { get; set; } /// /// Добавление объекта в коллекцию @@ -45,4 +46,15 @@ public interface ICollectionGenericObjects /// Позиция /// Объект T? Get(int position); + + /// + /// Получение типа коллекции + /// + CollectionType GetCollectionType { get; } + + /// + /// Получение объектов коллекции по одному + /// + /// + IEnumerable GetItems(); } diff --git a/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/ListGenericObjects.cs b/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/ListGenericObjects.cs index b7623d5..8aed789 100644 --- a/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/ListGenericObjects.cs +++ b/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/ListGenericObjects.cs @@ -18,7 +18,22 @@ public class ListGenericObjects : ICollectionGenericObjects 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; /// /// Конструктор @@ -73,4 +88,12 @@ public class ListGenericObjects : ICollectionGenericObjects _collection.RemoveAt(position); return obj; } + + public IEnumerable GetItems() + { + for (int i = 0; i < Count; ++i) + { + yield return _collection[i]; + } + } } diff --git a/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/MassiveGenericObjects.cs b/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/MassiveGenericObjects.cs index 32b2e3d..af4936b 100644 --- a/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/MassiveGenericObjects.cs +++ b/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/MassiveGenericObjects.cs @@ -16,13 +16,17 @@ public class MassiveGenericObjects : ICollectionGenericObjects public int Count => _collection.Length; - public int SetMaxCount + public int MaxCount { + get + { + return _collection.Length; + } set { if (value > 0) { - if (_collection.Length > 0) + if (Count > 0) { Array.Resize(ref _collection, value); } @@ -33,6 +37,9 @@ public class MassiveGenericObjects : ICollectionGenericObjects } } } + + public CollectionType GetCollectionType => CollectionType.Massive; + /// /// Конструктор /// @@ -110,4 +117,12 @@ 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/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/StorageCollection.cs b/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/StorageCollection.cs index 9a8a910..52e8842 100644 --- a/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/StorageCollection.cs +++ b/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/StorageCollection.cs @@ -1,11 +1,14 @@ -namespace ProjectLinkor.CollectionGenericObjects; +using ProjectLinkor.Drawnings; +using System.Text; + +namespace ProjectLinkor.CollectionGenericObjects; /// /// Класс-хранилище коллекций /// /// public class StorageCollection - where T : class + where T : DrawingWarship { /// /// Словарь (хранилище) с коллекциями @@ -25,6 +28,12 @@ public class StorageCollection _storages = new Dictionary>(); } + private readonly string _collectionKey = "CollectionsStorage"; + + private readonly string _separatorForKeyValue = "|"; + + private readonly string _separatorItems = ";"; + /// /// Добавление коллекции в хранилище /// @@ -32,10 +41,10 @@ public class StorageCollection /// Тип коллекции public void AddCollection(string name, CollectionType collectionType) { - // TODO проверка, что name не пустой и нет в словаре записи с таким ключом - if (_storages.ContainsKey(name)) + if (string.IsNullOrEmpty(name) || _storages.ContainsKey(name)) + { return; - + } // TODO Прописать логику для добавления if (collectionType == CollectionType.List) { @@ -76,4 +85,136 @@ public class StorageCollection return null; } } + + /// + /// Сохранение информации по кораблям в хранилище в файл + /// + /// + /// + 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; + } + + /// + /// Загрузка информации по кораблям в хранилище из файла + /// + /// + /// + public bool LoadData(string filename) + { + if (!File.Exists(filename)) + { + return false; + } + + using (StreamReader reader = File.OpenText(filename)) + { + string str = reader.ReadLine(); + + if (str == null || str.Length == 0) + { + return false; + } + + if (!str.StartsWith(_collectionKey)) + { + //если нет такой записи, то это не те данные + return false; + } + + _storages.Clear(); + string strs = ""; + while ((strs = reader.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?.CreateDrawingWarship() is T bulldozer) + { + if (collection.Insert(bulldozer) == -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/ProjectSportCar/ProjectSportCar/Drawnings/DrawingWarship.cs b/ProjectSportCar/ProjectSportCar/Drawnings/DrawingWarship.cs index fcbec3f..c1f927b 100644 --- a/ProjectSportCar/ProjectSportCar/Drawnings/DrawingWarship.cs +++ b/ProjectSportCar/ProjectSportCar/Drawnings/DrawingWarship.cs @@ -92,8 +92,13 @@ public class DrawingWarship /// Высота прорисовки военного корабля protected DrawingWarship(int drawingWarshipWidth, int drawingWarshipHeight) : this() { - _drawingWarshipWidth = drawingWarshipWidth; - _drawingWarshipHeight = drawingWarshipHeight; + this._drawingWarshipWidth = drawingWarshipWidth; + this._drawingWarshipHeight = drawingWarshipHeight; + } + + public DrawingWarship(EntityWarship ship) : this() + { + EntityWarship = new EntityWarship(ship.Speed, ship.Weight, ship.BodyColor); } /// diff --git a/ProjectSportCar/ProjectSportCar/Drawnings/DrawningLinkor.cs b/ProjectSportCar/ProjectSportCar/Drawnings/DrawningLinkor.cs index 960cb51..1a3c560 100644 --- a/ProjectSportCar/ProjectSportCar/Drawnings/DrawningLinkor.cs +++ b/ProjectSportCar/ProjectSportCar/Drawnings/DrawningLinkor.cs @@ -16,9 +16,14 @@ public class DrawningLinkor : DrawingWarship /// Признак наличия орудийной башни /// Признак наличия отсека под ракеты /// Признак наличия - public DrawningLinkor(int speed, double weigth, Color bodyColor, Color additionalColor, bool gunTurret, bool compartment, bool linkorMotor) : base(148, 75) + public DrawningLinkor(int speed, double weigth, Color bodyColor, bool gunTurret, bool compartment, bool linkorMotor, Color additionalColor) : base(148, 75) { - EntityWarship = new EntityLinkor(speed, weigth, bodyColor, additionalColor, gunTurret, compartment, linkorMotor); + EntityWarship = new EntityLinkor(speed, weigth, bodyColor, gunTurret, compartment, linkorMotor, additionalColor); + } + + public DrawningLinkor(EntityLinkor warship) : base(129, 80) + { + EntityWarship = new EntityLinkor(warship.Speed, warship.Weight, warship.BodyColor, warship.GunTurret, warship.Сompartment, warship.LinkorMotor, warship.AdditionalColor); } /// diff --git a/ProjectSportCar/ProjectSportCar/Drawnings/ExtentionDrawingWarship.cs b/ProjectSportCar/ProjectSportCar/Drawnings/ExtentionDrawingWarship.cs new file mode 100644 index 0000000..13b30f6 --- /dev/null +++ b/ProjectSportCar/ProjectSportCar/Drawnings/ExtentionDrawingWarship.cs @@ -0,0 +1,53 @@ +using ProjectLinkor.Entities; + +namespace ProjectLinkor.Drawnings; + +/// +/// Расширение для класса EntityWarship +/// +public static class ExtentionDrawingWarship +{ + /// + /// Разделитель для записи информации по объекту в файл + /// + private static readonly string _separatorForObject = ":"; + + /// + /// Создание объекта из строки + /// + /// + /// + public static DrawingWarship? CreateDrawingWarship(this string info) + { + string[] strs = info.Split(_separatorForObject); + EntityWarship? warship = EntityLinkor.CreateEntityLinkor(strs); + if (warship != null) + { + return new DrawningLinkor((EntityLinkor)warship); + } + + warship = EntityWarship.CreateEntityWarship(strs); + if (warship != null) + { + return new DrawingWarship(warship); + } + return null; + } + + /// + /// Получение данных для сохранения в файл + /// + /// + /// + public static string GetDataForSave(this DrawingWarship drawingWarship) + { + string[]? array = drawingWarship?.EntityWarship?.GetStringRepresentation(); + + if (array == null) + { + return string.Empty; + } + + return string.Join(_separatorForObject, array); + } +} diff --git a/ProjectSportCar/ProjectSportCar/Entities/EntityLinkor.cs b/ProjectSportCar/ProjectSportCar/Entities/EntityLinkor.cs index 020be05..abe759f 100644 --- a/ProjectSportCar/ProjectSportCar/Entities/EntityLinkor.cs +++ b/ProjectSportCar/ProjectSportCar/Entities/EntityLinkor.cs @@ -5,29 +5,6 @@ /// public class EntityLinkor : EntityWarship { - /// - /// Скорость - /// - public int Speed { get; private set; } - /// - /// Вес - /// - public double Weight { get; private set; } - /// - /// Основной цвет - /// - public Color BodyColor { get; private set; } - - /// - /// Дополнительный цвет (для опциональных элементов) - /// - public Color AdditionalColor { get; private set; } - - public void SetAdditionalColor(Color color) - { - AdditionalColor = color; - } - /// /// Признак (опция) наличия орудийной башни /// @@ -43,6 +20,16 @@ public class EntityLinkor : EntityWarship /// public bool LinkorMotor { get; private set; } + /// + /// Дополнительный цвет (для опциональных элементов) + /// + public Color AdditionalColor { get; private set; } + + public void SetAdditionalColor(Color color) + { + AdditionalColor = color; + } + /// /// Перемещение линкора /// @@ -59,15 +46,35 @@ public class EntityLinkor : EntityWarship /// Признак наличия орудийной башни /// Признак наличия отсека под ракеты /// Признак наличия - public EntityLinkor(int speed, double weigth, Color bodyColor, Color additionalColor, bool gunTurret, bool compartment, bool linkorMotor) : base(speed, weigth, bodyColor) + public EntityLinkor(int speed, double weigth, Color bodyColor, bool gunTurret, bool compartment, bool linkorMotor, Color additionalColor) : base(speed, weigth, bodyColor) { - Speed = speed; - Weight = weigth; - BodyColor = bodyColor; - AdditionalColor = additionalColor; GunTurret = gunTurret; Сompartment = compartment; LinkorMotor = linkorMotor; + AdditionalColor = additionalColor; + } + + /// + /// Получение строки с значением свойств объекта класса-сущности + /// + /// + public override string[] GetStringRepresentation() + { + return new[] { nameof(EntityLinkor), Speed.ToString(), Weight.ToString(), BodyColor.Name, GunTurret.ToString(), Сompartment.ToString(), LinkorMotor.ToString(), AdditionalColor.Name }; + } + + /// + /// Создание продвинутого объекта из массива строк + /// + /// + /// + public static EntityLinkor? CreateEntityLinkor(string[] strs) + { + if (strs.Length != 8 || strs[0] != nameof(EntityLinkor)) + { + return null; + } + return new EntityLinkor(Convert.ToInt32(strs[1]), Convert.ToDouble(strs[2]), Color.FromName(strs[3]), Convert.ToBoolean(strs[4]), Convert.ToBoolean(strs[5]), Convert.ToBoolean(strs[6]), Color.FromName(strs[7])); } } diff --git a/ProjectSportCar/ProjectSportCar/Entities/EntityWarship.cs b/ProjectSportCar/ProjectSportCar/Entities/EntityWarship.cs index 7ee63e7..6603f9d 100644 --- a/ProjectSportCar/ProjectSportCar/Entities/EntityWarship.cs +++ b/ProjectSportCar/ProjectSportCar/Entities/EntityWarship.cs @@ -39,4 +39,28 @@ public class EntityWarship Weight = weight; BodyColor = bodyColor; } + + /// + /// Получение строки с значением свойств объекта класса-сущности + /// + /// + 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/ProjectSportCar/ProjectSportCar/FormWarshipCollection.Designer.cs b/ProjectSportCar/ProjectSportCar/FormWarshipCollection.Designer.cs index 74d48da..5215a50 100644 --- a/ProjectSportCar/ProjectSportCar/FormWarshipCollection.Designer.cs +++ b/ProjectSportCar/ProjectSportCar/FormWarshipCollection.Designer.cs @@ -46,10 +46,17 @@ labelCollectionName = new Label(); comboBoxSelectionCompany = 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(comboBoxSelectionCompany); groupBoxTools.Dock = DockStyle.Right; - groupBoxTools.Location = new Point(961, 0); + groupBoxTools.Location = new Point(961, 28); groupBoxTools.Name = "groupBoxTools"; - groupBoxTools.Size = new Size(292, 704); + groupBoxTools.Size = new Size(292, 676); groupBoxTools.TabIndex = 0; groupBoxTools.TabStop = false; groupBoxTools.Text = "Инструменты"; @@ -75,7 +82,7 @@ panelCompanyTools.Controls.Add(buttonGoToCheck); panelCompanyTools.Dock = DockStyle.Bottom; panelCompanyTools.Enabled = false; - panelCompanyTools.Location = new Point(3, 390); + panelCompanyTools.Location = new Point(3, 362); panelCompanyTools.Name = "panelCompanyTools"; panelCompanyTools.Size = new Size(286, 311); panelCompanyTools.TabIndex = 9; @@ -240,12 +247,53 @@ // pictureBox // pictureBox.Dock = DockStyle.Fill; - pictureBox.Location = new Point(0, 0); + pictureBox.Location = new Point(0, 28); pictureBox.Name = "pictureBox"; - pictureBox.Size = new Size(961, 704); + pictureBox.Size = new Size(961, 676); pictureBox.TabIndex = 1; pictureBox.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(1253, 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"; + // // FormWarshipCollection // AutoScaleDimensions = new SizeF(8F, 20F); @@ -253,6 +301,8 @@ ClientSize = new Size(1253, 704); 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 @@ -283,5 +336,11 @@ private Button buttonCollectionAdd; private Button buttonCreateCompany; private Panel panelCompanyTools; + private MenuStrip menuStrip; + private ToolStripMenuItem файлToolStripMenuItem; + private ToolStripMenuItem saveToolStripMenuItem; + private ToolStripMenuItem loadToolStripMenuItem; + private SaveFileDialog saveFileDialog; + private OpenFileDialog openFileDialog; } } \ No newline at end of file diff --git a/ProjectSportCar/ProjectSportCar/FormWarshipCollection.cs b/ProjectSportCar/ProjectSportCar/FormWarshipCollection.cs index f9cfd2e..c4071da 100644 --- a/ProjectSportCar/ProjectSportCar/FormWarshipCollection.cs +++ b/ProjectSportCar/ProjectSportCar/FormWarshipCollection.cs @@ -1,5 +1,6 @@ using ProjectLinkor.CollectionGenericObjects; using ProjectLinkor.Drawnings; +using System.Windows.Forms; namespace ProjectLinkor; @@ -245,4 +246,45 @@ 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) + { + if (openFileDialog.ShowDialog() == DialogResult.OK) + { + if (_storageCollection.LoadData(openFileDialog.FileName)) + { + MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information); + RerfreshListBoxItems(); + } + else + { + MessageBox.Show("Не сохранилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } } \ No newline at end of file diff --git a/ProjectSportCar/ProjectSportCar/FormWarshipCollection.resx b/ProjectSportCar/ProjectSportCar/FormWarshipCollection.resx index af32865..ee1748a 100644 --- a/ProjectSportCar/ProjectSportCar/FormWarshipCollection.resx +++ b/ProjectSportCar/ProjectSportCar/FormWarshipCollection.resx @@ -117,4 +117,13 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + + + 145, 17 + + + 310, 17 + \ No newline at end of file diff --git a/ProjectSportCar/ProjectSportCar/FormWarshipConfig.cs b/ProjectSportCar/ProjectSportCar/FormWarshipConfig.cs index b2bbcd2..ad9f43f 100644 --- a/ProjectSportCar/ProjectSportCar/FormWarshipConfig.cs +++ b/ProjectSportCar/ProjectSportCar/FormWarshipConfig.cs @@ -111,7 +111,7 @@ public partial class FormWarshipConfig : Form break; case "labelModifiedObject": _warship = new DrawningLinkor((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White, - Color.Black, checkBoxGunTurret.Checked, checkBoxСompartment.Checked, checkBoxLinkorMotor.Checked); + checkBoxGunTurret.Checked, checkBoxСompartment.Checked, checkBoxLinkorMotor.Checked, Color.Black); break; }