From 5d0339bfdcfa7e5d7d3d25da892b5cd619a330cf Mon Sep 17 00:00:00 2001 From: AnnZhimol Date: Sat, 12 Nov 2022 21:08:31 +0400 Subject: [PATCH 1/2] =?UTF-8?q?6=20=D0=BB=D0=B0=D0=B1=D0=BE=D1=80=D0=B0?= =?UTF-8?q?=D1=82=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE?= =?UTF-8?q?=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Warship/Warship/DrawingObjectWarship.cs | 4 + Warship/Warship/ExtentionCar.cs | 39 +++++++++ .../FormMapWithSetWarships.Designer.cs | 86 ++++++++++++++++--- Warship/Warship/FormMapWithSetWarships.cs | 31 +++++++ Warship/Warship/FormMapWithSetWarships.resx | 9 ++ Warship/Warship/IDrawingObject.cs | 1 + Warship/Warship/MapWithSetWarshipsGeneric.cs | 18 ++++ Warship/Warship/MapsCollection.cs | 72 +++++++++++++++- 8 files changed, 242 insertions(+), 18 deletions(-) create mode 100644 Warship/Warship/ExtentionCar.cs diff --git a/Warship/Warship/DrawingObjectWarship.cs b/Warship/Warship/DrawingObjectWarship.cs index 875e142..f841af0 100644 --- a/Warship/Warship/DrawingObjectWarship.cs +++ b/Warship/Warship/DrawingObjectWarship.cs @@ -35,5 +35,9 @@ namespace Warship { _warship.SetPosition(x,y,width,height); } + + public string GetInfo() => _warship?.GetDataForSave(); + + public static IDrawingObject Create(string data) => new DrawingObjectWarship(data.CreateDrawingWarship()); } } diff --git a/Warship/Warship/ExtentionCar.cs b/Warship/Warship/ExtentionCar.cs new file mode 100644 index 0000000..b3ccd95 --- /dev/null +++ b/Warship/Warship/ExtentionCar.cs @@ -0,0 +1,39 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Warship +{ + internal static class ExtentionCar + { + private static readonly char _separatorForObject = ':'; + + public static DrawingWarship CreateDrawingWarship(this string info) + { + string[] strs = info.Split(_separatorForObject); + + if (strs.Length == 3) + { + return new DrawingWarship(Convert.ToInt32(strs[0]), Convert.ToInt32(strs[1]), Color.FromName(strs[2])); + } + if (strs.Length == 7) + { + return new DrawingAdvancedWarship(Convert.ToInt32(strs[0]), Convert.ToInt32(strs[1]), Color.FromName(strs[2]), Color.FromName(strs[3]), Convert.ToBoolean(strs[4]), Convert.ToBoolean(strs[5]), Convert.ToBoolean(strs[6])); + } + return null; + } + + public static string GetDataForSave(this DrawingWarship drawingWarship) + { + var warship = drawingWarship.Warship; + var str = $"{warship.Speed}{_separatorForObject}{warship.Weight}{_separatorForObject}{warship.BodyColor.Name}"; + if (warship is not EntityAdvancedWarship advancedWarship) + { + return str; + } + return $"{str}{_separatorForObject}{advancedWarship.DopColor.Name}{_separatorForObject}{advancedWarship.Helipad}{_separatorForObject}{advancedWarship.Antenna}{_separatorForObject}{advancedWarship.Missile}"; + } + } +} diff --git a/Warship/Warship/FormMapWithSetWarships.Designer.cs b/Warship/Warship/FormMapWithSetWarships.Designer.cs index 64fe4d0..8eab89f 100644 --- a/Warship/Warship/FormMapWithSetWarships.Designer.cs +++ b/Warship/Warship/FormMapWithSetWarships.Designer.cs @@ -30,6 +30,7 @@ { this.groupBoxTools = new System.Windows.Forms.GroupBox(); this.groupBoxMaps = new System.Windows.Forms.GroupBox(); + this.textBoxMap = new System.Windows.Forms.TextBox(); this.ButtonDeleteMap = new System.Windows.Forms.Button(); this.listBoxMaps = new System.Windows.Forms.ListBox(); this.ButtonAddMap = new System.Windows.Forms.Button(); @@ -44,10 +45,16 @@ this.buttonShowOnMap = new System.Windows.Forms.Button(); this.buttonAddWarship = new System.Windows.Forms.Button(); this.pictureBox = new System.Windows.Forms.PictureBox(); - this.textBoxMap = new System.Windows.Forms.TextBox(); + this.MenuStrip = new System.Windows.Forms.MenuStrip(); + this.файлToolStripMenuItem = 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.groupBoxTools.SuspendLayout(); this.groupBoxMaps.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit(); + this.MenuStrip.SuspendLayout(); this.SuspendLayout(); // // groupBoxTools @@ -63,9 +70,9 @@ this.groupBoxTools.Controls.Add(this.buttonShowOnMap); this.groupBoxTools.Controls.Add(this.buttonAddWarship); this.groupBoxTools.Dock = System.Windows.Forms.DockStyle.Right; - this.groupBoxTools.Location = new System.Drawing.Point(859, 0); + this.groupBoxTools.Location = new System.Drawing.Point(859, 24); this.groupBoxTools.Name = "groupBoxTools"; - this.groupBoxTools.Size = new System.Drawing.Size(204, 652); + this.groupBoxTools.Size = new System.Drawing.Size(204, 628); this.groupBoxTools.TabIndex = 0; this.groupBoxTools.TabStop = false; this.groupBoxTools.Text = "Инструменты"; @@ -84,6 +91,13 @@ this.groupBoxMaps.TabStop = false; this.groupBoxMaps.Text = "Карты"; // + // textBoxMap + // + this.textBoxMap.Location = new System.Drawing.Point(5, 21); + this.textBoxMap.Name = "textBoxMap"; + this.textBoxMap.Size = new System.Drawing.Size(175, 23); + this.textBoxMap.TabIndex = 12; + // // ButtonDeleteMap // this.ButtonDeleteMap.Location = new System.Drawing.Point(12, 223); @@ -160,7 +174,7 @@ this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonDown.BackgroundImage = global::Warship.Properties.Resources.arrowDown; this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonDown.Location = new System.Drawing.Point(91, 602); + this.buttonDown.Location = new System.Drawing.Point(91, 578); this.buttonDown.Name = "buttonDown"; this.buttonDown.Size = new System.Drawing.Size(30, 30); this.buttonDown.TabIndex = 10; @@ -172,7 +186,7 @@ this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonRight.BackgroundImage = global::Warship.Properties.Resources.arrowRight; this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonRight.Location = new System.Drawing.Point(127, 602); + this.buttonRight.Location = new System.Drawing.Point(127, 578); this.buttonRight.Name = "buttonRight"; this.buttonRight.Size = new System.Drawing.Size(30, 30); this.buttonRight.TabIndex = 9; @@ -184,7 +198,7 @@ this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonLeft.BackgroundImage = global::Warship.Properties.Resources.arrowLeft; this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonLeft.Location = new System.Drawing.Point(55, 602); + this.buttonLeft.Location = new System.Drawing.Point(55, 578); this.buttonLeft.Name = "buttonLeft"; this.buttonLeft.Size = new System.Drawing.Size(30, 30); this.buttonLeft.TabIndex = 8; @@ -196,7 +210,7 @@ this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.buttonUp.BackgroundImage = global::Warship.Properties.Resources.arrowUp; this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.buttonUp.Location = new System.Drawing.Point(91, 566); + this.buttonUp.Location = new System.Drawing.Point(91, 542); this.buttonUp.Name = "buttonUp"; this.buttonUp.Size = new System.Drawing.Size(30, 30); this.buttonUp.TabIndex = 7; @@ -226,18 +240,51 @@ // 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, 24); this.pictureBox.Name = "pictureBox"; - this.pictureBox.Size = new System.Drawing.Size(859, 652); + this.pictureBox.Size = new System.Drawing.Size(859, 628); this.pictureBox.TabIndex = 1; this.pictureBox.TabStop = false; // - // textBoxMap + // MenuStrip // - this.textBoxMap.Location = new System.Drawing.Point(5, 21); - this.textBoxMap.Name = "textBoxMap"; - this.textBoxMap.Size = new System.Drawing.Size(175, 23); - this.textBoxMap.TabIndex = 12; + this.MenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.файлToolStripMenuItem}); + this.MenuStrip.Location = new System.Drawing.Point(0, 0); + this.MenuStrip.Name = "MenuStrip"; + this.MenuStrip.Size = new System.Drawing.Size(1063, 24); + this.MenuStrip.TabIndex = 2; + // + // файлToolStripMenuItem + // + this.файлToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.SaveToolStripMenuItem, + this.LoadToolStripMenuItem}); + this.файлToolStripMenuItem.Name = "файлToolStripMenuItem"; + this.файлToolStripMenuItem.Size = new System.Drawing.Size(48, 20); + this.файлToolStripMenuItem.Text = "Файл"; + // + // SaveToolStripMenuItem + // + this.SaveToolStripMenuItem.Name = "SaveToolStripMenuItem"; + this.SaveToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.SaveToolStripMenuItem.Text = "Сохранение"; + this.SaveToolStripMenuItem.Click += new System.EventHandler(this.SaveToolStripMenuItem_Click); + // + // LoadToolStripMenuItem + // + this.LoadToolStripMenuItem.Name = "LoadToolStripMenuItem"; + this.LoadToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + 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"; // // FormMapWithSetWarships // @@ -246,6 +293,8 @@ this.ClientSize = new System.Drawing.Size(1063, 652); this.Controls.Add(this.pictureBox); this.Controls.Add(this.groupBoxTools); + this.Controls.Add(this.MenuStrip); + this.MainMenuStrip = this.MenuStrip; this.Name = "FormMapWithSetWarships"; this.Text = "Карта с набором объектов"; this.groupBoxTools.ResumeLayout(false); @@ -253,7 +302,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(); } @@ -276,5 +328,11 @@ private ListBox listBoxMaps; private Button ButtonAddMap; private TextBox textBoxMap; + private MenuStrip MenuStrip; + private ToolStripMenuItem файлToolStripMenuItem; + private ToolStripMenuItem SaveToolStripMenuItem; + private ToolStripMenuItem LoadToolStripMenuItem; + private OpenFileDialog OpenFileDialog; + private SaveFileDialog SaveFileDialog; } } \ No newline at end of file diff --git a/Warship/Warship/FormMapWithSetWarships.cs b/Warship/Warship/FormMapWithSetWarships.cs index 3e56eef..e3eb974 100644 --- a/Warship/Warship/FormMapWithSetWarships.cs +++ b/Warship/Warship/FormMapWithSetWarships.cs @@ -178,5 +178,36 @@ namespace Warship ReloadMaps(); } } + + 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); + } + } + } + + private void LoadToolStripMenuItem_Click(object sender, EventArgs e) + { + if (OpenFileDialog.ShowDialog() == DialogResult.OK) + { + if (_mapsCollection.LoadData(OpenFileDialog.FileName)) + { + ReloadMaps(); + MessageBox.Show("Загрузка прошла успешно!", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + else + { + MessageBox.Show("Не загрузилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } } } diff --git a/Warship/Warship/FormMapWithSetWarships.resx b/Warship/Warship/FormMapWithSetWarships.resx index f298a7b..ef5b21a 100644 --- a/Warship/Warship/FormMapWithSetWarships.resx +++ b/Warship/Warship/FormMapWithSetWarships.resx @@ -57,4 +57,13 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + + + 125, 17 + + + 265, 17 + \ No newline at end of file diff --git a/Warship/Warship/IDrawingObject.cs b/Warship/Warship/IDrawingObject.cs index 3aa306a..00feb14 100644 --- a/Warship/Warship/IDrawingObject.cs +++ b/Warship/Warship/IDrawingObject.cs @@ -13,5 +13,6 @@ namespace Warship void MoveObject(Direction direction); void DrawingObject(Graphics g); (float Left, float Right, float Top, float Bottom) GetCurrentPosition(); + string GetInfo(); } } diff --git a/Warship/Warship/MapWithSetWarshipsGeneric.cs b/Warship/Warship/MapWithSetWarshipsGeneric.cs index a93adf2..df158ca 100644 --- a/Warship/Warship/MapWithSetWarshipsGeneric.cs +++ b/Warship/Warship/MapWithSetWarshipsGeneric.cs @@ -65,6 +65,24 @@ namespace Warship return new(_pictureWidth, _pictureHeight); } + public string GetData(char separatorType, char separatorData) + { + string data = $"{_map.GetType().Name}{separatorType}"; + foreach (var warship in _setWarship.GetWarships()) + { + data += $"{warship.GetInfo()}{separatorData}"; + } + return data; + } + + public void LoadData(string[] records) + { + foreach (var rec in records) + { + _setWarship.Insert(DrawingObjectWarship.Create(rec) as T); + } + } + public void Shaking() { int j = _setWarship.Count - 1; diff --git a/Warship/Warship/MapsCollection.cs b/Warship/Warship/MapsCollection.cs index ca45d99..80740c5 100644 --- a/Warship/Warship/MapsCollection.cs +++ b/Warship/Warship/MapsCollection.cs @@ -9,20 +9,86 @@ namespace Warship { internal class MapsCollection { - readonly Dictionary> _mapStorages; + readonly Dictionary> _mapStorages; public List Keys => _mapStorages.Keys.ToList(); private readonly int _pictureWidth; private readonly int _pictureHeight; + private readonly char separatorDict = '|'; + private readonly char separatorData = ';'; public MapsCollection(int pictureWidth, int pictureHeight) { - _mapStorages = new Dictionary>(); + _mapStorages = new Dictionary>(); _pictureWidth = pictureWidth; _pictureHeight = pictureHeight; } + private static void WriteToFile(string text,FileStream stream) + { + byte[] info = new UTF8Encoding(true).GetBytes(text); + stream.Write(info, 0, info.Length); + } + + public bool SaveData(string filename) + { + if (File.Exists(filename)) + { + File.Delete(filename); + } + using (FileStream fs = new(filename, FileMode.Create)) + { + WriteToFile($"MapsCollection{Environment.NewLine}", fs); + foreach (var storage in _mapStorages) + { + WriteToFile($"{storage.Key}{separatorDict}{storage.Value.GetData(separatorDict, separatorData)}{Environment.NewLine}", fs); + } + } + return true; + } + + public bool LoadData(string filename) + { + if (!File.Exists(filename)) + { + return false; + } + string bufferTextFromFile = ""; + using (FileStream fs = new(filename, FileMode.Open)) + { + byte[] b = new byte[fs.Length]; + UTF8Encoding temp = new(true); + while (fs.Read(b, 0, b.Length) > 0) + { + bufferTextFromFile += temp.GetString(b); + } + } + var strs = bufferTextFromFile.Split(new char[] { '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries); + if (!strs[0].Contains("MapCollection")) + { + return false; + } + _mapStorages.Clear(); + for(int i = 1; i < strs.Length; ++i) + { + var elem = strs[i].Split(separatorDict); + AbstractMap map = null; + switch (elem[1]) + { + case "SimpleMap": + map = new SimpleMap(); + break; + case "SecondMap": + map = new SecondMap(); + break; + } + _mapStorages.Add(elem[0], new MapWithSetWarshipsGeneric(_pictureWidth, _pictureHeight, map)); + _mapStorages[elem[0]].LoadData(elem[2].Split(separatorData, StringSplitOptions.RemoveEmptyEntries)); + } + return true; + } + public void AddMap(string name, AbstractMap map) { if (_mapStorages.ContainsKey(name)) @@ -38,9 +104,7 @@ namespace Warship public void DelMap(string name) { - _mapStorages.Remove(name); - } public MapWithSetWarshipsGeneric this[string ind] -- 2.25.1 From a17a1a9f2b74dd2e187847ac2d9012e44bf6b6f2 Mon Sep 17 00:00:00 2001 From: AnnZhimol Date: Sat, 12 Nov 2022 21:35:23 +0400 Subject: [PATCH 2/2] =?UTF-8?q?6=20=D0=BB=D0=B0=D0=B1=D0=B0=20=D0=B8=D1=82?= =?UTF-8?q?=D0=BE=D0=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FileWithSave.txt | 5 ++ Warship/Warship/FormMapWithSetWarships.cs | 2 +- Warship/Warship/MapsCollection.cs | 61 +++++++++-------------- 3 files changed, 30 insertions(+), 38 deletions(-) create mode 100644 FileWithSave.txt diff --git a/FileWithSave.txt b/FileWithSave.txt new file mode 100644 index 0000000..0c324cd --- /dev/null +++ b/FileWithSave.txt @@ -0,0 +1,5 @@ +MapsCollection +were|SimpleMap|100:100:Lime; +ert4rg|SimpleMap|100:100:Red;100:100:Fuchsia:Yellow:True:True:True; +32e32|SecondMap|100:100:Lime:Fuchsia:True:True:False;100:100:Cyan:Cyan:False:False:True;100:100:Red:Yellow:True:True:True; +fdgwdf|SecondMap| diff --git a/Warship/Warship/FormMapWithSetWarships.cs b/Warship/Warship/FormMapWithSetWarships.cs index e3eb974..4a5a575 100644 --- a/Warship/Warship/FormMapWithSetWarships.cs +++ b/Warship/Warship/FormMapWithSetWarships.cs @@ -200,8 +200,8 @@ namespace Warship { if (_mapsCollection.LoadData(OpenFileDialog.FileName)) { - ReloadMaps(); MessageBox.Show("Загрузка прошла успешно!", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information); + ReloadMaps(); } else { diff --git a/Warship/Warship/MapsCollection.cs b/Warship/Warship/MapsCollection.cs index 80740c5..b129965 100644 --- a/Warship/Warship/MapsCollection.cs +++ b/Warship/Warship/MapsCollection.cs @@ -25,24 +25,18 @@ namespace Warship _pictureHeight = pictureHeight; } - private static void WriteToFile(string text,FileStream stream) - { - byte[] info = new UTF8Encoding(true).GetBytes(text); - stream.Write(info, 0, info.Length); - } - public bool SaveData(string filename) { if (File.Exists(filename)) { File.Delete(filename); } - using (FileStream fs = new(filename, FileMode.Create)) + using (StreamWriter sw = new(filename)) { - WriteToFile($"MapsCollection{Environment.NewLine}", fs); + sw.Write($"MapsCollection{Environment.NewLine}"); foreach (var storage in _mapStorages) { - WriteToFile($"{storage.Key}{separatorDict}{storage.Value.GetData(separatorDict, separatorData)}{Environment.NewLine}", fs); + sw.Write($"{storage.Key}{separatorDict}{storage.Value.GetData(separatorDict, separatorData)}{Environment.NewLine}"); } } return true; @@ -54,37 +48,30 @@ namespace Warship { return false; } - string bufferTextFromFile = ""; - using (FileStream fs = new(filename, FileMode.Open)) + using (StreamReader sr = new(filename)) { - byte[] b = new byte[fs.Length]; - UTF8Encoding temp = new(true); - while (fs.Read(b, 0, b.Length) > 0) + string str = ""; + if ((str = sr.ReadLine()) == null || !str.Contains("MapsCollection")) { - bufferTextFromFile += temp.GetString(b); + return false; } - } - var strs = bufferTextFromFile.Split(new char[] { '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries); - if (!strs[0].Contains("MapCollection")) - { - return false; - } - _mapStorages.Clear(); - for(int i = 1; i < strs.Length; ++i) - { - var elem = strs[i].Split(separatorDict); - AbstractMap map = null; - switch (elem[1]) + _mapStorages.Clear(); + while ((str = sr.ReadLine()) != null) { - case "SimpleMap": - map = new SimpleMap(); - break; - case "SecondMap": - map = new SecondMap(); - break; + var elem = str.Split(separatorDict); + AbstractMap map = null; + switch (elem[1]) + { + case "SimpleMap": + map = new SimpleMap(); + break; + case "SecondMap": + map = new SecondMap(); + break; + } + _mapStorages.Add(elem[0], new MapWithSetWarshipsGeneric(_pictureWidth, _pictureHeight, map)); + _mapStorages[elem[0]].LoadData(elem[2].Split(separatorData, StringSplitOptions.RemoveEmptyEntries)); } - _mapStorages.Add(elem[0], new MapWithSetWarshipsGeneric(_pictureWidth, _pictureHeight, map)); - _mapStorages[elem[0]].LoadData(elem[2].Split(separatorData, StringSplitOptions.RemoveEmptyEntries)); } return true; } @@ -98,7 +85,7 @@ namespace Warship } else { - _mapStorages.Add(name, new MapWithSetWarshipsGeneric(_pictureWidth, _pictureHeight, map)); + _mapStorages.Add(name, new MapWithSetWarshipsGeneric(_pictureWidth, _pictureHeight, map)); } } @@ -107,7 +94,7 @@ namespace Warship _mapStorages.Remove(name); } - public MapWithSetWarshipsGeneric this[string ind] + public MapWithSetWarshipsGeneric this[string ind] { get { -- 2.25.1