Фиксация изменений

WarmlyShip/WarmlyShip/EntityWarmlyShip.cs

@@ -21,6 +21,5 @@ namespace WarmlyShip
 			Weight = weight <= 0 ? random.Next(1000, 2000) : weight;
 			BodyColor = bodyColor;
 		}
-
 	}
 }

WarmlyShip/WarmlyShip/FormMapWithSetShip.Designer.cs

@@ -45,9 +45,16 @@
 			this.buttonRemoveShip = new System.Windows.Forms.Button();
 			this.buttonAddShip = new System.Windows.Forms.Button();
 			this.pictureBox = new System.Windows.Forms.PictureBox();
+			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.groupBox1.SuspendLayout();
 			this.groupBoxMaps.SuspendLayout();
 			((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
+			this.menuStrip.SuspendLayout();
 			this.SuspendLayout();
 			// 
 			// groupBox1
@@ -63,9 +70,9 @@
 			this.groupBox1.Controls.Add(this.buttonRemoveShip);
 			this.groupBox1.Controls.Add(this.buttonAddShip);
 			this.groupBox1.Dock = System.Windows.Forms.DockStyle.Right;
-			this.groupBox1.Location = new System.Drawing.Point(815, 0);
+			this.groupBox1.Location = new System.Drawing.Point(815, 24);
 			this.groupBox1.Name = "groupBox1";
-			this.groupBox1.Size = new System.Drawing.Size(200, 648);
+			this.groupBox1.Size = new System.Drawing.Size(200, 624);
 			this.groupBox1.TabIndex = 0;
 			this.groupBox1.TabStop = false;
 			this.groupBox1.Text = "Инструменты";
@@ -132,7 +139,6 @@
 			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
 			// 
@@ -147,7 +153,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, 589);
+			this.buttonDown.Location = new System.Drawing.Point(75, 565);
 			this.buttonDown.Name = "buttonDown";
 			this.buttonDown.Size = new System.Drawing.Size(50, 50);
 			this.buttonDown.TabIndex = 10;
@@ -159,7 +165,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, 589);
+			this.buttonLeft.Location = new System.Drawing.Point(19, 565);
 			this.buttonLeft.Name = "buttonLeft";
 			this.buttonLeft.Size = new System.Drawing.Size(50, 50);
 			this.buttonLeft.TabIndex = 9;
@@ -171,7 +177,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, 533);
+			this.buttonUp.Location = new System.Drawing.Point(75, 509);
 			this.buttonUp.Name = "buttonUp";
 			this.buttonUp.Size = new System.Drawing.Size(50, 50);
 			this.buttonUp.TabIndex = 8;
@@ -183,7 +189,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, 589);
+			this.buttonRight.Location = new System.Drawing.Point(131, 565);
 			this.buttonRight.Name = "buttonRight";
 			this.buttonRight.Size = new System.Drawing.Size(50, 50);
 			this.buttonRight.TabIndex = 7;
@@ -233,12 +239,52 @@
 			// 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(815, 648);
+			this.pictureBox.Size = new System.Drawing.Size(815, 624);
 			this.pictureBox.TabIndex = 1;
 			this.pictureBox.TabStop = false;
 			// 
+			// menuStrip
+			// 
+			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(1015, 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";
+			// 
 			// FormMapWithSetShip
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
@@ -246,6 +292,8 @@
 			this.ClientSize = new System.Drawing.Size(1015, 648);
 			this.Controls.Add(this.pictureBox);
 			this.Controls.Add(this.groupBox1);
+			this.Controls.Add(this.menuStrip);
+			this.MainMenuStrip = this.menuStrip;
 			this.Name = "FormMapWithSetShip";
 			this.Text = "FormMapWithSetShip";
 			this.groupBox1.ResumeLayout(false);
@@ -253,7 +301,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 +327,11 @@
 		private ListBox listBoxMaps;
 		private Button buttonAddMap;
 		private TextBox textBoxNewMapName;
+		private MenuStrip menuStrip;
+		private ToolStripMenuItem файлToolStripMenuItem;
+		private ToolStripMenuItem SaveToolStripMenuItem;
+		private ToolStripMenuItem LoadToolStripMenuItem;
+		private OpenFileDialog openFileDialog;
+		private SaveFileDialog saveFileDialog;
 	}
 }

WarmlyShip/WarmlyShip/FormMapWithSetShip.cs

@@ -183,5 +183,35 @@ namespace WarmlyShip
 			}
 			pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].MoveObject(dir);
 		}
+
+		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 (saveFileDialog.ShowDialog() == DialogResult.OK)
+			{
+				if (_mapsCollection.SaveData(saveFileDialog.FileName))
+				{
+					MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+				}
+				else
+				{
+					MessageBox.Show("Не загрузилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				}
+			}
+		}
 	}
 }

WarmlyShip/WarmlyShip/FormMapWithSetShip.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>125, 17</value>
+  </metadata>
+  <metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>265, 17</value>
+  </metadata>
 </root>

WarmlyShip/WarmlyShip/MapWithSetShipGeneric.cs

@@ -65,6 +65,24 @@ namespace WarmlyShip
 			return new(_pictureWidth, _pictureHeight);
 		}
 
+		public string GetData(char separatorType, char separatorData)
+		{
+			string data = $"{_map.GetType().Name}{separatorType}";
+			foreach (var ship in _setShips.GetShips())
+			{
+				data += $"{ship.GetInfo()}{separatorData}";
+			}
+			return data;
+		}
+
+		public void LoadData(string[] records)
+		{
+			foreach (var rec in records)
+			{
+				_setShips.Insert(DrawningObjectShip.Create(rec) as T);
+			}
+		}
+
 		private void Shaking()
 		{
 			int j = _setShips.Count - 1;
@@ -107,17 +125,6 @@ namespace WarmlyShip
 
 		private void DrawShips(Graphics g)
 		{
-			/*for (int i = 0; i < _setShips.Count; ++i)
-			{
-				if (_setShips[i] != null )
-				{
-					int temp = 0;
-					if (_setShips[i].GetCurrentPosition().Bottom - _setShips[i].GetCurrentPosition().Top < 75) temp = (int)(_setShips[i].GetCurrentPosition().Bottom - _setShips[i].GetCurrentPosition().Top);
-					_setShips[i].SetObject((_pictureWidth / _placeSizeWidth - (i % (_pictureWidth / _placeSizeWidth)) - 1) * _placeSizeWidth, (i / (_pictureWidth / _placeSizeWidth)) * _placeSizeHeight + temp, _pictureWidth, _pictureHeight);
-					_setShips[i].DrawningObject(g);
-				}
-			}*/
-
 			int i = 0;
 			foreach (var ship in _setShips.GetShips())
 			{
@@ -131,6 +138,5 @@ namespace WarmlyShip
 				++i;
 			}
 		}
-
 	}
 }

WarmlyShip/WarmlyShip/MapsCollection.cs

@@ -9,7 +9,7 @@ namespace WarmlyShip
 {
 	internal class MapsCollection
 	{
-		readonly Dictionary<string, MapWithSetShipGeneric<DrawningObjectShip, AbstractMap>> _mapStorages;
+		readonly Dictionary<string, MapWithSetShipGeneric<IDrawningObject, AbstractMap>> _mapStorages;
 
 		public List<string> Keys => _mapStorages.Keys.ToList();
 
@@ -17,9 +17,13 @@ namespace WarmlyShip
 
 		private readonly int _pictureHeight;
 
+		private readonly char separatorDict = '|';
+
+		private readonly char separatorData = ';';
+
 		public MapsCollection(int pictureWidth, int pictureHeight)
 		{
-			_mapStorages = new Dictionary<string, MapWithSetShipGeneric<DrawningObjectShip, AbstractMap>>();
+			_mapStorages = new Dictionary<string, MapWithSetShipGeneric<IDrawningObject, AbstractMap>>();
 			_pictureWidth = pictureWidth;
 			_pictureHeight = pictureHeight;
 		}
@@ -27,7 +31,7 @@ namespace WarmlyShip
 		public void AddMap(string name, AbstractMap map)
 		{
 			if (_mapStorages.ContainsKey(name)) return;
-			_mapStorages.Add(name, new MapWithSetShipGeneric<DrawningObjectShip, AbstractMap>(_pictureWidth, _pictureHeight, map));
+			_mapStorages.Add(name, new MapWithSetShipGeneric<IDrawningObject, AbstractMap>(_pictureWidth, _pictureHeight, map));
 		}
 
 		public void DelMap(string name)
@@ -36,7 +40,7 @@ namespace WarmlyShip
 			_mapStorages.Remove(name);
 		}
 
-		public MapWithSetShipGeneric<DrawningObjectShip, AbstractMap> this[string ind]
+		public MapWithSetShipGeneric<IDrawningObject, AbstractMap> this[string ind]
 		{
 			get
 			{
@@ -45,5 +49,68 @@ namespace WarmlyShip
 			}
 		}
 
+		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("MapsCollection"))
+			{
+				//если нет такой записи, то это не те данные
+				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;
+				}
+				_mapStorages.Add(elem[0], new MapWithSetShipGeneric<IDrawningObject, AbstractMap>(_pictureWidth, _pictureHeight, map));
+				_mapStorages[elem[0]].LoadData(elem[2].Split(separatorData, StringSplitOptions.RemoveEmptyEntries));
+			}
+			return true;
+		}
 	}
 }