From b5810b8a71cadf50f6148e395c85e4da32dc7f8c Mon Sep 17 00:00:00 2001
From: Anastasia <Black_Renard.069@mail.ru>
Date: Tue, 15 Nov 2022 11:30:15 +0400
Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D0=B0=D0=BB=D0=B8=D0=B7=D0=B0?=
=?UTF-8?q?=D1=86=D0=B8=D1=8F=20=D1=81=D0=BE=D1=85=D1=80=D0=B0=D0=BD=D0=B5?=
=?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=B8=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83?=
=?UTF-8?q?=D0=B7=D0=BA=D0=B8=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20?=
=?UTF-8?q?=D0=BF=D0=BE=20=D0=B2=D1=81=D0=B5=D0=BC=20=D0=BE=D0=B1=D1=8A?=
=?UTF-8?q?=D0=B5=D0=BA=D1=82=D0=B0=D0=BC.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../DrawingObjectAirplane.cs | 3 +
.../AirplaneWithRadar/ExtentionAirplane.cs | 53 +++++++++++
.../FormMapWithSetAirplanes.Designer.cs | 69 +++++++++++++--
.../FormMapWithSetAirplanes.cs | 40 +++++++++
.../FormMapWithSetAirplanes.resx | 9 ++
.../AirplaneWithRadar/IDrawingObject.cs | 5 ++
.../MapWithSetAirplanesGeneric.cs | 25 ++++++
.../AirplaneWithRadar/MapsCollection.cs | 88 ++++++++++++++++++-
8 files changed, 283 insertions(+), 9 deletions(-)
create mode 100644 AirplaneWithRadar/AirplaneWithRadar/ExtentionAirplane.cs
diff --git a/AirplaneWithRadar/AirplaneWithRadar/DrawingObjectAirplane.cs b/AirplaneWithRadar/AirplaneWithRadar/DrawingObjectAirplane.cs
index fcd2c62..252c1bd 100644
--- a/AirplaneWithRadar/AirplaneWithRadar/DrawingObjectAirplane.cs
+++ b/AirplaneWithRadar/AirplaneWithRadar/DrawingObjectAirplane.cs
@@ -30,5 +30,8 @@ namespace AirplaneWithRadar
{
_airplane.DrawTransport(g);
}
+ public string GetInfo() => _airplane?.GetDataForSave();
+ public static IDrawingObject Create(string data) => new DrawingObjectAirplane(data.CreateDrawingAirplane());
+
}
}
diff --git a/AirplaneWithRadar/AirplaneWithRadar/ExtentionAirplane.cs b/AirplaneWithRadar/AirplaneWithRadar/ExtentionAirplane.cs
new file mode 100644
index 0000000..0125813
--- /dev/null
+++ b/AirplaneWithRadar/AirplaneWithRadar/ExtentionAirplane.cs
@@ -0,0 +1,53 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AirplaneWithRadar
+{
+ /// <summary>
+ /// Расширение для класса DrawningCar
+ /// </summary>
+ internal static class ExtentionAirplane
+ {
+ /// <summary>
+ /// Разделитель для записи информации по объекту в файл
+ /// </summary>
+ private static readonly char _separatorForObject = ':';
+ /// <summary>
+ /// Создание объекта из строки
+ /// </summary>
+ /// <param name="info"></param>
+ /// <returns></returns>
+ public static DrawingAirplane CreateDrawingAirplane(this string info)
+ {
+ string[] strs = info.Split(_separatorForObject);
+ if (strs.Length == 3)
+ {
+ return new DrawingAirplane(Convert.ToInt32(strs[0]),Convert.ToInt32(strs[1]), Color.FromName(strs[2]));
+ }
+ if (strs.Length == 6)
+ {
+ return new DrawingAirplaneWithRadar(Convert.ToInt32(strs[0]), Convert.ToInt32(strs[1]), Color.FromName(strs[2]), Color.FromName(strs[3]), Convert.ToBoolean(strs[4]), Convert.ToBoolean(strs[5]));
+ }
+ return null;
+ }
+ /// <summary>
+ /// Получение данных для сохранения в файл
+ /// </summary>
+ /// <param name="drawingAirplane"></param>
+ /// <returns></returns>
+ public static string GetDataForSave(this DrawingAirplane drawingAirplane)
+ {
+ var airplane = drawingAirplane.Airplane;
+ var str = $"{airplane.Speed}{_separatorForObject}{airplane.Weight}{_separatorForObject}{airplane.BodyColor.Name}";
+ if (airplane is not EntityAirplaneWithRadar airplaneWithRadar)
+ {
+ return str;
+ }
+ return $"{str}{_separatorForObject}{airplaneWithRadar.DopColor.Name}{_separatorForObject}{airplaneWithRadar.Radar}{_separatorForObject}{airplaneWithRadar.ExtraFuelTank}";
+ }
+
+ }
+}
diff --git a/AirplaneWithRadar/AirplaneWithRadar/FormMapWithSetAirplanes.Designer.cs b/AirplaneWithRadar/AirplaneWithRadar/FormMapWithSetAirplanes.Designer.cs
index 49520fa..7cc1fa7 100644
--- a/AirplaneWithRadar/AirplaneWithRadar/FormMapWithSetAirplanes.Designer.cs
+++ b/AirplaneWithRadar/AirplaneWithRadar/FormMapWithSetAirplanes.Designer.cs
@@ -45,9 +45,16 @@
this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox();
this.buttonAddAirplane = new System.Windows.Forms.Button();
this.pictureBox = new System.Windows.Forms.PictureBox();
+ this.menuStrip = new System.Windows.Forms.MenuStrip();
+ this.FileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.SaveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.LoadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
+ this.saveFileDialog = new System.Windows.Forms.SaveFileDialog();
this.groupBox.SuspendLayout();
this.groupBoxMaps.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
+ this.menuStrip.SuspendLayout();
this.SuspendLayout();
//
// groupBox
@@ -63,9 +70,9 @@
this.groupBox.Controls.Add(this.maskedTextBoxPosition);
this.groupBox.Controls.Add(this.buttonAddAirplane);
this.groupBox.Dock = System.Windows.Forms.DockStyle.Right;
- this.groupBox.Location = new System.Drawing.Point(896, 0);
+ this.groupBox.Location = new System.Drawing.Point(901, 33);
this.groupBox.Name = "groupBox";
- this.groupBox.Size = new System.Drawing.Size(257, 754);
+ this.groupBox.Size = new System.Drawing.Size(257, 750);
this.groupBox.TabIndex = 0;
this.groupBox.TabStop = false;
this.groupBox.Text = "Инструменты";
@@ -228,19 +235,62 @@
// pictureBox
//
this.pictureBox.Dock = System.Windows.Forms.DockStyle.Fill;
- this.pictureBox.Location = new System.Drawing.Point(0, 0);
+ this.pictureBox.Location = new System.Drawing.Point(0, 33);
this.pictureBox.Name = "pictureBox";
- this.pictureBox.Size = new System.Drawing.Size(896, 754);
+ this.pictureBox.Size = new System.Drawing.Size(901, 750);
this.pictureBox.TabIndex = 1;
this.pictureBox.TabStop = false;
//
+ // menuStrip
+ //
+ this.menuStrip.ImageScalingSize = new System.Drawing.Size(24, 24);
+ this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.FileToolStripMenuItem});
+ this.menuStrip.Location = new System.Drawing.Point(0, 0);
+ this.menuStrip.Name = "menuStrip";
+ this.menuStrip.Size = new System.Drawing.Size(1158, 33);
+ this.menuStrip.TabIndex = 2;
+ //
+ // FileToolStripMenuItem
+ //
+ this.FileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+ this.SaveToolStripMenuItem,
+ this.LoadToolStripMenuItem});
+ this.FileToolStripMenuItem.Name = "FileToolStripMenuItem";
+ this.FileToolStripMenuItem.Size = new System.Drawing.Size(69, 29);
+ this.FileToolStripMenuItem.Text = "Файл";
+ //
+ // SaveToolStripMenuItem
+ //
+ this.SaveToolStripMenuItem.Name = "SaveToolStripMenuItem";
+ this.SaveToolStripMenuItem.Size = new System.Drawing.Size(200, 34);
+ this.SaveToolStripMenuItem.Text = "Сохранить";
+ this.SaveToolStripMenuItem.Click += new System.EventHandler(this.SaveToolStripMenuItem_Click);
+ //
+ // LoadToolStripMenuItem
+ //
+ this.LoadToolStripMenuItem.Name = "LoadToolStripMenuItem";
+ this.LoadToolStripMenuItem.Size = new System.Drawing.Size(200, 34);
+ this.LoadToolStripMenuItem.Text = "Загрузить";
+ this.LoadToolStripMenuItem.Click += new System.EventHandler(this.LoadToolStripMenuItem_Click);
+ //
+ // openFileDialog
+ //
+ this.openFileDialog.Filter = "txt file | *.txt";
+ //
+ // saveFileDialog
+ //
+ this.saveFileDialog.Filter = "txt file | *.txt";
+ //
// FormMapWithSetAirplanes
//
this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 25F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1153, 754);
+ this.ClientSize = new System.Drawing.Size(1158, 783);
this.Controls.Add(this.pictureBox);
this.Controls.Add(this.groupBox);
+ this.Controls.Add(this.menuStrip);
+ this.MainMenuStrip = this.menuStrip;
this.Name = "FormMapWithSetAirplanes";
this.Text = "FormMapWithSetAirplanes";
this.groupBox.ResumeLayout(false);
@@ -248,7 +298,10 @@
this.groupBoxMaps.ResumeLayout(false);
this.groupBoxMaps.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
+ this.menuStrip.ResumeLayout(false);
+ this.menuStrip.PerformLayout();
this.ResumeLayout(false);
+ this.PerformLayout();
}
@@ -271,5 +324,11 @@
private ListBox listBoxMaps;
private Button buttonAddMap;
private TextBox textBoxNewMapName;
+ private MenuStrip menuStrip;
+ private ToolStripMenuItem FileToolStripMenuItem;
+ private ToolStripMenuItem SaveToolStripMenuItem;
+ private ToolStripMenuItem LoadToolStripMenuItem;
+ private OpenFileDialog openFileDialog;
+ private SaveFileDialog saveFileDialog;
}
}
\ No newline at end of file
diff --git a/AirplaneWithRadar/AirplaneWithRadar/FormMapWithSetAirplanes.cs b/AirplaneWithRadar/AirplaneWithRadar/FormMapWithSetAirplanes.cs
index 33a4229..21ad8a5 100644
--- a/AirplaneWithRadar/AirplaneWithRadar/FormMapWithSetAirplanes.cs
+++ b/AirplaneWithRadar/AirplaneWithRadar/FormMapWithSetAirplanes.cs
@@ -214,5 +214,45 @@ namespace AirplaneWithRadar
}
pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].MoveObject(dir);
}
+ /// <summary>
+ /// Обработка нажатия "Сохранить"
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void SaveToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ if (saveFileDialog.ShowDialog() == DialogResult.OK)
+ {
+ if (_mapsCollection.SaveData(saveFileDialog.FileName))
+ {
+ MessageBox.Show("Сохранение прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+ }
+ else
+ {
+ MessageBox.Show("Не сохранилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ }
+ }
+ }
+ /// <summary>
+ /// Обработка нажатия "Загрузить"
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void LoadToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ if (openFileDialog.ShowDialog() == DialogResult.OK)
+ {
+ if (_mapsCollection.LoadData(openFileDialog.FileName))
+ {
+ MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+ ReloadMaps();
+ }
+ else
+ {
+ MessageBox.Show("Не удалось загрузить", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ }
+ }
+ }
}
}
+
diff --git a/AirplaneWithRadar/AirplaneWithRadar/FormMapWithSetAirplanes.resx b/AirplaneWithRadar/AirplaneWithRadar/FormMapWithSetAirplanes.resx
index f298a7b..0034e6c 100644
--- a/AirplaneWithRadar/AirplaneWithRadar/FormMapWithSetAirplanes.resx
+++ b/AirplaneWithRadar/AirplaneWithRadar/FormMapWithSetAirplanes.resx
@@ -57,4 +57,13 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
+ <metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
+ <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>163, 17</value>
+ </metadata>
+ <metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>357, 17</value>
+ </metadata>
</root>
\ No newline at end of file
diff --git a/AirplaneWithRadar/AirplaneWithRadar/IDrawingObject.cs b/AirplaneWithRadar/AirplaneWithRadar/IDrawingObject.cs
index 0dcd348..35c63ab 100644
--- a/AirplaneWithRadar/AirplaneWithRadar/IDrawingObject.cs
+++ b/AirplaneWithRadar/AirplaneWithRadar/IDrawingObject.cs
@@ -32,5 +32,10 @@
/// </summary>
/// <returns></returns>
(float Left, float Right, float Top, float Bottom) GetCurrentPosition();
+ /// <summary>
+ /// Получение информации по объекту
+ /// </summary>
+ /// <returns></returns>
+ string GetInfo();
}
}
diff --git a/AirplaneWithRadar/AirplaneWithRadar/MapWithSetAirplanesGeneric.cs b/AirplaneWithRadar/AirplaneWithRadar/MapWithSetAirplanesGeneric.cs
index 82e92ae..20d539d 100644
--- a/AirplaneWithRadar/AirplaneWithRadar/MapWithSetAirplanesGeneric.cs
+++ b/AirplaneWithRadar/AirplaneWithRadar/MapWithSetAirplanesGeneric.cs
@@ -114,6 +114,31 @@ namespace AirplaneWithRadar
return new(_pictureWidth, _pictureHeight);
}
/// <summary>
+ /// Получение данных в виде строки
+ /// </summary>
+ /// <param name="sep"></param>
+ /// <returns></returns>
+ public string GetData(char separatorType, char separatorData)
+ {
+ string data = $"{_map.GetType().Name}{separatorType}";
+ foreach (var airplane in _setAirplanes.GetAirplanes())
+ {
+ data += $"{airplane.GetInfo()}{separatorData}";
+ }
+ return data;
+ }
+ /// <summary>
+ /// Загрузка списка из массива строк
+ /// </summary>
+ /// <param name="records"></param>
+ public void LoadData(string[] records)
+ {
+ foreach (var rec in records)
+ {
+ _setAirplanes.Insert(DrawingObjectAirplane.Create(rec) as T);
+ }
+ }
+ /// <summary>
/// "Взбалтываем" набор, чтобы все элементы оказались в начале
/// </summary>
private void Shaking()
diff --git a/AirplaneWithRadar/AirplaneWithRadar/MapsCollection.cs b/AirplaneWithRadar/AirplaneWithRadar/MapsCollection.cs
index 13d0079..91c02a4 100644
--- a/AirplaneWithRadar/AirplaneWithRadar/MapsCollection.cs
+++ b/AirplaneWithRadar/AirplaneWithRadar/MapsCollection.cs
@@ -14,7 +14,7 @@ namespace AirplaneWithRadar
/// <summary>
/// Словарь (хранилище) с картами
/// </summary>
- readonly Dictionary<string, MapWithSetAirplanesGeneric<DrawingObjectAirplane, AbstractMap>> _mapStorages;
+ readonly Dictionary<string, MapWithSetAirplanesGeneric<IDrawingObject, AbstractMap>> _mapStorages;
/// <summary>
/// Возвращение списка названий карт
/// </summary>
@@ -28,13 +28,21 @@ namespace AirplaneWithRadar
/// </summary>
private readonly int _pictureHeight;
/// <summary>
+ /// Разделитель для записи информации по элементу словаря в файл
+ /// </summary>
+ private readonly char separatorDict = '|';
+ /// <summary>
+ /// Разделитель для записей коллекции данных в файл
+ /// </summary>
+ private readonly char separatorData = ';';
+ /// <summary>
/// Конструктор
/// </summary>
/// <param name="pictureWidth"></param>
/// <param name="pictureHeight"></param>
public MapsCollection(int pictureWidth, int pictureHeight)
{
- _mapStorages = new Dictionary<string, MapWithSetAirplanesGeneric<DrawingObjectAirplane, AbstractMap>>();
+ _mapStorages = new Dictionary<string, MapWithSetAirplanesGeneric<IDrawingObject, AbstractMap>>();
_pictureWidth = pictureWidth;
_pictureHeight = pictureHeight;
}
@@ -48,7 +56,7 @@ namespace AirplaneWithRadar
// TODO Прописать логику для добавления
if (!Keys.Contains(name))
{
- _mapStorages.Add(name, new MapWithSetAirplanesGeneric<DrawingObjectAirplane, AbstractMap>(_pictureWidth, _pictureHeight, map));
+ _mapStorages.Add(name, new MapWithSetAirplanesGeneric<IDrawingObject, AbstractMap>(_pictureWidth, _pictureHeight, map));
}
}
/// <summary>
@@ -68,7 +76,7 @@ namespace AirplaneWithRadar
/// </summary>
/// <param name="ind"></param>
/// <returns></returns>
- public MapWithSetAirplanesGeneric<DrawingObjectAirplane, AbstractMap> this[string ind]
+ public MapWithSetAirplanesGeneric<IDrawingObject, AbstractMap> this[string ind]
{
get
{
@@ -80,5 +88,77 @@ namespace AirplaneWithRadar
return null;
}
}
+ /// <summary>
+ /// Метод записи информации в файл
+ /// </summary>
+ /// <param name="text">Строка, которую следует записать</param>
+ /// <param name="stream">Поток для записи</param>
+ private static void WriteToFile(string text, FileStream stream)
+ {
+ byte[] info = new UTF8Encoding(true).GetBytes(text);
+ stream.Write(info, 0, info.Length);
+ }
+ /// <summary>
+ /// Сохранение информации по автомобилям в хранилище в файл
+ /// </summary>
+ /// <param name="filename">Путь и имя файла</param>
+ /// <returns></returns>
+ public bool SaveData(string filename)
+ {
+ if (File.Exists(filename))
+ {
+ File.Delete(filename);
+ }
+ using (StreamWriter sw = new(filename))
+ {
+ sw.Write($"MapsCollection{Environment.NewLine}");
+ foreach (var storage in _mapStorages)
+ {
+ sw.Write($"{storage.Key}{separatorDict}{storage.Value.GetData(separatorDict, separatorData)}{Environment.NewLine}");
+ }
+ }
+ return true;
+ }
+ /// <summary>
+ /// Загрузка нформации по автомобилям на парковках из файла
+ /// </summary>
+ /// <param name="filename"></param>
+ /// <returns></returns>
+ public bool LoadData(string filename)
+ {
+ if (!File.Exists(filename))
+ {
+ return false;
+ }
+ using (StreamReader sr = new(filename))
+ {
+ string strFromFile = "";
+ if ((strFromFile = sr.ReadLine()) == null || !strFromFile.Contains("MapsCollection"))
+ {
+ return false;
+ }
+ _mapStorages.Clear();
+ while ((strFromFile = sr.ReadLine()) != null)
+ {
+ var elem = strFromFile.Split(separatorDict);
+ AbstractMap map = null;
+ switch (elem[1])
+ {
+ case "SimpleMap":
+ map = new SimpleMap();
+ break;
+ case "BlockMap":
+ map = new BlockMap();
+ break;
+ case "LineMap":
+ map = new LineMap();
+ break;
+ }
+ _mapStorages.Add(elem[0], new MapWithSetAirplanesGeneric<IDrawingObject, AbstractMap>(_pictureWidth, _pictureHeight, map));
+ _mapStorages[elem[0]].LoadData(elem[2].Split(separatorData, StringSplitOptions.RemoveEmptyEntries));
+ }
+ }
+ return true;
+ }
}
}