From 6725a8cb3aa1de1452aa081ec7ece614eae44848 Mon Sep 17 00:00:00 2001 From: Roman-Klemendeev <147613551+Roman-Klemendeev@users.noreply.github.com> Date: Sun, 26 May 2024 22:13:37 +0400 Subject: [PATCH] 53 # Conflicts: # ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/ListGenericObjects.cs # ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/StorageCollection.cs # ProjectGasolineTanker/ProjectGasolineTanker/FormTankerCollection.Designer.cs # ProjectGasolineTanker/ProjectGasolineTanker/FormTankerCollection.cs # ProjectGasolineTanker/ProjectGasolineTanker/FormTankerConfig.cs --- .../ListGenericObjects.cs | 7 + .../StorageCollection.cs | 13 + .../FormTankerCollection.Designer.cs | 268 +++++++----------- .../FormTankerCollection.cs | 120 -------- .../ProjectGasolineTanker/FormTankerConfig.cs | 4 + 5 files changed, 131 insertions(+), 281 deletions(-) diff --git a/ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/ListGenericObjects.cs b/ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/ListGenericObjects.cs index 7f14d87..d6ede07 100644 --- a/ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/ListGenericObjects.cs +++ b/ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/ListGenericObjects.cs @@ -7,6 +7,7 @@ public class ListGenericObjects : ICollectionGenericObjects private int _maxCount; public int Count => _collection.Count; +<<<<<<< HEAD public int MaxCount { get => _maxCount; @@ -20,6 +21,9 @@ public class ListGenericObjects : ICollectionGenericObjects } public CollectionType GetCollectionType => CollectionType.List; +======= + public int SetMaxCount { set { if (value > 0) { _maxCount = value; } } } +>>>>>>> 3ab0f7e (53) /// /// Конструктор @@ -67,6 +71,7 @@ public class ListGenericObjects : ICollectionGenericObjects _collection.RemoveAt(position); return obj; } +<<<<<<< HEAD public IEnumerable GetItems() { @@ -75,4 +80,6 @@ public class ListGenericObjects : ICollectionGenericObjects yield return _collection[i]; } } +======= +>>>>>>> 3ab0f7e (53) } \ No newline at end of file diff --git a/ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/StorageCollection.cs b/ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/StorageCollection.cs index 093a363..d4a2fb2 100644 --- a/ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/StorageCollection.cs +++ b/ProjectGasolineTanker/ProjectGasolineTanker/CollectionGenericObjects/StorageCollection.cs @@ -1,9 +1,16 @@ +<<<<<<< HEAD using ProjectGasolineTanker.Drawnings; using System.Text; namespace ProjectGasolineTanker.CollectionGenericObjects; public class StorageCollection where T : DrawningTanker +======= + +namespace ProjectGasolineTanker.CollectionGenericObjects; +public class StorageCollection + where T : class +>>>>>>> 3ab0f7e (53) { /// /// Словарь (хранилище) с коллекциями @@ -16,6 +23,7 @@ public class StorageCollection public List Keys => _storages.Keys.ToList(); /// +<<<<<<< HEAD /// Ключевое слово, с которого должен начинаться файл /// private readonly string _collectionKey = "CollectionsStorage"; @@ -31,6 +39,8 @@ public class StorageCollection private readonly string _separatorItems = ";"; /// +======= +>>>>>>> 3ab0f7e (53) /// Конструктор /// public StorageCollection() @@ -91,6 +101,7 @@ public class StorageCollection return null; } } +<<<<<<< HEAD /// /// Сохранение информации по автомобилям в хранилище в файл @@ -205,4 +216,6 @@ public class StorageCollection _ => null, }; } +======= +>>>>>>> 3ab0f7e (53) } \ No newline at end of file diff --git a/ProjectGasolineTanker/ProjectGasolineTanker/FormTankerCollection.Designer.cs b/ProjectGasolineTanker/ProjectGasolineTanker/FormTankerCollection.Designer.cs index 59412ef..6495386 100644 --- a/ProjectGasolineTanker/ProjectGasolineTanker/FormTankerCollection.Designer.cs +++ b/ProjectGasolineTanker/ProjectGasolineTanker/FormTankerCollection.Designer.cs @@ -30,13 +30,7 @@ namespace ProjectGasolineTanker /// private void InitializeComponent() { - Инструменты = new GroupBox(); - panelCompanyTools = new Panel(); - buttonAddTanker = new Button(); - maskedTextBoxPosition = new MaskedTextBox(); - buttonGoToCheck = new Button(); - buttonRemoveTanker = new Button(); - buttonRefresh = new Button(); + groupBoxTools = new GroupBox(); buttonCreateCompany = new Button(); panelStorage = new Panel(); buttonCollectionDel = new Button(); @@ -46,107 +40,40 @@ namespace ProjectGasolineTanker radioButtonMassive = new RadioButton(); textBoxCollectionName = new TextBox(); labelCollectionName = new Label(); + buttonRefresh = new Button(); + buttonGoToCheck = new Button(); + buttonRemoveTanker = new Button(); + maskedTextBoxPosition = new MaskedTextBox(); + buttonAddTanker = new Button(); comboBoxSelectorCompany = new ComboBox(); pictureBox = new PictureBox(); - menuStrip = new MenuStrip(); - файлToolStripMenuItem = new ToolStripMenuItem(); - saveToolStripMenuItem = new ToolStripMenuItem(); - loadToolStripMenuItem = new ToolStripMenuItem(); - saveFileDialog = new SaveFileDialog(); - openFileDialog = new OpenFileDialog(); - Инструменты.SuspendLayout(); - panelCompanyTools.SuspendLayout(); + panelCompanyTools = new Panel(); + groupBoxTools.SuspendLayout(); panelStorage.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit(); - menuStrip.SuspendLayout(); + panelCompanyTools.SuspendLayout(); SuspendLayout(); // - // Инструменты + // groupBoxTools // - Инструменты.Controls.Add(panelCompanyTools); - Инструменты.Controls.Add(buttonCreateCompany); - Инструменты.Controls.Add(panelStorage); - Инструменты.Controls.Add(comboBoxSelectorCompany); - Инструменты.Dock = DockStyle.Right; - Инструменты.Location = new Point(861, 24); - Инструменты.Name = "Инструменты"; - Инструменты.Size = new Size(225, 627); - Инструменты.TabIndex = 0; - Инструменты.TabStop = false; - Инструменты.Text = "Инструменты"; - // - // panelCompanyTools - // - panelCompanyTools.Controls.Add(buttonAddTanker); - panelCompanyTools.Controls.Add(maskedTextBoxPosition); - panelCompanyTools.Controls.Add(buttonGoToCheck); - panelCompanyTools.Controls.Add(buttonRemoveTanker); - panelCompanyTools.Controls.Add(buttonRefresh); - panelCompanyTools.Dock = DockStyle.Bottom; - panelCompanyTools.Location = new Point(3, 380); - panelCompanyTools.Name = "panelCompanyTools"; - panelCompanyTools.Size = new Size(219, 244); - panelCompanyTools.TabIndex = 8; - // - // buttonAddTanker - // - buttonAddTanker.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonAddTanker.Location = new Point(3, 21); - buttonAddTanker.Name = "buttonAddTanker"; - buttonAddTanker.Size = new Size(213, 37); - buttonAddTanker.TabIndex = 1; - buttonAddTanker.Text = "Добавление грузовика"; - buttonAddTanker.UseVisualStyleBackColor = true; - buttonAddTanker.Click += ButtonAddTanker_Click; - // - // maskedTextBoxPosition - // - maskedTextBoxPosition.Location = new Point(3, 86); - maskedTextBoxPosition.Mask = "00"; - maskedTextBoxPosition.Name = "maskedTextBoxPosition"; - maskedTextBoxPosition.Size = new Size(213, 23); - maskedTextBoxPosition.TabIndex = 3; - maskedTextBoxPosition.ValidatingType = typeof(int); - // - // buttonGoToCheck - // - buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonGoToCheck.Location = new Point(3, 161); - buttonGoToCheck.Name = "buttonGoToCheck"; - buttonGoToCheck.Size = new Size(213, 40); - buttonGoToCheck.TabIndex = 6; - buttonGoToCheck.Text = "Передать на тесты"; - buttonGoToCheck.UseVisualStyleBackColor = true; - buttonGoToCheck.Click += ButtonGoToCheck_Click; - // - // buttonRemoveTanker - // - buttonRemoveTanker.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonRemoveTanker.Location = new Point(3, 115); - buttonRemoveTanker.Name = "buttonRemoveTanker"; - buttonRemoveTanker.Size = new Size(213, 40); - buttonRemoveTanker.TabIndex = 4; - buttonRemoveTanker.Text = "Удаление автомобиль"; - buttonRemoveTanker.UseVisualStyleBackColor = true; - buttonRemoveTanker.Click += ButtonRemoveTanker_Click; - // - // buttonRefresh - // - buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; - buttonRefresh.Location = new Point(3, 207); - buttonRefresh.Name = "buttonRefresh"; - buttonRefresh.Size = new Size(213, 40); - buttonRefresh.TabIndex = 5; - buttonRefresh.Text = "Обновить"; - buttonRefresh.UseVisualStyleBackColor = true; - buttonRefresh.Click += ButtonRefresh_Click; + groupBoxTools.Controls.Add(panelCompanyTools); + groupBoxTools.Controls.Add(buttonCreateCompany); + groupBoxTools.Controls.Add(panelStorage); + groupBoxTools.Controls.Add(comboBoxSelectorCompany); + groupBoxTools.Dock = DockStyle.Right; + groupBoxTools.Location = new Point(783, 0); + groupBoxTools.Name = "groupBoxTools"; + groupBoxTools.Size = new Size(179, 616); + groupBoxTools.TabIndex = 0; + groupBoxTools.TabStop = false; + groupBoxTools.Text = "Инструменты"; // // buttonCreateCompany // - buttonCreateCompany.Location = new Point(6, 350); + buttonCreateCompany.Location = new Point(6, 320); buttonCreateCompany.Name = "buttonCreateCompany"; - buttonCreateCompany.Size = new Size(213, 24); - buttonCreateCompany.TabIndex = 7; + buttonCreateCompany.Size = new Size(167, 23); + buttonCreateCompany.TabIndex = 8; buttonCreateCompany.Text = "Создать компанию"; buttonCreateCompany.UseVisualStyleBackColor = true; buttonCreateCompany.Click += ButtonCreateCompany_Click; @@ -163,14 +90,14 @@ namespace ProjectGasolineTanker panelStorage.Dock = DockStyle.Top; panelStorage.Location = new Point(3, 19); panelStorage.Name = "panelStorage"; - panelStorage.Size = new Size(219, 296); + panelStorage.Size = new Size(173, 266); panelStorage.TabIndex = 7; // // buttonCollectionDel // - buttonCollectionDel.Location = new Point(3, 267); + buttonCollectionDel.Location = new Point(3, 227); buttonCollectionDel.Name = "buttonCollectionDel"; - buttonCollectionDel.Size = new Size(213, 24); + buttonCollectionDel.Size = new Size(167, 23); buttonCollectionDel.TabIndex = 6; buttonCollectionDel.Text = "Удалить коллекцию"; buttonCollectionDel.UseVisualStyleBackColor = true; @@ -180,16 +107,16 @@ namespace ProjectGasolineTanker // listBoxCollection.FormattingEnabled = true; listBoxCollection.ItemHeight = 15; - listBoxCollection.Location = new Point(3, 122); + listBoxCollection.Location = new Point(3, 112); listBoxCollection.Name = "listBoxCollection"; - listBoxCollection.Size = new Size(213, 139); + listBoxCollection.Size = new Size(167, 109); listBoxCollection.TabIndex = 5; // // buttonCollectionAdd // - buttonCollectionAdd.Location = new Point(3, 85); + buttonCollectionAdd.Location = new Point(3, 83); buttonCollectionAdd.Name = "buttonCollectionAdd"; - buttonCollectionAdd.Size = new Size(213, 24); + buttonCollectionAdd.Size = new Size(167, 23); buttonCollectionAdd.TabIndex = 4; buttonCollectionAdd.Text = "Добавить коллекцию"; buttonCollectionAdd.UseVisualStyleBackColor = true; @@ -198,7 +125,7 @@ namespace ProjectGasolineTanker // radioButtonList // radioButtonList.AutoSize = true; - radioButtonList.Location = new Point(139, 60); + radioButtonList.Location = new Point(98, 58); radioButtonList.Name = "radioButtonList"; radioButtonList.Size = new Size(66, 19); radioButtonList.TabIndex = 3; @@ -209,7 +136,7 @@ namespace ProjectGasolineTanker // radioButtonMassive // radioButtonMassive.AutoSize = true; - radioButtonMassive.Location = new Point(19, 60); + radioButtonMassive.Location = new Point(16, 58); radioButtonMassive.Name = "radioButtonMassive"; radioButtonMassive.Size = new Size(67, 19); radioButtonMassive.TabIndex = 2; @@ -219,27 +146,81 @@ namespace ProjectGasolineTanker // // textBoxCollectionName // - textBoxCollectionName.Location = new Point(3, 31); + textBoxCollectionName.Location = new Point(3, 29); textBoxCollectionName.Name = "textBoxCollectionName"; - textBoxCollectionName.Size = new Size(213, 23); + textBoxCollectionName.Size = new Size(167, 23); textBoxCollectionName.TabIndex = 1; // // labelCollectionName // labelCollectionName.AutoSize = true; - labelCollectionName.Location = new Point(47, 13); + labelCollectionName.Location = new Point(26, 11); labelCollectionName.Name = "labelCollectionName"; labelCollectionName.Size = new Size(125, 15); labelCollectionName.TabIndex = 0; labelCollectionName.Text = "Название коллекции:"; // + // buttonAddTanker + // + buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonRefresh.Location = new Point(3, 210); + buttonRefresh.Name = "buttonRefresh"; + buttonRefresh.Size = new Size(167, 40); + buttonRefresh.TabIndex = 6; + buttonRefresh.Text = "Обновить"; + buttonRefresh.UseVisualStyleBackColor = true; + buttonRefresh.Click += ButtonRefresh_Click; + // + // buttonGoToCheck + // + buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonGoToCheck.Location = new Point(3, 170); + buttonGoToCheck.Name = "buttonGoToCheck"; + buttonGoToCheck.Size = new Size(213, 40); + buttonGoToCheck.TabIndex = 6; + buttonGoToCheck.Text = "Передать на тесты"; + buttonGoToCheck.UseVisualStyleBackColor = true; + buttonGoToCheck.Click += ButtonGoToCheck_Click; + // + // buttonRemoveTanker + // + buttonRemoveTanker.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonRemoveTanker.Location = new Point(3, 124); + buttonRemoveTanker.Name = "buttonRemoveTanker"; + buttonRemoveTanker.Size = new Size(213, 40); + buttonRemoveTanker.TabIndex = 4; + buttonRemoveTanker.Text = "Удаление автомобиль"; + buttonRemoveTanker.UseVisualStyleBackColor = true; + buttonRemoveTanker.Click += ButtonRemoveTanker_Click; + + // + // buttonRefresh + // + maskedTextBoxPosition.Location = new Point(3, 95); + maskedTextBoxPosition.Mask = "00"; + maskedTextBoxPosition.Name = "maskedTextBoxPosition"; + maskedTextBoxPosition.Size = new Size(167, 23); + maskedTextBoxPosition.TabIndex = 3; + maskedTextBoxPosition.ValidatingType = typeof(int); + // + // buttonAddTanker + // + buttonAddTanker.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonAddTanker.Location = new Point(3, 3); + buttonAddTanker.Name = "buttonAddTanker"; + buttonAddTanker.Size = new Size(167, 40); + buttonAddTanker.TabIndex = 1; + buttonAddTanker.Text = "Добавление грузовика"; + buttonAddTanker.UseVisualStyleBackColor = true; + buttonAddTanker.Click += ButtonAddTanker_Click; + // // comboBoxSelectorCompany // comboBoxSelectorCompany.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList; comboBoxSelectorCompany.FormattingEnabled = true; comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" }); - comboBoxSelectorCompany.Location = new Point(6, 321); + comboBoxSelectorCompany.Location = new Point(6, 291); comboBoxSelectorCompany.Name = "comboBoxSelectorCompany"; comboBoxSelectorCompany.Size = new Size(213, 23); comboBoxSelectorCompany.TabIndex = 0; @@ -254,45 +235,19 @@ namespace ProjectGasolineTanker pictureBox.TabIndex = 1; pictureBox.TabStop = false; // - // menuStrip + // panelCompanyTools // - menuStrip.Items.AddRange(new ToolStripItem[] { файлToolStripMenuItem }); - menuStrip.Location = new Point(0, 0); - menuStrip.Name = "menuStrip"; - menuStrip.Size = new Size(1086, 24); - menuStrip.TabIndex = 2; - menuStrip.Text = "menuStrip1"; - // - // файлToolStripMenuItem - // - файлToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { saveToolStripMenuItem, loadToolStripMenuItem }); - файлToolStripMenuItem.Name = "файлToolStripMenuItem"; - файлToolStripMenuItem.Size = new Size(48, 20); - файлToolStripMenuItem.Text = "Файл"; - // - // saveToolStripMenuItem - // - saveToolStripMenuItem.Name = "saveToolStripMenuItem"; - saveToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.S; - saveToolStripMenuItem.Size = new Size(181, 22); - saveToolStripMenuItem.Text = "Сохранение"; - saveToolStripMenuItem.Click += SaveToolStripMenuItem_Click; - // - // loadToolStripMenuItem - // - loadToolStripMenuItem.Name = "loadToolStripMenuItem"; - loadToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.L; - loadToolStripMenuItem.Size = new Size(181, 22); - loadToolStripMenuItem.Text = "Загрузка"; - loadToolStripMenuItem.Click += loadToolStripMenuItem_Click; - // - // saveFileDialog - // - saveFileDialog.Filter = "txt file | *.txt"; - // - // openFileDialog - // - openFileDialog.Filter = "txt file | *.txt"; + panelCompanyTools.Controls.Add(buttonAddTanker); + panelCompanyTools.Controls.Add(maskedTextBoxPosition); + panelCompanyTools.Controls.Add(buttonRefresh); + panelCompanyTools.Controls.Add(buttonRemoveTanker); + panelCompanyTools.Controls.Add(buttonGoToCheck); + panelCompanyTools.Dock = DockStyle.Bottom; + panelCompanyTools.Enabled = false; + panelCompanyTools.Location = new Point(3, 360); + panelCompanyTools.Name = "panelCompanyTools"; + panelCompanyTools.Size = new Size(173, 253); + panelCompanyTools.TabIndex = 9; // // FormTankerCollection // @@ -305,17 +260,14 @@ namespace ProjectGasolineTanker Controls.Add(menuStrip); MainMenuStrip = menuStrip; Name = "FormTankerCollection"; - Text = "Коллекция Грузовиков"; - Инструменты.ResumeLayout(false); - panelCompanyTools.ResumeLayout(false); - panelCompanyTools.PerformLayout(); + Text = "Коллекция автомобилей"; + groupBoxTools.ResumeLayout(false); panelStorage.ResumeLayout(false); panelStorage.PerformLayout(); ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit(); - menuStrip.ResumeLayout(false); - menuStrip.PerformLayout(); + panelCompanyTools.ResumeLayout(false); + panelCompanyTools.PerformLayout(); ResumeLayout(false); - PerformLayout(); } #endregion @@ -338,11 +290,5 @@ namespace ProjectGasolineTanker private Button buttonCollectionDel; 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/ProjectGasolineTanker/ProjectGasolineTanker/FormTankerCollection.cs b/ProjectGasolineTanker/ProjectGasolineTanker/FormTankerCollection.cs index ea5f685..9aadc20 100644 --- a/ProjectGasolineTanker/ProjectGasolineTanker/FormTankerCollection.cs +++ b/ProjectGasolineTanker/ProjectGasolineTanker/FormTankerCollection.cs @@ -148,124 +148,4 @@ public partial class FormTankerCollection : Form pictureBox.Image = _company.Show(); } - private void ButtonCollectionAdd_Click(object sender, EventArgs e) - { - if (string.IsNullOrEmpty(textBoxCollectionName.Text) || (!radioButtonList.Checked && !radioButtonMassive.Checked)) - { - MessageBox.Show("Не все данный заполнены", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); - return; - } - CollectionType collectionType = CollectionType.None; - if (radioButtonMassive.Checked) - { - collectionType = CollectionType.Massive; - } - else if (radioButtonList.Checked) - { - collectionType = CollectionType.List; - } - - _storageCollection.AddCollection(textBoxCollectionName.Text, collectionType); - RefreshListBoxItems(); - } - /// - /// Обновление списка в listBoxCollection - /// - private void RefreshListBoxItems() - { - listBoxCollection.Items.Clear(); - for (int i = 0; i < _storageCollection.Keys?.Count; ++i) - { - string? colName = _storageCollection.Keys?[i]; - if (!string.IsNullOrEmpty(colName)) - { - listBoxCollection.Items.Add(colName); - } - } - - } - - private void ButtonCollectionDel_Click(object sender, EventArgs e) - { - if (listBoxCollection.SelectedIndex < 0 || listBoxCollection.SelectedItems == null) - { - MessageBox.Show("Коллекция не выбрана"); - return; - } - if (MessageBox.Show("Удалить коллекцию?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No) - { - return; - } - _storageCollection.DelCollection(listBoxCollection.SelectedItem.ToString()); - RefreshListBoxItems(); - } - - - private void ButtonCreateCompany_Click(object sender, EventArgs e) - { - if (listBoxCollection.SelectedIndex < 0 || listBoxCollection.SelectedItem == null) - { - MessageBox.Show("Коллекция не выбрана"); - return; - } - - ICollectionGenericObjects? collection = _storageCollection[listBoxCollection.SelectedItem.ToString() ?? string.Empty]; - if (collection == null) - { - MessageBox.Show("Коллекция не проинициализирована"); - return; - } - - switch (comboBoxSelectorCompany.Text) - { - case "Хранилище": - _company = new CarPark(pictureBox.Width, pictureBox.Height, collection); - break; - } - - panelCompanyTools.Enabled = true; - RefreshListBoxItems(); - } - /// - /// Обработка нажатия "Сохранение" - /// - /// - /// - 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)) - { - RefreshListBoxItems(); - MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information); - } - else - { - MessageBox.Show("Загрузка не выполнена", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - } - } - - } \ No newline at end of file diff --git a/ProjectGasolineTanker/ProjectGasolineTanker/FormTankerConfig.cs b/ProjectGasolineTanker/ProjectGasolineTanker/FormTankerConfig.cs index 1b0edea..1a64c76 100644 --- a/ProjectGasolineTanker/ProjectGasolineTanker/FormTankerConfig.cs +++ b/ProjectGasolineTanker/ProjectGasolineTanker/FormTankerConfig.cs @@ -79,7 +79,11 @@ public partial class FormTankerConfig : Form break; case "labelModifiedObject": _tanker = new DrawningGasolineTanker((int)numericUpDownSpeed.Value, (double)numericUpDownWeight.Value, Color.White, +<<<<<<< HEAD Color.Black, checkBoxSignalbeacon.Checked, checkBoxTanker.Checked); +======= + Color.Black, checkBoxTanker.Checked, checkBoxSignalbeacon.Checked); +>>>>>>> 3ab0f7e (53) break; } labelBodyColor.BackColor = Color.Empty;