diff --git a/Project_DumpTruck/Project_DumpTruck/ExtentionDrawningTruck.cs b/Project_DumpTruck/Project_DumpTruck/ExtentionDrawningTruck.cs
new file mode 100644
index 0000000..8bdc461
--- /dev/null
+++ b/Project_DumpTruck/Project_DumpTruck/ExtentionDrawningTruck.cs
@@ -0,0 +1,68 @@
+using Project_DumpTruck.Entities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Project_DumpTruck.DrawningObjects
+{
+ ///
+ /// Расширение для класса EntityCar
+ ///
+ public static class ExtentionDrawningTruck
+ {
+ ///
+ /// Создание объекта из строки
+ ///
+ /// Строка с данными для создания объекта
+ /// Разделитель даннных
+ /// Ширина
+ /// Высота
+ /// Объект
+ public static DrawningTruck? CreateDrawningTruck(this string info, char
+ separatorForObject, int width, int height)
+ {
+ string[] strs = info.Split(separatorForObject);
+ if (strs.Length == 3)
+ {
+ return new DrawningTruck(Convert.ToInt32(strs[0]),
+ Convert.ToInt32(strs[1]), Color.FromName(strs[2]), width, height);
+ }
+ if (strs.Length == 6)
+ {
+ return new DrawningDumpTruck(Convert.ToInt32(strs[0]),
+ Convert.ToInt32(strs[1]),
+ Color.FromName(strs[2]),
+ Color.FromName(strs[3]),
+ Convert.ToBoolean(strs[4]),
+ Convert.ToBoolean(strs[5]),
+ width, height);
+ }
+ return null;
+ }
+ ///
+ /// Получение данных для сохранения в файл
+ ///
+ /// Сохраняемый объект
+ /// Разделитель даннных
+ /// Строка с данными по объекту
+ public static string GetDataForSave(this DrawningTruck drawningTruck,
+ char separatorForObject)
+ {
+ var truck = drawningTruck.EntityTruck;
+ if (truck == null)
+ {
+ return string.Empty;
+ }
+ var str =
+ $"{truck.Speed}{separatorForObject}{truck.Weight}{separatorForObject}{truck.BodyColor.Name}";
+ if (truck is not EntityDumpTruck dumpTruck)
+ {
+ return str;
+ }
+ return
+ $"{str}{separatorForObject}{dumpTruck.AdditionalColor.Name}{separatorForObject}{dumpTruck.BodyKit}{separatorForObject}{dumpTruck.Tent}";
+ }
+ }
+}
diff --git a/Project_DumpTruck/Project_DumpTruck/FormTruckCollection.Designer.cs b/Project_DumpTruck/Project_DumpTruck/FormTruckCollection.Designer.cs
index fd6fa50..2a33126 100644
--- a/Project_DumpTruck/Project_DumpTruck/FormTruckCollection.Designer.cs
+++ b/Project_DumpTruck/Project_DumpTruck/FormTruckCollection.Designer.cs
@@ -39,9 +39,16 @@
buttonRemoveTruck = new Button();
buttonAddTruck = new Button();
pictureBoxCollection = new PictureBox();
+ menuStrip1 = new MenuStrip();
+ ToolStripMenuItem = new ToolStripMenuItem();
+ SaveToolStripMenuItem = new ToolStripMenuItem();
+ LoadToolStripMenuItem = new ToolStripMenuItem();
+ openFileDialog = new OpenFileDialog();
+ saveFileDialog = new SaveFileDialog();
groupBox1.SuspendLayout();
groupBoxStorage.SuspendLayout();
((System.ComponentModel.ISupportInitialize)pictureBoxCollection).BeginInit();
+ menuStrip1.SuspendLayout();
SuspendLayout();
//
// groupBox1
@@ -51,7 +58,7 @@
groupBox1.Controls.Add(buttonRefreshCollection);
groupBox1.Controls.Add(buttonRemoveTruck);
groupBox1.Controls.Add(buttonAddTruck);
- groupBox1.Location = new Point(588, 12);
+ groupBox1.Location = new Point(588, 27);
groupBox1.Name = "groupBox1";
groupBox1.Size = new Size(200, 426);
groupBox1.TabIndex = 0;
@@ -147,19 +154,60 @@
//
// pictureBoxCollection
//
- pictureBoxCollection.Location = new Point(12, 12);
+ pictureBoxCollection.Location = new Point(12, 27);
pictureBoxCollection.Name = "pictureBoxCollection";
pictureBoxCollection.Size = new Size(570, 426);
pictureBoxCollection.TabIndex = 1;
pictureBoxCollection.TabStop = false;
//
+ // menuStrip1
+ //
+ menuStrip1.Items.AddRange(new ToolStripItem[] { ToolStripMenuItem });
+ menuStrip1.Location = new Point(0, 0);
+ menuStrip1.Name = "menuStrip1";
+ menuStrip1.Size = new Size(800, 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.Size = new Size(180, 22);
+ SaveToolStripMenuItem.Text = "Сохранение";
+ SaveToolStripMenuItem.Click += SaveToolStripMenuItem_Click;
+ //
+ // LoadToolStripMenuItem
+ //
+ LoadToolStripMenuItem.Name = "LoadToolStripMenuItem";
+ LoadToolStripMenuItem.Size = new Size(180, 22);
+ LoadToolStripMenuItem.Text = "Загрузка";
+ LoadToolStripMenuItem.Click += LoadToolStripMenuItem_Click;
+ //
+ // openFileDialog
+ //
+ openFileDialog.FileName = "openFileDialog1";
+ openFileDialog.Filter = "txt file | *.txt";
+ //
+ // saveFileDialog
+ //
+ saveFileDialog.Filter = "txt file | *.txt";
+ //
// FormTruckCollection
//
AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleMode = AutoScaleMode.Font;
- ClientSize = new Size(800, 450);
+ ClientSize = new Size(800, 468);
Controls.Add(pictureBoxCollection);
Controls.Add(groupBox1);
+ Controls.Add(menuStrip1);
+ MainMenuStrip = menuStrip1;
Name = "FormTruckCollection";
Text = "Набор грузовиков";
groupBox1.ResumeLayout(false);
@@ -167,7 +215,10 @@
groupBoxStorage.ResumeLayout(false);
groupBoxStorage.PerformLayout();
((System.ComponentModel.ISupportInitialize)pictureBoxCollection).EndInit();
+ menuStrip1.ResumeLayout(false);
+ menuStrip1.PerformLayout();
ResumeLayout(false);
+ PerformLayout();
}
#endregion
@@ -183,5 +234,11 @@
private ListBox listBoxStorages;
private Button buttonAddObject;
private TextBox textBoxStorageName;
+ 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/Project_DumpTruck/Project_DumpTruck/FormTruckCollection.cs b/Project_DumpTruck/Project_DumpTruck/FormTruckCollection.cs
index aa95623..4aaa1d7 100644
--- a/Project_DumpTruck/Project_DumpTruck/FormTruckCollection.cs
+++ b/Project_DumpTruck/Project_DumpTruck/FormTruckCollection.cs
@@ -174,5 +174,48 @@ namespace Project_DumpTruck
ReloadObjects();
}
}
+
+ ///
+ /// Обработка нажатия "Сохранение"
+ ///
+ ///
+ ///
+ private void SaveToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ if (saveFileDialog.ShowDialog() == DialogResult.OK)
+ {
+ if (_storage.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 (_storage.LoadData(openFileDialog.FileName))
+ {
+ ReloadObjects();
+ MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+ }
+ else
+ {
+ MessageBox.Show("Не удалось загрузить данные", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ }
+ }
+ }
}
}
diff --git a/Project_DumpTruck/Project_DumpTruck/FormTruckCollection.resx b/Project_DumpTruck/Project_DumpTruck/FormTruckCollection.resx
index af32865..7b98149 100644
--- a/Project_DumpTruck/Project_DumpTruck/FormTruckCollection.resx
+++ b/Project_DumpTruck/Project_DumpTruck/FormTruckCollection.resx
@@ -117,4 +117,13 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 17, 17
+
+
+ 132, 17
+
+
+ 271, 17
+
\ No newline at end of file
diff --git a/Project_DumpTruck/Project_DumpTruck/TrucksGenericCollection.cs b/Project_DumpTruck/Project_DumpTruck/TrucksGenericCollection.cs
index e0f3527..4d307db 100644
--- a/Project_DumpTruck/Project_DumpTruck/TrucksGenericCollection.cs
+++ b/Project_DumpTruck/Project_DumpTruck/TrucksGenericCollection.cs
@@ -33,6 +33,10 @@ namespace Project_DumpTruck.Generics
///
private readonly SetGeneric _collection;
///
+ /// Получение объектов коллекции
+ ///
+ public IEnumerable GetCars => _collection.GetTrucks();
+ ///
/// Конструктор
///
///
diff --git a/Project_DumpTruck/Project_DumpTruck/TrucksGenericStorage.cs b/Project_DumpTruck/Project_DumpTruck/TrucksGenericStorage.cs
index e166c46..5873b6f 100644
--- a/Project_DumpTruck/Project_DumpTruck/TrucksGenericStorage.cs
+++ b/Project_DumpTruck/Project_DumpTruck/TrucksGenericStorage.cs
@@ -27,6 +27,18 @@ namespace Project_DumpTruck.Generics
///
private readonly int _pictureHeight;
///
+ /// Разделитель для записи ключа и значения элемента словаря
+ ///
+ private static readonly char _separatorForKeyValue = '|';
+ ///
+ /// Разделитель для записей коллекции данных в файл
+ ///
+ private readonly char _separatorRecords = ';';
+ ///
+ /// Разделитель для записи информации по объекту в файл
+ ///
+ private static readonly char _separatorForObject = ':';
+ ///
/// Конструктор
///
///
@@ -43,7 +55,6 @@ namespace Project_DumpTruck.Generics
/// Название набора
public void AddSet(string name)
{
- // TODO Прописать логику для добавления
_truckStorages.Add(name, new TrucksGenericCollection(_pictureWidth, _pictureHeight));
}
///
@@ -52,7 +63,6 @@ namespace Project_DumpTruck.Generics
/// Название набора
public void DelSet(string name)
{
- // TODO Прописать логику для удаления
if (_truckStorages.ContainsKey(name))
_truckStorages.Remove(name);
}
@@ -72,5 +82,84 @@ namespace Project_DumpTruck.Generics
}
}
+ ///
+ /// Сохранение информации по автомобилям в хранилище в файл
+ ///
+ /// Путь и имя файла
+ /// true - сохранение прошло успешно, false - ошибка при сохранении данных
+ public bool SaveData(string filename)
+ {
+ if (File.Exists(filename))
+ {
+ File.Delete(filename);
+ }
+ StringBuilder data = new();
+ foreach (KeyValuePair> record in _truckStorages)
+ {
+ StringBuilder records = new();
+ foreach (DrawningTruck? elem in record.Value.GetCars)
+ {
+ records.Append($"{elem?.GetDataForSave(_separatorForObject)}{_separatorRecords}");
+ }
+ data.AppendLine($"{record.Key}{_separatorForKeyValue}{records}");
+ }
+ if (data.Length == 0)
+ {
+ return false;
+ }
+ using StreamWriter sw = new(filename);
+ sw.Write($"TruckStorage{Environment.NewLine}{data}");
+ return true;
+ }
+ ///
+ /// Загрузка информации по автомобилям в хранилище из файла
+ ///
+ /// Путь и имя файла
+ /// true - загрузка прошла успешно, false - ошибка при загрузке данных
+ public bool LoadData(string filename)
+ {
+ if (!File.Exists(filename))
+ {
+ return false;
+ }
+ using (StreamReader sr = new(filename))
+ {
+ string str = sr.ReadLine();
+ if (str == null || str.Length == 0)
+ {
+ return false;
+ }
+ if (!str.StartsWith("TruckStorage"))
+ {
+ //если нет такой записи, то это не те данные
+ return false;
+ }
+ _truckStorages.Clear();
+ while ((str = sr.ReadLine()) != null)
+ {
+ string[] record = str.Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries);
+ if (record.Length != 2)
+ {
+ continue;
+ }
+ TrucksGenericCollection collection = new(_pictureWidth, _pictureHeight);
+ string[] set = record[1].Split(_separatorRecords, StringSplitOptions.RemoveEmptyEntries);
+ foreach (string elem in set.Reverse())
+ {
+ DrawningTruck? truck = elem?.CreateDrawningTruck(_separatorForObject, _pictureWidth, _pictureHeight);
+ if (truck != null)
+ {
+ if (collection + truck == -1)
+ {
+ return false;
+ }
+ }
+ }
+ _truckStorages.Add(record[0], collection);
+ }
+ }
+ return true;
+ }
}
}