commit 06 full

DoubleDeckerBus/DoubleDeckerBus/DrawningObjectBus.cs

@@ -30,6 +30,11 @@ namespace DoubleDeckerBus
         {
             _bus.DrawTransport(g);
         }
+        public string GetInfo() => _bus?.GetDataForSave();
 
+        public static IDrawningObject Create(string data)
+        {
+            return new DrawningObjectBus(data.CreateDrawningBus());
+        }
     }
 }

DoubleDeckerBus/DoubleDeckerBus/EntityBus.cs

@@ -45,5 +45,11 @@ namespace DoubleDeckerBus
         {
             BodyColor = newColor;
         }
+        public static EntityBus Creator(string data)
+        {
+            string[] strs = data.Split(':');
+            return new EntityBus(Convert.ToInt32(strs[0]),
+                Convert.ToInt32(strs[1]), Color.FromName(strs[2]));
+        }
     }
 }

DoubleDeckerBus/DoubleDeckerBus/ExtentionBus.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DoubleDeckerBus
+{
+    internal static class ExtentionBus
+    {
+        private static readonly char _separatorForObject = ':';
+        public static DrawningBus CreateDrawningBus(this string info)
+        {
+            string[] strs = info.Split(_separatorForObject);
+            if (strs.Length == 3)
+            {
+                return new DrawningBus(Convert.ToInt32(strs[0]),
+                    Convert.ToInt32(strs[1]), Color.FromName(strs[2]));
+            }
+            if (strs.Length == 7)
+            {
+                return new DrawningDoubleDeckerBus(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 DrawningBus drawingBus)
+        {
+            var bus = drawingBus.Bus;
+            var str = $"{bus.Speed}{_separatorForObject}{bus.Weight}{_separatorForObject}{bus.BodyColor.Name}";
+            if (bus is not EntityDoubleDeckerBus doubleDeckerBus)
+            {
+                return str;
+            }
+            return $"{str}{_separatorForObject}{doubleDeckerBus.DopColor.Name}{_separatorForObject}{doubleDeckerBus.SecondFloor}{_separatorForObject}{doubleDeckerBus.BodyKit}{_separatorForObject}{doubleDeckerBus.Stair}";
+        }
+    }
+}

DoubleDeckerBus/DoubleDeckerBus/FormMapWithSetBuses.Designer.cs

@@ -45,9 +45,16 @@
             this.maskedTextBoxPosition = new System.Windows.Forms.MaskedTextBox();
             this.buttonAddBus = 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.groupBoxInstruments.SuspendLayout();
             this.groupBoxMaps.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
+            this.menuStrip.SuspendLayout();
             this.SuspendLayout();
             // 
             // groupBoxInstruments
@@ -63,9 +70,9 @@
             this.groupBoxInstruments.Controls.Add(this.maskedTextBoxPosition);
             this.groupBoxInstruments.Controls.Add(this.buttonAddBus);
             this.groupBoxInstruments.Dock = System.Windows.Forms.DockStyle.Right;
-            this.groupBoxInstruments.Location = new System.Drawing.Point(608, 0);
+            this.groupBoxInstruments.Location = new System.Drawing.Point(608, 24);
             this.groupBoxInstruments.Name = "groupBoxInstruments";
-            this.groupBoxInstruments.Size = new System.Drawing.Size(200, 658);
+            this.groupBoxInstruments.Size = new System.Drawing.Size(200, 634);
             this.groupBoxInstruments.TabIndex = 0;
             this.groupBoxInstruments.TabStop = false;
             this.groupBoxInstruments.Text = "Инструменты";
@@ -137,7 +144,7 @@
             this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonLeft.BackgroundImage = global::DoubleDeckerBus.Properties.Resources.Left;
             this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonLeft.Location = new System.Drawing.Point(52, 616);
+            this.buttonLeft.Location = new System.Drawing.Point(52, 592);
             this.buttonLeft.Name = "buttonLeft";
             this.buttonLeft.Size = new System.Drawing.Size(30, 30);
             this.buttonLeft.TabIndex = 9;
@@ -149,7 +156,7 @@
             this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonUp.BackgroundImage = global::DoubleDeckerBus.Properties.Resources.Up;
             this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonUp.Location = new System.Drawing.Point(88, 580);
+            this.buttonUp.Location = new System.Drawing.Point(88, 556);
             this.buttonUp.Name = "buttonUp";
             this.buttonUp.Size = new System.Drawing.Size(30, 30);
             this.buttonUp.TabIndex = 8;
@@ -161,7 +168,7 @@
             this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonRight.BackgroundImage = global::DoubleDeckerBus.Properties.Resources.Right;
             this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonRight.Location = new System.Drawing.Point(124, 616);
+            this.buttonRight.Location = new System.Drawing.Point(124, 592);
             this.buttonRight.Name = "buttonRight";
             this.buttonRight.Size = new System.Drawing.Size(30, 30);
             this.buttonRight.TabIndex = 7;
@@ -173,7 +180,7 @@
             this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonDown.BackgroundImage = global::DoubleDeckerBus.Properties.Resources.Down;
             this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonDown.Location = new System.Drawing.Point(88, 616);
+            this.buttonDown.Location = new System.Drawing.Point(88, 592);
             this.buttonDown.Name = "buttonDown";
             this.buttonDown.Size = new System.Drawing.Size(30, 30);
             this.buttonDown.TabIndex = 6;
@@ -231,12 +238,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(608, 658);
+            this.pictureBox.Size = new System.Drawing.Size(608, 634);
             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(808, 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";
+            // 
             // FormMapWithSetBuses
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
@@ -244,6 +291,8 @@
             this.ClientSize = new System.Drawing.Size(808, 658);
             this.Controls.Add(this.pictureBox);
             this.Controls.Add(this.groupBoxInstruments);
+            this.Controls.Add(this.menuStrip);
+            this.MainMenuStrip = this.menuStrip;
             this.Name = "FormMapWithSetBuses";
             this.Text = "Карта с набором объектов";
             this.groupBoxInstruments.ResumeLayout(false);
@@ -251,7 +300,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();
 
         }
 
@@ -274,5 +326,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;
     }
 }

DoubleDeckerBus/DoubleDeckerBus/FormMapWithSetBuses.cs

@@ -176,5 +176,36 @@ namespace DoubleDeckerBus
                 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))
+                {
+                    MessageBox.Show("Загрузка прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    ReloadMaps();
+                }
+                else
+                {
+                    MessageBox.Show("Ошибка при загрузке", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                }
+            }
+        }
     }
 }

DoubleDeckerBus/DoubleDeckerBus/FormMapWithSetBuses.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>

DoubleDeckerBus/DoubleDeckerBus/IDrawningObject.cs

@@ -36,5 +36,7 @@ namespace DoubleDeckerBus
         /// </summary>
         /// <returns></returns>
         (float Left, float Right, float Top, float Bottom) GetCurrentPosition();
+
+        string GetInfo();
     }
 }

DoubleDeckerBus/DoubleDeckerBus/MapWithSetBusesGeneric.cs

@@ -173,5 +173,23 @@ namespace DoubleDeckerBus
                 }
             }
         }
+
+        public string GetData(char separatorType, char separatorData)
+        {
+            string data = $"{_map.GetType().Name}{separatorType}";
+            foreach (var bus in _setBuses.GetBuses())
+            {
+                data += $"{bus.GetInfo()}{separatorData}";
+            }
+            return data;
+        }
+
+        public void LoadData(string[] records)
+        {
+            foreach (var rec in records)
+            {
+                _setBuses.Insert(DrawningObjectBus.Create(rec) as T);
+            }
+        }
     }
 }

DoubleDeckerBus/DoubleDeckerBus/MapsCollection.cs

@@ -8,7 +8,7 @@ namespace DoubleDeckerBus
 {
     internal class MapsCollection
     {
-        readonly Dictionary<string, MapWithSetBusesGeneric<DrawningObjectBus, AbstractMap>> _mapStorages;
+        readonly Dictionary<string, MapWithSetBusesGeneric<IDrawningObject, AbstractMap>> _mapStorages;
 
         public List<string> Keys => _mapStorages.Keys.ToList();
 
@@ -16,9 +16,13 @@ namespace DoubleDeckerBus
 
         private readonly int _pictureHeight;
 
+        private readonly char separatorDict = '|';
+
+        private readonly char separatorData = ';';
+
         public MapsCollection(int pictureWidth, int pictureHeight)
         {
-            _mapStorages = new Dictionary<string, MapWithSetBusesGeneric<DrawningObjectBus, AbstractMap>>();
+            _mapStorages = new Dictionary<string, MapWithSetBusesGeneric<IDrawningObject, AbstractMap>>();
             _pictureWidth = pictureWidth;
             _pictureHeight = pictureHeight;
         }
@@ -26,7 +30,7 @@ namespace DoubleDeckerBus
         public void AddMap(string name, AbstractMap map)
         {
             if (Keys.Contains(name)) return;
-            _mapStorages.Add(name, new MapWithSetBusesGeneric<DrawningObjectBus, AbstractMap>(_pictureWidth, _pictureHeight, map));
+            _mapStorages.Add(name, new MapWithSetBusesGeneric<IDrawningObject, AbstractMap>(_pictureWidth, _pictureHeight, map));
         }
 
         public void DelMap(string name)
@@ -34,7 +38,7 @@ namespace DoubleDeckerBus
             _mapStorages.Remove(name);
         }
 
-        public MapWithSetBusesGeneric<DrawningObjectBus, AbstractMap> this[string ind]
+        public MapWithSetBusesGeneric<IDrawningObject, AbstractMap> this[string ind]
         {
             get
             {
@@ -42,5 +46,62 @@ namespace DoubleDeckerBus
                 return result;
             }
         }
+
+
+        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;
+        }
+
+        public bool LoadData(string filename)
+        {
+            if (!File.Exists(filename))
+            {
+                return false;
+            }
+            string line;
+            using (StreamReader sw = new(filename))
+            {
+                line = sw.ReadLine();
+                if (line == null || !line.Contains("MapsCollection"))
+                {
+                    return false;
+                }
+
+                _mapStorages.Clear();
+                line = sw.ReadLine();
+                while (line != null)
+                {
+                    var elem = line.Split(separatorDict);
+                    AbstractMap map = null;
+                    switch (elem[1])
+                    {
+                        case "SimpleMap":
+                            map = new SimpleMap();
+                            break;
+                        case "MyMap":
+                            map = new MyMap();
+                            break;
+                    }
+                    _mapStorages.Add(elem[0], new MapWithSetBusesGeneric<IDrawningObject, AbstractMap>(_pictureWidth, _pictureHeight, map));
+                    _mapStorages[elem[0]].LoadData(elem[2].Split(separatorData, StringSplitOptions.RemoveEmptyEntries));
+                    line = sw.ReadLine();
+                }
+
+                return true;
+            }
+        }
     }
 }