From 8624e5ea41604f154a6c1ce694aff0c5c9979a97 Mon Sep 17 00:00:00 2001 From: nikos77781 Date: Tue, 21 May 2024 01:07:39 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9B=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=20=E2=84=966?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AbsractCompany.cs | 2 +- .../ICollectionGenericObjects.cs | 14 +- .../ListGenericObjects.cs | 15 +- .../MassiveGenericObjects.cs | 16 +- .../StorageCollection.cs | 158 +++++++++++++++++- .../Excavator/Drawnings/DrawningExcavator.cs | 8 + .../Drawnings/DrawningSimpleExcavator.cs | 20 ++- .../ExtensionDrawningSimpleExcavator.cs | 55 ++++++ .../Excavator/Entities/EntityExcavator.cs | 26 +++ .../Entities/EntitySimpleExcavator.cs | 23 +++ .../FormExcavatorCollection.Designer.cs | 75 ++++++++- .../Excavator/FormExcavatorCollection.cs | 33 +++- .../Excavator/FormExcavatorCollection.resx | 9 + .../Excavator/FormExcavatorConfig.Designer.cs | 8 +- 14 files changed, 434 insertions(+), 28 deletions(-) create mode 100644 Excavator/Excavator/Drawnings/ExtensionDrawningSimpleExcavator.cs diff --git a/Excavator/Excavator/CollectionGenericObjects/AbsractCompany.cs b/Excavator/Excavator/CollectionGenericObjects/AbsractCompany.cs index 712c9b6..e0f2baa 100644 --- a/Excavator/Excavator/CollectionGenericObjects/AbsractCompany.cs +++ b/Excavator/Excavator/CollectionGenericObjects/AbsractCompany.cs @@ -48,7 +48,7 @@ public abstract class AbstractCompany _pictureWidth = picWidth; _pictureHeight = picHeight; _collection = collection; - _collection.SetMaxCount = GetMaxCount; + _collection.MaxCount = GetMaxCount; } /// diff --git a/Excavator/Excavator/CollectionGenericObjects/ICollectionGenericObjects.cs b/Excavator/Excavator/CollectionGenericObjects/ICollectionGenericObjects.cs index 3f8be1e..a157a28 100644 --- a/Excavator/Excavator/CollectionGenericObjects/ICollectionGenericObjects.cs +++ b/Excavator/Excavator/CollectionGenericObjects/ICollectionGenericObjects.cs @@ -15,7 +15,7 @@ public interface ICollectionGenericObjects /// /// Установка максимального количества элементов /// - int SetMaxCount { set; } + int MaxCount { get; set; } /// /// Добавление объекта в коллекцию @@ -45,4 +45,16 @@ public interface ICollectionGenericObjects /// Позиция /// Объект T? Get(int position); + + + /// + /// Получение типа коллекции + /// + CollectionType GetCollectionType { get; } + + /// + /// Получение объектов коллекции по одному + /// + /// Поэлементный вывод элементов коллекции + IEnumerable GetItems(); } diff --git a/Excavator/Excavator/CollectionGenericObjects/ListGenericObjects.cs b/Excavator/Excavator/CollectionGenericObjects/ListGenericObjects.cs index b2ea060..dbfe9e7 100644 --- a/Excavator/Excavator/CollectionGenericObjects/ListGenericObjects.cs +++ b/Excavator/Excavator/CollectionGenericObjects/ListGenericObjects.cs @@ -21,8 +21,9 @@ public class ListGenericObjects : ICollectionGenericObjects public int Count => _collection.Count; - public int SetMaxCount + public int MaxCount { + get => _maxCount; set { if (value > 0) @@ -31,6 +32,9 @@ public class ListGenericObjects : ICollectionGenericObjects } } } + + public CollectionType GetCollectionType => CollectionType.List; + /// /// Конструктор /// @@ -66,4 +70,13 @@ public class ListGenericObjects : ICollectionGenericObjects _collection.RemoveAt(position); return temp; } + + public IEnumerable GetItems() + { + for (int i = 0; i < Count; i++) + { + yield return _collection[i]; + } + } + } diff --git a/Excavator/Excavator/CollectionGenericObjects/MassiveGenericObjects.cs b/Excavator/Excavator/CollectionGenericObjects/MassiveGenericObjects.cs index 31946a2..894bd80 100644 --- a/Excavator/Excavator/CollectionGenericObjects/MassiveGenericObjects.cs +++ b/Excavator/Excavator/CollectionGenericObjects/MassiveGenericObjects.cs @@ -14,8 +14,12 @@ public class MassiveGenericObjects : ICollectionGenericObjects public int Count => _collection.Length; - public int SetMaxCount + public int MaxCount { + get + { + return _collection.Length; + } set { if (value > 0) @@ -32,6 +36,8 @@ public class MassiveGenericObjects : ICollectionGenericObjects } } + public CollectionType GetCollectionType => CollectionType.Massive; + /// /// Конструктор /// @@ -115,4 +121,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]; + } + } } \ No newline at end of file diff --git a/Excavator/Excavator/CollectionGenericObjects/StorageCollection.cs b/Excavator/Excavator/CollectionGenericObjects/StorageCollection.cs index 99091de..e2b0b09 100644 --- a/Excavator/Excavator/CollectionGenericObjects/StorageCollection.cs +++ b/Excavator/Excavator/CollectionGenericObjects/StorageCollection.cs @@ -1,13 +1,9 @@ -using System; -using System.Collections.Generic; -using System.Linq; +using Excavator.Drawnings; using System.Text; -using System.Threading.Tasks; namespace Excavator.CollectionGenericObjects; -public class StorageCollection - where T : class +public class StorageCollection where T : DrawningSimpleExcavator { /// /// Словарь (хранилище) с коллекциями @@ -19,6 +15,21 @@ public class StorageCollection /// public List Keys => _storages.Keys.ToList(); + /// + /// Ключевое слово, с которого должен начинаться файл + /// + private readonly string _collectionKey = "CollectionStorage"; + + /// + /// Разделитель для записи ключа и значения элемента словаря + /// + private readonly string _separatorForKeyValue = "|"; + + /// + /// Разделитель для записей коллекции данных в файл + /// + private readonly string _separatorItems = ";"; + /// /// Конструктор /// @@ -73,4 +84,139 @@ public class StorageCollection return null; } } + + /// + /// Сохранение информации по автомобилям в хранилище в файл + /// + /// Путь и имя файла + /// true - сохранение прошло успешно, false - ошибка при сохранение данных + public bool SaveData(string filename) + { + if (_storages.Count == 0) + { + return false; + } + + if (File.Exists(filename)) + { + File.Delete(filename); + } + + using (StreamWriter 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?.CreateDrawningSimpleExcavator() is T excavator) + { + if (collection.Insert(excavator) == -1) + { + return false; + } + } + } + _storages.Add(record[0], collection); + } + return true; + } + } + + /// + /// Создание коллекции по типа + /// + /// + /// + private static ICollectionGenericObjects? CreateCollection(CollectionType collectionType) + { + return collectionType switch + { + CollectionType.Massive => new MassiveGenericObjects(), + CollectionType.List => new ListGenericObjects(), + _ => null + }; + } } \ No newline at end of file diff --git a/Excavator/Excavator/Drawnings/DrawningExcavator.cs b/Excavator/Excavator/Drawnings/DrawningExcavator.cs index a4a5464..8ba8264 100644 --- a/Excavator/Excavator/Drawnings/DrawningExcavator.cs +++ b/Excavator/Excavator/Drawnings/DrawningExcavator.cs @@ -25,6 +25,14 @@ public class DrawningExcavator : DrawningSimpleExcavator EntitySimpleExcavator = new EntityExcavator(speed, weight, bodyColor, additionalColor, supports, bucket); } + /// + /// Конструктор + /// + /// Класс-сущность + public DrawningExcavator(EntityExcavator excavator) : base(70, 80) + { + EntitySimpleExcavator = new EntityExcavator(excavator.Speed, excavator.Weight, excavator.BodyColor, excavator.AdditionalColor, excavator.Supports, excavator.Bucket); + } public override void DrawTransport(Graphics g) { diff --git a/Excavator/Excavator/Drawnings/DrawningSimpleExcavator.cs b/Excavator/Excavator/Drawnings/DrawningSimpleExcavator.cs index 1ad2b49..b40dbc8 100644 --- a/Excavator/Excavator/Drawnings/DrawningSimpleExcavator.cs +++ b/Excavator/Excavator/Drawnings/DrawningSimpleExcavator.cs @@ -88,11 +88,21 @@ public class DrawningSimpleExcavator } -/// -/// Конструктор для наследников -/// -/// Ширина прорисовки экскаватора -/// Высота прорисовки экскаватора + /// + /// Конструктор + /// + /// Класс-сущность + public DrawningSimpleExcavator(EntitySimpleExcavator simpleExcavator) : this() + { + EntitySimpleExcavator = new EntitySimpleExcavator(simpleExcavator.Speed, simpleExcavator.Weight, simpleExcavator.BodyColor); + } + + + /// + /// Конструктор для наследников + /// + /// Ширина прорисовки экскаватора + /// Высота прорисовки экскаватора public DrawningSimpleExcavator(int drawningExcavatorWidth, int drawningExcavatorHeight) : this() { _drawningExcavatorWidth = drawningExcavatorWidth; diff --git a/Excavator/Excavator/Drawnings/ExtensionDrawningSimpleExcavator.cs b/Excavator/Excavator/Drawnings/ExtensionDrawningSimpleExcavator.cs new file mode 100644 index 0000000..47610f7 --- /dev/null +++ b/Excavator/Excavator/Drawnings/ExtensionDrawningSimpleExcavator.cs @@ -0,0 +1,55 @@ +using Excavator.Entities; + +namespace Excavator.Drawnings; + +/// +/// Расширение для класса EntityCar +/// +public static class ExtensionDrawningAirbus +{ + /// + /// Разделитель для записи информации по объекту в файл + /// + private static readonly string _separatorForObject = ":"; + + /// + /// Создание объекта из строки + /// + /// Строка с данными для создания объекта + /// Объект + public static DrawningSimpleExcavator? CreateDrawningSimpleExcavator(this string info) + { + string[] strs = info.Split(_separatorForObject); + + EntitySimpleExcavator? excavator = EntityExcavator.CreateEntityExcavator(strs); + if (excavator != null) + { + return new DrawningExcavator((EntityExcavator)excavator); + } + + excavator = EntitySimpleExcavator.CreateEntitySimpleExcavator(strs); + if (excavator != null) + { + return new DrawningSimpleExcavator(excavator); + } + + return null; + } + + /// + /// Получение данных для сохранения в файл + /// + /// Сохраняемый объект + /// Строка с данными по объекту + public static string GetDataForSave(this DrawningSimpleExcavator drawningSimpleExcavator) + { + string[]? array = drawningSimpleExcavator?.EntitySimpleExcavator?.GetStringRepresentation(); + + if (array == null) + { + return string.Empty; + } + + return string.Join(_separatorForObject, array); + } +} \ No newline at end of file diff --git a/Excavator/Excavator/Entities/EntityExcavator.cs b/Excavator/Excavator/Entities/EntityExcavator.cs index a1907f2..d76b694 100644 --- a/Excavator/Excavator/Entities/EntityExcavator.cs +++ b/Excavator/Excavator/Entities/EntityExcavator.cs @@ -41,4 +41,30 @@ public class EntityExcavator : EntitySimpleExcavator Supports = supports; Bucket = bucket; } + + /// + /// Получение строк со значениями свойств объекта продвинутого класса-сущности + /// + /// + public override string[] GetStringRepresentation() + { + return new[] { nameof(EntityExcavator), Speed.ToString(), Weight.ToString(), BodyColor.Name, + AdditionalColor.Name, Supports.ToString(), Bucket.ToString() }; + } + + /// + /// Создание продвинутого объекта из массива строк + /// + /// + /// + public static EntitySimpleExcavator? CreateEntityExcavator(string[] strs) + { + if (strs.Length != 7 || strs[0] != nameof(EntityExcavator)) + { + return null; + } + + return new EntityExcavator(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/Excavator/Excavator/Entities/EntitySimpleExcavator.cs b/Excavator/Excavator/Entities/EntitySimpleExcavator.cs index 8c61abf..4d2c128 100644 --- a/Excavator/Excavator/Entities/EntitySimpleExcavator.cs +++ b/Excavator/Excavator/Entities/EntitySimpleExcavator.cs @@ -48,4 +48,27 @@ public class EntitySimpleExcavator Weight = weight; BodyColor = bodyColor; } + /// + /// Получение строк со значениями свойств объекта класса-сущности + /// + /// + public virtual string[] GetStringRepresentation() + { + return new[] { nameof(EntitySimpleExcavator), Speed.ToString(), Weight.ToString(), BodyColor.Name }; + } + + /// + /// Создание объекта из массива строк + /// + /// + /// + public static EntitySimpleExcavator? CreateEntitySimpleExcavator(string[] strs) + { + if (strs.Length != 4 || strs[0] != nameof(EntitySimpleExcavator)) + { + return null; + } + + return new EntitySimpleExcavator(Convert.ToInt32(strs[1]), Convert.ToDouble(strs[2]), Color.FromName(strs[3])); + } } diff --git a/Excavator/Excavator/FormExcavatorCollection.Designer.cs b/Excavator/Excavator/FormExcavatorCollection.Designer.cs index 2f4ce77..bab5470 100644 --- a/Excavator/Excavator/FormExcavatorCollection.Designer.cs +++ b/Excavator/Excavator/FormExcavatorCollection.Designer.cs @@ -46,10 +46,17 @@ buttonRemoveExcavator = new Button(); buttonRefresh = new Button(); pictureBox = new PictureBox(); + menuStrip1 = new MenuStrip(); + файлToolStripMenuItem = new ToolStripMenuItem(); + SaveToolStripMenuItem = new ToolStripMenuItem(); + LoadToolStripMenuItem = new ToolStripMenuItem(); + openFileDialog = new OpenFileDialog(); + saveFileDialog = new SaveFileDialog(); groupBoxTools.SuspendLayout(); panelStorage.SuspendLayout(); panelCompanyTools.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit(); + menuStrip1.SuspendLayout(); SuspendLayout(); // // groupBoxTools @@ -60,9 +67,9 @@ groupBoxTools.Controls.Add(comboBoxSelectorCompany); groupBoxTools.Controls.Add(panelCompanyTools); groupBoxTools.Font = new Font("Microsoft Sans Serif", 8.25F, FontStyle.Regular, GraphicsUnit.Point); - groupBoxTools.Location = new Point(855, 1); + groupBoxTools.Location = new Point(855, 27); groupBoxTools.Name = "groupBoxTools"; - groupBoxTools.Size = new Size(212, 634); + groupBoxTools.Size = new Size(212, 608); groupBoxTools.TabIndex = 0; groupBoxTools.TabStop = false; groupBoxTools.Text = "Инструменты"; @@ -185,7 +192,7 @@ // // buttonGoToCheck // - buttonGoToCheck.Location = new Point(6, 164); + buttonGoToCheck.Location = new Point(3, 148); buttonGoToCheck.Name = "buttonGoToCheck"; buttonGoToCheck.Size = new Size(191, 42); buttonGoToCheck.TabIndex = 5; @@ -205,7 +212,7 @@ // // maskedTextBoxPosition // - maskedTextBoxPosition.Location = new Point(3, 91); + maskedTextBoxPosition.Location = new Point(3, 75); maskedTextBoxPosition.Mask = "00"; maskedTextBoxPosition.Name = "maskedTextBoxPosition"; maskedTextBoxPosition.Size = new Size(191, 20); @@ -213,7 +220,7 @@ // // buttonRemoveExcavator // - buttonRemoveExcavator.Location = new Point(6, 117); + buttonRemoveExcavator.Location = new Point(3, 101); buttonRemoveExcavator.Name = "buttonRemoveExcavator"; buttonRemoveExcavator.Size = new Size(191, 41); buttonRemoveExcavator.TabIndex = 4; @@ -223,7 +230,7 @@ // // buttonRefresh // - buttonRefresh.Location = new Point(6, 212); + buttonRefresh.Location = new Point(3, 196); buttonRefresh.Name = "buttonRefresh"; buttonRefresh.Size = new Size(191, 41); buttonRefresh.TabIndex = 6; @@ -236,13 +243,54 @@ pictureBox.AccessibleRole = AccessibleRole.None; pictureBox.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; pictureBox.BackgroundImageLayout = ImageLayout.None; - pictureBox.Location = new Point(0, 1); + pictureBox.Location = new Point(0, 27); pictureBox.Name = "pictureBox"; - pictureBox.Size = new Size(855, 634); + pictureBox.Size = new Size(855, 608); pictureBox.TabIndex = 1; pictureBox.TabStop = false; pictureBox.Click += pictureBox_Click; // + // menuStrip1 + // + menuStrip1.Items.AddRange(new ToolStripItem[] { файлToolStripMenuItem }); + menuStrip1.Location = new Point(0, 0); + menuStrip1.Name = "menuStrip1"; + menuStrip1.Size = new Size(1067, 24); + menuStrip1.TabIndex = 2; + menuStrip1.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; + // + // openFileDialog + // + openFileDialog.FileName = "openFileDialog1"; + openFileDialog.Filter = "txt file | *.txt"; + // + // saveFileDialog + // + saveFileDialog.Filter = "txt file | *.txt"; + // // FormExcavatorCollection // AutoScaleDimensions = new SizeF(7F, 15F); @@ -250,6 +298,8 @@ ClientSize = new Size(1067, 635); Controls.Add(pictureBox); Controls.Add(groupBoxTools); + Controls.Add(menuStrip1); + MainMenuStrip = menuStrip1; Name = "FormExcavatorCollection"; Text = "Коллекция экскаваторов"; groupBoxTools.ResumeLayout(false); @@ -258,7 +308,10 @@ panelCompanyTools.ResumeLayout(false); panelCompanyTools.PerformLayout(); ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit(); + menuStrip1.ResumeLayout(false); + menuStrip1.PerformLayout(); ResumeLayout(false); + PerformLayout(); } #endregion @@ -281,5 +334,11 @@ private ListBox listBoxCollection; private Button buttonCollectionDel; private Button buttonCreateCompany; + private MenuStrip menuStrip1; + private ToolStripMenuItem файлToolStripMenuItem; + private ToolStripMenuItem SaveToolStripMenuItem; + private ToolStripMenuItem LoadToolStripMenuItem; + private OpenFileDialog openFileDialog; + private SaveFileDialog saveFileDialog; } } \ No newline at end of file diff --git a/Excavator/Excavator/FormExcavatorCollection.cs b/Excavator/Excavator/FormExcavatorCollection.cs index eee3926..70e5fad 100644 --- a/Excavator/Excavator/FormExcavatorCollection.cs +++ b/Excavator/Excavator/FormExcavatorCollection.cs @@ -27,7 +27,7 @@ public partial class FormExcavatorCollection : Form { panelCompanyTools.Enabled = false; } - + private void ButtonAddSimleExcavator_Click(object sender, EventArgs e) { if (_company == null) @@ -227,4 +227,35 @@ public partial class FormExcavatorCollection : 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); + } + else + { + MessageBox.Show("Не загрузилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + RerfreshListBoxItems(); + } } \ No newline at end of file diff --git a/Excavator/Excavator/FormExcavatorCollection.resx b/Excavator/Excavator/FormExcavatorCollection.resx index a395bff..caf2bd5 100644 --- a/Excavator/Excavator/FormExcavatorCollection.resx +++ b/Excavator/Excavator/FormExcavatorCollection.resx @@ -117,4 +117,13 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + + + 132, 17 + + + 272, 17 + \ No newline at end of file diff --git a/Excavator/Excavator/FormExcavatorConfig.Designer.cs b/Excavator/Excavator/FormExcavatorConfig.Designer.cs index 47aeac1..20c5f6b 100644 --- a/Excavator/Excavator/FormExcavatorConfig.Designer.cs +++ b/Excavator/Excavator/FormExcavatorConfig.Designer.cs @@ -165,9 +165,9 @@ checkBoxSupports.AutoSize = true; checkBoxSupports.Location = new Point(12, 134); checkBoxSupports.Name = "checkBoxSupports"; - checkBoxSupports.Size = new Size(106, 19); + checkBoxSupports.Size = new Size(114, 19); checkBoxSupports.TabIndex = 7; - checkBoxSupports.Text = "Наличие опор"; + checkBoxSupports.Text = "Наличие ковша"; checkBoxSupports.UseVisualStyleBackColor = true; // // checkBoxBucket @@ -175,9 +175,9 @@ checkBoxBucket.AutoSize = true; checkBoxBucket.Location = new Point(12, 109); checkBoxBucket.Name = "checkBoxBucket"; - checkBoxBucket.Size = new Size(114, 19); + checkBoxBucket.Size = new Size(106, 19); checkBoxBucket.TabIndex = 6; - checkBoxBucket.Text = "Наличие ковша"; + checkBoxBucket.Text = "Наличие опор"; checkBoxBucket.UseVisualStyleBackColor = true; // // numericUpDownWeight