не работает добавление

WarmlyShip/WarmlyShip/FormMapWithSetShip.Designer.cs

@@ -29,6 +29,12 @@
 		private void InitializeComponent()
 		{
 			this.groupBox1 = new System.Windows.Forms.GroupBox();
+			this.groupBoxMaps = new System.Windows.Forms.GroupBox();
+			this.buttonDeleteMap = new System.Windows.Forms.Button();
+			this.listBoxMaps = new System.Windows.Forms.ListBox();
+			this.buttonAddMap = new System.Windows.Forms.Button();
+			this.textBoxNewMapName = new System.Windows.Forms.TextBox();
+			this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
 			this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox();
 			this.buttonDown = new System.Windows.Forms.Button();
 			this.buttonLeft = new System.Windows.Forms.Button();
@@ -38,14 +44,15 @@
 			this.buttonShowStorage = new System.Windows.Forms.Button();
 			this.buttonRemoveShip = new System.Windows.Forms.Button();
 			this.buttonAddShip = new System.Windows.Forms.Button();
-			this.comboBoxSelectorMap = new System.Windows.Forms.ComboBox();
 			this.pictureBox = new System.Windows.Forms.PictureBox();
 			this.groupBox1.SuspendLayout();
+			this.groupBoxMaps.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
 			this.SuspendLayout();
 			// 
 			// groupBox1
 			// 
+			this.groupBox1.Controls.Add(this.groupBoxMaps);
 			this.groupBox1.Controls.Add(this.maskedTextBoxPosition);
 			this.groupBox1.Controls.Add(this.buttonDown);
 			this.groupBox1.Controls.Add(this.buttonLeft);
@@ -55,18 +62,81 @@
 			this.groupBox1.Controls.Add(this.buttonShowStorage);
 			this.groupBox1.Controls.Add(this.buttonRemoveShip);
 			this.groupBox1.Controls.Add(this.buttonAddShip);
-			this.groupBox1.Controls.Add(this.comboBoxSelectorMap);
 			this.groupBox1.Dock = System.Windows.Forms.DockStyle.Right;
-			this.groupBox1.Location = new System.Drawing.Point(600, 0);
+			this.groupBox1.Location = new System.Drawing.Point(815, 0);
 			this.groupBox1.Name = "groupBox1";
-			this.groupBox1.Size = new System.Drawing.Size(200, 450);
+			this.groupBox1.Size = new System.Drawing.Size(200, 648);
 			this.groupBox1.TabIndex = 0;
 			this.groupBox1.TabStop = false;
 			this.groupBox1.Text = "Инструменты";
 			// 
+			// groupBoxMaps
+			// 
+			this.groupBoxMaps.Controls.Add(this.buttonDeleteMap);
+			this.groupBoxMaps.Controls.Add(this.listBoxMaps);
+			this.groupBoxMaps.Controls.Add(this.buttonAddMap);
+			this.groupBoxMaps.Controls.Add(this.textBoxNewMapName);
+			this.groupBoxMaps.Controls.Add(this.comboBoxSelectorMap);
+			this.groupBoxMaps.Location = new System.Drawing.Point(6, 22);
+			this.groupBoxMaps.Name = "groupBoxMaps";
+			this.groupBoxMaps.Size = new System.Drawing.Size(188, 244);
+			this.groupBoxMaps.TabIndex = 12;
+			this.groupBoxMaps.TabStop = false;
+			this.groupBoxMaps.Text = "Карта";
+			// 
+			// buttonDeleteMap
+			// 
+			this.buttonDeleteMap.Location = new System.Drawing.Point(6, 209);
+			this.buttonDeleteMap.Name = "buttonDeleteMap";
+			this.buttonDeleteMap.Size = new System.Drawing.Size(176, 23);
+			this.buttonDeleteMap.TabIndex = 3;
+			this.buttonDeleteMap.Text = "Удалить карту";
+			this.buttonDeleteMap.UseVisualStyleBackColor = true;
+			this.buttonDeleteMap.Click += new System.EventHandler(this.ButtonDeleteMap_Click);
+			// 
+			// listBoxMaps
+			// 
+			this.listBoxMaps.FormattingEnabled = true;
+			this.listBoxMaps.ItemHeight = 15;
+			this.listBoxMaps.Location = new System.Drawing.Point(6, 109);
+			this.listBoxMaps.Name = "listBoxMaps";
+			this.listBoxMaps.Size = new System.Drawing.Size(176, 94);
+			this.listBoxMaps.TabIndex = 2;
+			this.listBoxMaps.SelectedIndexChanged += new System.EventHandler(this.ListBoxMaps_SelectedIndexChanged);
+			// 
+			// buttonAddMap
+			// 
+			this.buttonAddMap.Location = new System.Drawing.Point(6, 80);
+			this.buttonAddMap.Name = "buttonAddMap";
+			this.buttonAddMap.Size = new System.Drawing.Size(176, 23);
+			this.buttonAddMap.TabIndex = 1;
+			this.buttonAddMap.Text = "Добавить карту";
+			this.buttonAddMap.UseVisualStyleBackColor = true;
+			this.buttonAddMap.Click += new System.EventHandler(this.ButtonAddMap_Click);
+			// 
+			// textBoxNewMapName
+			// 
+			this.textBoxNewMapName.Location = new System.Drawing.Point(6, 22);
+			this.textBoxNewMapName.Name = "textBoxNewMapName";
+			this.textBoxNewMapName.Size = new System.Drawing.Size(176, 23);
+			this.textBoxNewMapName.TabIndex = 0;
+			// 
+			// comboBoxSelectorMap
+			// 
+			this.comboBoxSelectorMap.FormattingEnabled = true;
+			this.comboBoxSelectorMap.Items.AddRange(new object[] {
+            "Простая карта",
+            "Вторая карта",
+            "Последняя карта"});
+			this.comboBoxSelectorMap.Location = new System.Drawing.Point(6, 51);
+			this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
+			this.comboBoxSelectorMap.Size = new System.Drawing.Size(176, 23);
+			this.comboBoxSelectorMap.TabIndex = 0;
+			//this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged);
+			// 
 			// maskedTextBoxPosition
 			// 
-			this.maskedTextBoxPosition.Location = new System.Drawing.Point(6, 116);
+			this.maskedTextBoxPosition.Location = new System.Drawing.Point(6, 345);
 			this.maskedTextBoxPosition.Mask = "00";
 			this.maskedTextBoxPosition.Name = "maskedTextBoxPosition";
 			this.maskedTextBoxPosition.Size = new System.Drawing.Size(188, 23);
@@ -77,7 +147,7 @@
 			this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
 			this.buttonDown.BackgroundImage = global::WarmlyShip.Properties.Resources.todown;
 			this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-			this.buttonDown.Location = new System.Drawing.Point(75, 391);
+			this.buttonDown.Location = new System.Drawing.Point(75, 589);
 			this.buttonDown.Name = "buttonDown";
 			this.buttonDown.Size = new System.Drawing.Size(50, 50);
 			this.buttonDown.TabIndex = 10;
@@ -89,7 +159,7 @@
 			this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
 			this.buttonLeft.BackgroundImage = global::WarmlyShip.Properties.Resources.toleft;
 			this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-			this.buttonLeft.Location = new System.Drawing.Point(19, 391);
+			this.buttonLeft.Location = new System.Drawing.Point(19, 589);
 			this.buttonLeft.Name = "buttonLeft";
 			this.buttonLeft.Size = new System.Drawing.Size(50, 50);
 			this.buttonLeft.TabIndex = 9;
@@ -101,7 +171,7 @@
 			this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
 			this.buttonUp.BackgroundImage = global::WarmlyShip.Properties.Resources.totop;
 			this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-			this.buttonUp.Location = new System.Drawing.Point(75, 335);
+			this.buttonUp.Location = new System.Drawing.Point(75, 533);
 			this.buttonUp.Name = "buttonUp";
 			this.buttonUp.Size = new System.Drawing.Size(50, 50);
 			this.buttonUp.TabIndex = 8;
@@ -113,7 +183,7 @@
 			this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
 			this.buttonRight.BackgroundImage = global::WarmlyShip.Properties.Resources.toright;
 			this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-			this.buttonRight.Location = new System.Drawing.Point(131, 391);
+			this.buttonRight.Location = new System.Drawing.Point(131, 589);
 			this.buttonRight.Name = "buttonRight";
 			this.buttonRight.Size = new System.Drawing.Size(50, 50);
 			this.buttonRight.TabIndex = 7;
@@ -122,7 +192,7 @@
 			// 
 			// buttonShowOnMap
 			// 
-			this.buttonShowOnMap.Location = new System.Drawing.Point(6, 281);
+			this.buttonShowOnMap.Location = new System.Drawing.Point(6, 432);
 			this.buttonShowOnMap.Name = "buttonShowOnMap";
 			this.buttonShowOnMap.Size = new System.Drawing.Size(188, 23);
 			this.buttonShowOnMap.TabIndex = 5;
@@ -132,7 +202,7 @@
 			// 
 			// buttonShowStorage
 			// 
-			this.buttonShowStorage.Location = new System.Drawing.Point(6, 226);
+			this.buttonShowStorage.Location = new System.Drawing.Point(6, 403);
 			this.buttonShowStorage.Name = "buttonShowStorage";
 			this.buttonShowStorage.Size = new System.Drawing.Size(188, 23);
 			this.buttonShowStorage.TabIndex = 4;
@@ -142,7 +212,7 @@
 			// 
 			// buttonRemoveShip
 			// 
-			this.buttonRemoveShip.Location = new System.Drawing.Point(6, 170);
+			this.buttonRemoveShip.Location = new System.Drawing.Point(6, 374);
 			this.buttonRemoveShip.Name = "buttonRemoveShip";
 			this.buttonRemoveShip.Size = new System.Drawing.Size(188, 23);
 			this.buttonRemoveShip.TabIndex = 3;
@@ -152,7 +222,7 @@
 			// 
 			// buttonAddShip
 			// 
-			this.buttonAddShip.Location = new System.Drawing.Point(6, 65);
+			this.buttonAddShip.Location = new System.Drawing.Point(6, 316);
 			this.buttonAddShip.Name = "buttonAddShip";
 			this.buttonAddShip.Size = new System.Drawing.Size(188, 23);
 			this.buttonAddShip.TabIndex = 1;
@@ -160,25 +230,12 @@
 			this.buttonAddShip.UseVisualStyleBackColor = true;
 			this.buttonAddShip.Click += new System.EventHandler(this.ButtonAddShip_Click);
 			// 
-			// comboBoxSelectorMap
-			// 
-			this.comboBoxSelectorMap.FormattingEnabled = true;
-			this.comboBoxSelectorMap.Items.AddRange(new object[] {
-            "Простая карта",
-            "Вторая карта",
-            "Последняя карта"});
-			this.comboBoxSelectorMap.Location = new System.Drawing.Point(6, 22);
-			this.comboBoxSelectorMap.Name = "comboBoxSelectorMap";
-			this.comboBoxSelectorMap.Size = new System.Drawing.Size(188, 23);
-			this.comboBoxSelectorMap.TabIndex = 0;
-			this.comboBoxSelectorMap.SelectedIndexChanged += new System.EventHandler(this.ComboBoxSelectorMap_SelectedIndexChanged);
-			// 
 			// pictureBox
 			// 
 			this.pictureBox.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.pictureBox.Location = new System.Drawing.Point(0, 0);
 			this.pictureBox.Name = "pictureBox";
-			this.pictureBox.Size = new System.Drawing.Size(600, 450);
+			this.pictureBox.Size = new System.Drawing.Size(815, 648);
 			this.pictureBox.TabIndex = 1;
 			this.pictureBox.TabStop = false;
 			// 
@@ -186,13 +243,15 @@
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(800, 450);
+			this.ClientSize = new System.Drawing.Size(1015, 648);
 			this.Controls.Add(this.pictureBox);
 			this.Controls.Add(this.groupBox1);
 			this.Name = "FormMapWithSetShip";
 			this.Text = "FormMapWithSetShip";
 			this.groupBox1.ResumeLayout(false);
 			this.groupBox1.PerformLayout();
+			this.groupBoxMaps.ResumeLayout(false);
+			this.groupBoxMaps.PerformLayout();
 			((System.ComponentModel.ISupportInitialize)(this.pictureBox)).EndInit();
 			this.ResumeLayout(false);
 
@@ -212,5 +271,10 @@
 		private Button buttonUp;
 		private Button buttonRight;
 		private MaskedTextBox maskedTextBoxPosition;
+		private GroupBox groupBoxMaps;
+		private Button buttonDeleteMap;
+		private ListBox listBoxMaps;
+		private Button buttonAddMap;
+		private TextBox textBoxNewMapName;
 	}
 }

WarmlyShip/WarmlyShip/FormMapWithSetShip.cs

@@ -8,46 +8,88 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using WarmlyShip;
+using static System.Windows.Forms.DataFormats;
 
 namespace WarmlyShip
 {
 	public partial class FormMapWithSetShip : Form
 	{
-		private MapWithSetShipGeneric<DrawningObjectShip, AbstractMap> _mapShipCollectionGeneric;
+		private readonly Dictionary<string, AbstractMap> _mapsDict = new()
-		public bool ShipOnMap = false;
+		{
+			{ "Простая карта", new SimpleMap() },
+			{ "Вторая карта", new SecondMap() },
+			{ "Последняя карта", new LastMap() }
+		};
+
+		private readonly MapsCollection _mapsCollection;
 
 		public FormMapWithSetShip()
 		{
 			InitializeComponent();
+			_mapsCollection = new MapsCollection(pictureBox.Width, pictureBox.Height);
+			comboBoxSelectorMap.Items.Clear();
+			foreach (var elem in _mapsDict)
+			{
+				comboBoxSelectorMap.Items.Add(elem.Key);
+			}
 		}
 
-		private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
+		private void ReloadMaps()
 		{
-			AbstractMap map = null;
+			int index = listBoxMaps.SelectedIndex;
-			switch (comboBoxSelectorMap.Text)
+			listBoxMaps.Items.Clear();
+			for (int i = 0; i < _mapsCollection.Keys.Count; i++)
 			{
-				case "Простая карта":
+				listBoxMaps.Items.Add(_mapsCollection.Keys[i]);
-					map = new SimpleMap();
-					break;
-				case "Вторая карта":
-					map = new SecondMap();
-					break;
-				case "Последняя карта":
-					map = new LastMap();
-					break;
 			}
-			if (map != null)
+			if (listBoxMaps.Items.Count > 0 && (index == -1 || index >= listBoxMaps.Items.Count))
 			{
-				_mapShipCollectionGeneric = new MapWithSetShipGeneric<DrawningObjectShip, AbstractMap>(pictureBox.Width, pictureBox.Height, map);
+				listBoxMaps.SelectedIndex = 0;
 			}
-			else
+			else if (listBoxMaps.Items.Count > 0 && index > -1 && index < listBoxMaps.Items.Count)
 			{
-				_mapShipCollectionGeneric = null;
+				listBoxMaps.SelectedIndex = index;
 			}
 		}
+
+		private void ButtonAddMap_Click(object sender, EventArgs e)
+		{
+			if (comboBoxSelectorMap.SelectedIndex == -1 || string.IsNullOrEmpty(textBoxNewMapName.Text))
+			{
+				MessageBox.Show("Не все данные заполнены", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				return;
+			}
+			if (!_mapsDict.ContainsKey(comboBoxSelectorMap.Text))
+			{
+				MessageBox.Show("Нет такой карты", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				return;
+			}
+			_mapsCollection.AddMap(textBoxNewMapName.Text, _mapsDict[comboBoxSelectorMap.Text]);
+			ReloadMaps();
+		}
+
+		private void ListBoxMaps_SelectedIndexChanged(object sender, EventArgs e)
+		{
+			pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
+		}
+
+		private void ButtonDeleteMap_Click(object sender, EventArgs e)
+		{
+			if (listBoxMaps.SelectedIndex == -1)
+			{
+				return;
+			}
+			if (MessageBox.Show($"Удалить карту {listBoxMaps.SelectedItem}?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+			{
+				_mapsCollection.DelMap(listBoxMaps.SelectedItem?.ToString() ??
+			   string.Empty);
+				ReloadMaps();
+			}
+		}
+
 		private void ButtonAddShip_Click(object sender, EventArgs e)
 		{
-			if (_mapShipCollectionGeneric == null)
+			if (listBoxMaps.SelectedIndex == -1)
 			{
 				return;
 			}
@@ -55,10 +97,10 @@ namespace WarmlyShip
 			if (form.ShowDialog() == DialogResult.OK)
 			{
 				DrawningObjectShip ship = new(form.SelectedShip);
-				if (_mapShipCollectionGeneric + ship == 1)
+				if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + ship == 1)
 				{
 					MessageBox.Show("Объект добавлен");
-					pictureBox.Image = _mapShipCollectionGeneric.ShowSet();
+					pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
 				}
 				else
 				{
@@ -69,6 +111,10 @@ namespace WarmlyShip
 
 		private void ButtonRemoveShip_Click(object sender, EventArgs e)
 		{
+			if (listBoxMaps.SelectedIndex == -1)
+			{
+				return;
+			}
 			if (string.IsNullOrEmpty(maskedTextBoxPosition.Text))
 			{
 				return;
@@ -78,10 +124,11 @@ namespace WarmlyShip
 				return;
 			}
 			int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
-			if (_mapShipCollectionGeneric - pos == 1)
+			if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] - pos == 1)
 			{
 				MessageBox.Show("Объект удален");
-				pictureBox.Image = _mapShipCollectionGeneric.ShowSet();
+				pictureBox.Image =
+			   _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
 			}
 			else
 			{
@@ -91,27 +138,25 @@ namespace WarmlyShip
 
 		private void ButtonShowStorage_Click(object sender, EventArgs e)
 		{
-			if (_mapShipCollectionGeneric == null)
+			if (listBoxMaps.SelectedIndex == -1)
 			{
 				return;
 			}
-			pictureBox.Image = _mapShipCollectionGeneric.ShowSet();
+			pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
-			ShipOnMap = false;
 		}
 
 		private void ButtonShowOnMap_Click(object sender, EventArgs e)
 		{
-			if (_mapShipCollectionGeneric == null)
+			if (listBoxMaps.SelectedIndex == -1)
 			{
 				return;
 			}
-			pictureBox.Image = _mapShipCollectionGeneric.ShowOnMap();
+			pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowOnMap();
-			ShipOnMap = true;
 		}
 
 		private void ButtonMove_Click(object sender, EventArgs e)
 		{
-			if (_mapShipCollectionGeneric == null || !ShipOnMap)
+			if (listBoxMaps.SelectedIndex == -1)
 			{
 				return;
 			}
@@ -133,7 +178,7 @@ namespace WarmlyShip
 					dir = Direction.Right;
 					break;
 			}
-			pictureBox.Image = _mapShipCollectionGeneric.MoveObject(dir);
+			pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].MoveObject(dir);
 		}
 	}
 }

WarmlyShip/WarmlyShip/MapsCollection.cs

@@ -26,10 +26,13 @@ namespace WarmlyShip
 
 		public void AddMap(string name, AbstractMap map)
 		{
+			if (_mapStorages.ContainsKey(name)) return;
 			_mapStorages.Add(name, new MapWithSetShipGeneric<DrawningObjectShip, AbstractMap>(_pictureWidth, _pictureHeight, map));
 		}
+
 		public void DelMap(string name)
 		{
+			if (_mapStorages.ContainsKey(name)) return;
 			_mapStorages.Remove(name);
 		}
 
@@ -37,10 +40,7 @@ namespace WarmlyShip
 		{
 			get
 			{
-				foreach (var map in _mapStorages)
+				if(_mapStorages.ContainsKey(ind)) return _mapStorages[ind];
-				{
-					if(map.Key == ind) return map.Value;
-				}
 				return null;
 			}
 		}