diff --git a/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/AbstractCompany.cs b/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/AbstractCompany.cs index eabef91..1adbdaa 100644 --- a/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/AbstractCompany.cs +++ b/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/AbstractCompany.cs @@ -51,7 +51,7 @@ public abstract class AbstractCompany _pictureWidth = picWidth; _pictureHeight = picHeight; _collection = collection; - _collection.SetMaxCount = GetMaxCount; + _collection.MaxCount = GetMaxCount; } /// diff --git a/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/ICollectionGenericObjects.cs b/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/ICollectionGenericObjects.cs index 9550047..a6abb17 100644 --- a/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/ICollectionGenericObjects.cs +++ b/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/ICollectionGenericObjects.cs @@ -17,7 +17,7 @@ public interface ICollectionGenericObjects /// /// Установка максимального количества элементов /// - int SetMaxCount { set; } + int MaxCount { get; set; } /// /// Добавление объекта в коллекцию @@ -47,5 +47,15 @@ public interface ICollectionGenericObjects /// Позиция /// Объект T? Get(int position); + + /// + /// Получение типа коллекции + /// + CollectionType GetCollectionType { get; } + /// + /// Получение объектов коллекции по одному + /// + /// Поэлементый вывод элементов коллекции + IEnumerable GetItems(); } diff --git a/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/ListGenericObjects.cs b/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/ListGenericObjects.cs index 217635e..7ec80c6 100644 --- a/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/ListGenericObjects.cs +++ b/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/ListGenericObjects.cs @@ -13,12 +13,29 @@ public class ListGenericObjects : ICollectionGenericObjects /// Список объектов, которые храним /// private readonly List _collection; + /// /// Максимально допустимое число объектов в списке /// 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; + /// /// Конструктор /// @@ -26,6 +43,7 @@ public class ListGenericObjects : ICollectionGenericObjects { _collection = new(); } + public T? Get(int position) { // TODO проверка позиции @@ -61,4 +79,11 @@ public class ListGenericObjects : ICollectionGenericObjects return temp; } + public IEnumerable GetItems() + { + for (int i = 0; i < _collection.Count; ++i) + { + yield return _collection[i]; + } + } } diff --git a/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/MassiveGenericObjects.cs b/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/MassiveGenericObjects.cs index c29c839..6fb1fe2 100644 --- a/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/MassiveGenericObjects.cs +++ b/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/MassiveGenericObjects.cs @@ -16,8 +16,13 @@ internal class MassiveGenericObjects : ICollectionGenericObjects public int Count => _collection.Length; - public int SetMaxCount + public int MaxCount { + get + { + return _collection.Length; + } + set { if (value > 0) @@ -32,9 +37,10 @@ internal class MassiveGenericObjects : ICollectionGenericObjects } } } + } - + public CollectionType GetCollectionType => CollectionType.Massive; /// /// Конструктор @@ -110,7 +116,14 @@ internal class MassiveGenericObjects : ICollectionGenericObjects return myObject; } - + public IEnumerable GetItems() + { + for (int i = 0; i < _collection.Length; ++i) + { + yield return _collection[i]; + } + } + } diff --git a/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/StorageCollection.cs b/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/StorageCollection.cs index 3482584..237f159 100644 --- a/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/StorageCollection.cs +++ b/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/StorageCollection.cs @@ -1,4 +1,5 @@ -using System; +using ProjectBulldozer.Drawnings; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -11,7 +12,7 @@ namespace ProjectBulldozer.CollectionGenericObjects; /// /// internal class StorageCollection - where T : class + where T : DrawningTrackedMachine { /// /// Словарь (хранилище) с коллекциями @@ -23,6 +24,20 @@ internal class StorageCollection /// public List Keys => _storages.Keys.ToList(); + /// + /// Ключевое слово, с которого должен начинаться файл + /// + private readonly string _collectionKey = "CollectionsStorage"; + /// + /// Разделитель для записи ключа и значения элемента словаря + /// + private readonly string _separatorForKeyValue = "|"; + /// + /// Разделитель для записей коллекции данных в файл + /// + private readonly string _separatorItems = ";"; + + /// /// Конструктор /// @@ -40,19 +55,12 @@ internal class StorageCollection { // TODO проверка, что name не пустой и нет в словаре записи с таким ключом // TODO Прописать логику для добавления - if (name == null || _storages.ContainsKey(name)) - return; - switch (collectionType) - { - case CollectionType.None: - return; - case CollectionType.Massive: - _storages[name] = new MassiveGenericObjects(); - return; - case CollectionType.List: - _storages[name] = new ListGenericObjects(); - return; - } + if (_storages.ContainsKey(name)) return; + if (collectionType == CollectionType.None) return; + else if (collectionType == CollectionType.Massive) + _storages[name] = new MassiveGenericObjects(); + else if (collectionType == CollectionType.List) + _storages[name] = new ListGenericObjects(); } @@ -77,10 +85,134 @@ internal class StorageCollection get { // TODO Продумать логику получения объекта - if (name == null || !_storages.ContainsKey(name)) - return null; - return _storages[name]; + if (_storages.ContainsKey(name)) + return _storages[name]; + 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?.CreateDrawningMachine() is T machine) + { + if (collection.Insert(machine) == -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/ProjectBulldozer/ProjectBulldozer/DirectionType.cs b/ProjectBulldozer/ProjectBulldozer/Drawnings/DirectionType.cs similarity index 100% rename from ProjectBulldozer/ProjectBulldozer/DirectionType.cs rename to ProjectBulldozer/ProjectBulldozer/Drawnings/DirectionType.cs diff --git a/ProjectBulldozer/ProjectBulldozer/Drawnings/DrawingBulldozer.cs b/ProjectBulldozer/ProjectBulldozer/Drawnings/DrawingBulldozer.cs index da13427..8dd2a02 100644 --- a/ProjectBulldozer/ProjectBulldozer/Drawnings/DrawingBulldozer.cs +++ b/ProjectBulldozer/ProjectBulldozer/Drawnings/DrawingBulldozer.cs @@ -26,6 +26,14 @@ public class DrawningBulldozer : DrawningTrackedMachine additionalRihl); } + /// + /// Конструктор для Extention + /// + /// + public DrawningBulldozer(EntityBulldozer machine) : base(180, 140) + { + EntityTrackedMachine = new EntityBulldozer(machine.Speed, machine.Weight, machine.BodyColor, machine.AdditionalColor, machine.AdditionalOtval, machine.AdditionalRihl); + } public override void DrawTransport(Graphics g) { diff --git a/ProjectBulldozer/ProjectBulldozer/Drawnings/DrawningTrackedMachine.cs b/ProjectBulldozer/ProjectBulldozer/Drawnings/DrawningTrackedMachine.cs index 9920768..405d712 100644 --- a/ProjectBulldozer/ProjectBulldozer/Drawnings/DrawningTrackedMachine.cs +++ b/ProjectBulldozer/ProjectBulldozer/Drawnings/DrawningTrackedMachine.cs @@ -97,6 +97,16 @@ public class DrawningTrackedMachine } + /// + /// Конструктор для Extention + /// + /// + public DrawningTrackedMachine(EntityTrackedMachine machine) : this() + { + EntityTrackedMachine = new EntityTrackedMachine(machine.Speed, machine.Weight, machine.BodyColor); + } + + /// /// Установка границ поля /// diff --git a/ProjectBulldozer/ProjectBulldozer/Drawnings/ExtentionDrawningMachine.cs b/ProjectBulldozer/ProjectBulldozer/Drawnings/ExtentionDrawningMachine.cs new file mode 100644 index 0000000..70bb47c --- /dev/null +++ b/ProjectBulldozer/ProjectBulldozer/Drawnings/ExtentionDrawningMachine.cs @@ -0,0 +1,58 @@ +using ProjectBulldozer.Entities; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectBulldozer.Drawnings; + +/// +/// Расширение для класса EntityCar +/// +public static class ExtentionDrawningMachine +{ + /// + /// Разделитель для записи информации по объекту в файл + /// + private static readonly string _separatorForObject = ":"; + + /// + /// Создание объекта из строки + /// + /// Строка с данными для создания объекта + /// Объект + public static DrawningTrackedMachine? CreateDrawningMachine(this string info) + { + string[] strs = info.Split(_separatorForObject); + EntityTrackedMachine? machine = EntityBulldozer.CreateEntityBulldozer(strs); + if (machine != null) + { + return new DrawningBulldozer((EntityBulldozer)machine); + } + machine = EntityTrackedMachine.CreateEntityTrackedMachine(strs); + if (machine != null) + { + return new DrawningTrackedMachine(machine); + } + return null; + } + + /// + /// Получение данных для сохранения в файл + /// + /// Сохраняемый объект + /// Строка с данными по объекту + public static string GetDataForSave(this DrawningTrackedMachine drawningTrackedMachine) + { + string[]? array = drawningTrackedMachine?.EntityTrackedMachine?.GetStringRepresentation(); + + if (array == null) + { + return string.Empty; + + } + return string.Join(_separatorForObject, array); + } + +} diff --git a/ProjectBulldozer/ProjectBulldozer/Entities/EntityBulldozer.cs b/ProjectBulldozer/ProjectBulldozer/Entities/EntityBulldozer.cs index 4dbe3ce..ee73034 100644 --- a/ProjectBulldozer/ProjectBulldozer/Entities/EntityBulldozer.cs +++ b/ProjectBulldozer/ProjectBulldozer/Entities/EntityBulldozer.cs @@ -1,11 +1,13 @@ -namespace ProjectBulldozer.Entities; +using System.Net.Sockets; +namespace ProjectBulldozer.Entities; + +/// +/// Класс-сущность "Бульдозер" +/// public class EntityBulldozer : EntityTrackedMachine { - public EntityBulldozer(int speed, double weight, Color bodyColor) : base(speed, weight, bodyColor) - { - } - + /// /// Дополнительный цвет (для опциональных элементов) /// @@ -42,5 +44,30 @@ public class EntityBulldozer : EntityTrackedMachine AdditionalRihl = additionalRihl; } + + /// + /// Получение строк со значениями свойств объекта класса-сущности + /// + /// + public override string[] GetStringRepresentation() + { + return new[] { nameof(EntityBulldozer), Speed.ToString(), Weight.ToString(), BodyColor.Name, AdditionalColor.Name, + AdditionalOtval.ToString(), AdditionalRihl.ToString()}; + } + + /// + /// Создание продвинутого объекта из массива строк + /// + /// + /// + public static EntityBulldozer? CreateEntityBulldozer(string[] strs) + { + if (strs.Length != 7 || strs[0] != nameof(EntityBulldozer)) + { + return null; + } + return new EntityBulldozer(Convert.ToInt32(strs[1]), Convert.ToDouble(strs[2]), Color.FromName(strs[3]), + Color.FromName(strs[4]), Convert.ToBoolean(strs[5]), Convert.ToBoolean(strs[6])); + } + } -//сделано \ No newline at end of file diff --git a/ProjectBulldozer/ProjectBulldozer/Entities/EntityTrackedMachine.cs b/ProjectBulldozer/ProjectBulldozer/Entities/EntityTrackedMachine.cs index bb8602e..f387b88 100644 --- a/ProjectBulldozer/ProjectBulldozer/Entities/EntityTrackedMachine.cs +++ b/ProjectBulldozer/ProjectBulldozer/Entities/EntityTrackedMachine.cs @@ -40,7 +40,30 @@ public class EntityTrackedMachine Speed = speed; Weight = weight; BodyColor = bodyColor; - - } + + /// + /// Получение строк со значениями свойств объекта класса-сущности + /// + /// + public virtual string[] GetStringRepresentation() + { + return new[] { nameof(EntityTrackedMachine), Speed.ToString(), Weight.ToString(), BodyColor.Name }; + } + + /// + /// Создание объекта из массива строк + /// + /// + /// + public static EntityTrackedMachine? CreateEntityTrackedMachine(string[] strs) + { + if (strs.Length != 4 || strs[0] != nameof(EntityTrackedMachine)) + { + return null; + } + + return new EntityTrackedMachine(Convert.ToInt32(strs[1]), Convert.ToDouble(strs[2]), Color.FromName(strs[3])); + } + } diff --git a/ProjectBulldozer/ProjectBulldozer/FormMachineCollectoin.Designer.cs b/ProjectBulldozer/ProjectBulldozer/FormMachineCollectoin.Designer.cs index d8d6ca0..4c6f226 100644 --- a/ProjectBulldozer/ProjectBulldozer/FormMachineCollectoin.Designer.cs +++ b/ProjectBulldozer/ProjectBulldozer/FormMachineCollectoin.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(749, 0); + groupBoxTools.Location = new Point(749, 28); groupBoxTools.Name = "groupBoxTools"; - groupBoxTools.Size = new Size(231, 665); + groupBoxTools.Size = new Size(231, 671); groupBoxTools.TabIndex = 0; groupBoxTools.TabStop = false; groupBoxTools.Text = "Инструменты"; @@ -239,19 +246,62 @@ // pictureBox // pictureBox.Dock = DockStyle.Fill; - pictureBox.Location = new Point(0, 0); + pictureBox.Location = new Point(0, 28); pictureBox.Name = "pictureBox"; - pictureBox.Size = new Size(749, 665); + pictureBox.Size = new Size(749, 671); pictureBox.TabIndex = 5; 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(980, 28); + menuStrip.TabIndex = 6; + 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"; + // // FormMachineCollectoin // AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(980, 665); + ClientSize = new Size(980, 699); Controls.Add(pictureBox); Controls.Add(groupBoxTools); + Controls.Add(menuStrip); + MainMenuStrip = menuStrip; Name = "FormMachineCollectoin"; Text = "Коллекция машин"; groupBoxTools.ResumeLayout(false); @@ -260,7 +310,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 Panel panelStorage; 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/ProjectBulldozer/ProjectBulldozer/FormMachineCollectoin.cs b/ProjectBulldozer/ProjectBulldozer/FormMachineCollectoin.cs index 17bad6e..c4fd7b9 100644 --- a/ProjectBulldozer/ProjectBulldozer/FormMachineCollectoin.cs +++ b/ProjectBulldozer/ProjectBulldozer/FormMachineCollectoin.cs @@ -53,7 +53,7 @@ public partial class FormMachineCollectoin : Form /// public void ButtonAddMachine_Click(object sender, EventArgs e) { - + FormMachineConfig form = new(); form.AddEvent(SetMachine); form.Show(); @@ -262,5 +262,50 @@ public partial class FormMachineCollectoin : Form 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/ProjectBulldozer/ProjectBulldozer/FormMachineCollectoin.resx b/ProjectBulldozer/ProjectBulldozer/FormMachineCollectoin.resx index af32865..ee1748a 100644 --- a/ProjectBulldozer/ProjectBulldozer/FormMachineCollectoin.resx +++ b/ProjectBulldozer/ProjectBulldozer/FormMachineCollectoin.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/ProjectBulldozer/ProjectBulldozer/FormMachineConfig.cs b/ProjectBulldozer/ProjectBulldozer/FormMachineConfig.cs index 36d8244..1120eb6 100644 --- a/ProjectBulldozer/ProjectBulldozer/FormMachineConfig.cs +++ b/ProjectBulldozer/ProjectBulldozer/FormMachineConfig.cs @@ -42,7 +42,7 @@ namespace ProjectBulldozer /// /// Привязка внешнего метода к событию /// - /// + /// public void AddEvent(Action machineDelegate) { MachineDelegate += machineDelegate; @@ -63,7 +63,7 @@ namespace ProjectBulldozer /// - /// Передаем информацию при нажатии на Labe + /// Передаем информацию при нажатии на Label /// /// /// @@ -183,10 +183,8 @@ namespace ProjectBulldozer /// private void LabelAdditionalColor_DragDrop(object sender, DragEventArgs e) { - if (_machine.EntityTrackedMachine is EntityBulldozer _bulldozer) - { + if (_machine != null && _machine.EntityTrackedMachine is EntityBulldozer _bulldozer) _bulldozer.SetAdditionalColor((Color)e.Data.GetData(typeof(Color))); - } DrawObject(); }