Lab6_DONE

GasolineTanker/ProjectGasolineTanker/Drawings/DrawingGasolineTanker.cs

@@ -11,6 +11,7 @@ namespace ProjectGasolineTanker.Drawings
     public class DrawingGasolineTanker : DrawingTruck
     {
 
+
         public DrawingGasolineTanker(int speed, double weight, Color bodyColor, Color additionalColor, bool tank, bool wheel, int width, int height) : base(speed, weight, bodyColor, width, height, 130, 70)
         {
             if (EntityTruck != null)
@@ -30,14 +31,14 @@ namespace ProjectGasolineTanker.Drawings
             Brush additionalBrush = new SolidBrush(GasolineTanker.Add_Color);
             base.DrawTransport(g);
 
-            if (GasolineTanker.Tank)
+            if (GasolineTanker.IsTank)
             {
                 g.FillRectangle(additionalBrush, _startPosX + 45, _startPosY + 53, 35, 20);
                 g.DrawLine(pen, _startPosX + 45, _startPosY + 53, _startPosX + 80, _startPosY + 73);
                 g.DrawLine(pen, _startPosX + 80, _startPosY + 53, _startPosX + 45, _startPosY + 73);
             }
 
-            if (GasolineTanker.Wheel)
+            if (GasolineTanker.IsWheel)
             {
                 Brush gr = new SolidBrush(Color.Gray);
                 g.FillEllipse(additionalBrush, _startPosX + 85, _startPosY + 55, 22, 22);

GasolineTanker/ProjectGasolineTanker/Drawings/DrawingTruck.cs

@@ -38,6 +38,7 @@ namespace ProjectGasolineTanker.Drawings
 
         public DrawingTruck(int speed, double weight, Color bodyColor, int width, int height)
         {
+            // TODO: Продумать проверки
             if (width < _tankerWidth || height < _tankerHeight)
             {
                 return;
@@ -116,16 +117,16 @@ namespace ProjectGasolineTanker.Drawings
             Pen pen = new(Color.Black);
             Brush additionalBrush = new SolidBrush(EntityTruck.BodyColor);
 
-            g.FillRectangle(additionalBrush, _startPosX + 29, _startPosY + 11, 71, 28); 
+            g.FillRectangle(additionalBrush, _startPosX + 29, _startPosY + 11, 71, 28); //канистра-бак
-            g.FillRectangle(additionalBrush, _startPosX + 29, _startPosY + 20, 71, 9); 
+            g.FillRectangle(additionalBrush, _startPosX + 29, _startPosY + 20, 71, 9); //полосы
 
-            g.DrawRectangle(pen, _startPosX + 29, _startPosY + 11, 71, 28); 
+            g.DrawRectangle(pen, _startPosX + 29, _startPosY + 11, 71, 28); //канистра-бак
-            g.DrawRectangle(pen, _startPosX + 29, _startPosY + 20, 71, 9); 
+            g.DrawRectangle(pen, _startPosX + 29, _startPosY + 20, 71, 9); //полосы
 
 
             Brush additionalBrush1 = new
             SolidBrush(EntityTruck.BodyColor);
-
+            //кабина
             g.FillRectangle(additionalBrush1, _startPosX + 100, _startPosY + 10, 24, 16);
             g.FillRectangle(additionalBrush1, _startPosX + 124, _startPosY + 10, 9, 16);
             g.FillRectangle(additionalBrush1, _startPosX + 100, _startPosY + 10, 33, 16);
@@ -144,7 +145,7 @@ namespace ProjectGasolineTanker.Drawings
             g.FillRectangle(additionalBrush2, _startPosX + 4, _startPosY + 40, 130, 25);
             g.DrawLine(pen, _startPosX + 4, _startPosY + 65, _startPosX + 25, _startPosY + 40);
 
-
+            //колёса
             Brush gr = new SolidBrush(Color.Gray);
 
             g.FillEllipse(additionalBrush, _startPosX + 15, _startPosY + 50, 26, 26);
@@ -157,7 +158,6 @@ namespace ProjectGasolineTanker.Drawings
             g.DrawEllipse(pen, _startPosX + 110, _startPosY + 55, 22, 22);
         }
 
-
         public bool CanMove(DirectionType direction)
         {
             if (EntityTruck == null)

GasolineTanker/ProjectGasolineTanker/Drawings/ExtentionDrawingTruck.cs

@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ProjectGasolineTanker.Entities;
+
+namespace ProjectGasolineTanker.Drawings
+{
+    public static class ExtentionDrawingTruck
+    {
+        // создание объекта из строки
+        public static DrawingTruck? CreateDrawingTruck(this string info, char separatorForObject, int width, int height)
+        {
+            string[] strs = info.Split(separatorForObject);
+            if (strs.Length == 3)
+            {
+                return new DrawingTruck(
+                    Convert.ToInt32(strs[0]),
+                    Convert.ToInt32(strs[1]),
+                    Color.FromName(strs[2]), width, height);
+            }
+            if (strs.Length == 6)
+            {
+                return new DrawingGasolineTanker(
+                Convert.ToInt32(strs[0]), Convert.ToInt32(strs[1]),
+                Color.FromName(strs[2]), Color.FromName(strs[3]),
+                Convert.ToBoolean(strs[4]), Convert.ToBoolean(strs[5]),
+                width, height);
+            }
+            return null;
+        }
+
+        // Получение данных для сохранения в файл
+        public static string GetDataForSave(this DrawingTruck DrawingTruck, char separatorForObject)
+        {
+            var truck = DrawingTruck.EntityTruck;
+            if (truck == null)
+            {
+                return string.Empty;
+            }
+            var str = $"{truck.Speed}{separatorForObject}{truck.Weight}{separatorForObject}{truck.BodyColor.Name}";
+            if (truck is not EntityGasolineTanker GasolineTanker)
+            {
+                return str;
+            }
+            return $"{str}{separatorForObject}{GasolineTanker.Add_Color.Name}{separatorForObject}{GasolineTanker.IsTank}{separatorForObject}{GasolineTanker.IsWheel}";
+        }
+    }
+}

GasolineTanker/ProjectGasolineTanker/Entities/EntityGasolineTanker.cs

@@ -12,16 +12,15 @@ namespace ProjectGasolineTanker.Entities
     {
 
         public Color Add_Color { get; private set; }
+        public bool IsTank { get; private set; }
+        public bool IsWheel { get; private set; }
 
-        public bool Tank { get; private set; }
-
-        public bool Wheel { get; private set; }
 
         public EntityGasolineTanker(int speed, double weight, Color bodyColor, Color additionalColor, bool tank, bool wheel) : base(speed, weight, bodyColor)
         {
             Add_Color = additionalColor;
-            Tank = tank;
+            IsTank = tank;
-            Wheel = wheel;
+            IsWheel = wheel;
         }
 
         public void ChangeAdditionalColor(Color additionalColor)

GasolineTanker/ProjectGasolineTanker/FormTruckCollection.Designer.cs

@@ -40,16 +40,22 @@
             this.buttonAddStorage = new System.Windows.Forms.Button();
             this.buttonDeleteStorage = new System.Windows.Forms.Button();
             this.textBoxStorageName = new System.Windows.Forms.TextBox();
+            this.menuStrip = new System.Windows.Forms.MenuStrip();
+            this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+            this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.loadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.saveFileDialog = new System.Windows.Forms.SaveFileDialog();
+            this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxCollection)).BeginInit();
+            this.menuStrip.SuspendLayout();
             this.SuspendLayout();
             // 
             // buttonAddTruck
             // 
             this.buttonAddTruck.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonAddTruck.Location = new System.Drawing.Point(734, 420);
+            this.buttonAddTruck.Location = new System.Drawing.Point(642, 315);
-            this.buttonAddTruck.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.buttonAddTruck.Name = "buttonAddTruck";
-            this.buttonAddTruck.Size = new System.Drawing.Size(157, 37);
+            this.buttonAddTruck.Size = new System.Drawing.Size(137, 28);
             this.buttonAddTruck.TabIndex = 0;
             this.buttonAddTruck.Text = "Добавить грузовик";
             this.buttonAddTruck.UseVisualStyleBackColor = true;
@@ -57,10 +63,9 @@
             // 
             // pictureBoxCollection
             // 
-            this.pictureBoxCollection.Location = new System.Drawing.Point(0, 0);
+            this.pictureBoxCollection.Location = new System.Drawing.Point(0, 27);
-            this.pictureBoxCollection.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.pictureBoxCollection.Name = "pictureBoxCollection";
-            this.pictureBoxCollection.Size = new System.Drawing.Size(715, 581);
+            this.pictureBoxCollection.Size = new System.Drawing.Size(626, 436);
             this.pictureBoxCollection.TabIndex = 1;
             this.pictureBoxCollection.TabStop = false;
             // 
@@ -69,19 +74,18 @@
             this.labelInstruments.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.labelInstruments.AutoSize = true;
             this.labelInstruments.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point);
-            this.labelInstruments.Location = new System.Drawing.Point(753, 12);
+            this.labelInstruments.Location = new System.Drawing.Point(659, 9);
             this.labelInstruments.Name = "labelInstruments";
-            this.labelInstruments.Size = new System.Drawing.Size(136, 28);
+            this.labelInstruments.Size = new System.Drawing.Size(108, 21);
             this.labelInstruments.TabIndex = 2;
             this.labelInstruments.Text = "Инструменты";
             // 
             // buttonUpdate
             // 
             this.buttonUpdate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonUpdate.Location = new System.Drawing.Point(741, 172);
+            this.buttonUpdate.Location = new System.Drawing.Point(648, 129);
-            this.buttonUpdate.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.buttonUpdate.Name = "buttonUpdate";
-            this.buttonUpdate.Size = new System.Drawing.Size(150, 33);
+            this.buttonUpdate.Size = new System.Drawing.Size(131, 25);
             this.buttonUpdate.TabIndex = 3;
             this.buttonUpdate.Text = "Обновить набор";
             this.buttonUpdate.UseVisualStyleBackColor = true;
@@ -90,10 +94,9 @@
             // buttonDeleteTruck
             // 
             this.buttonDeleteTruck.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonDeleteTruck.Location = new System.Drawing.Point(734, 537);
+            this.buttonDeleteTruck.Location = new System.Drawing.Point(642, 403);
-            this.buttonDeleteTruck.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.buttonDeleteTruck.Name = "buttonDeleteTruck";
-            this.buttonDeleteTruck.Size = new System.Drawing.Size(157, 37);
+            this.buttonDeleteTruck.Size = new System.Drawing.Size(137, 28);
             this.buttonDeleteTruck.TabIndex = 4;
             this.buttonDeleteTruck.Text = "Удалить грузовик";
             this.buttonDeleteTruck.UseVisualStyleBackColor = true;
@@ -102,11 +105,10 @@
             // maskedTextBoxNumber
             // 
             this.maskedTextBoxNumber.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.maskedTextBoxNumber.Location = new System.Drawing.Point(734, 480);
+            this.maskedTextBoxNumber.Location = new System.Drawing.Point(642, 360);
-            this.maskedTextBoxNumber.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.maskedTextBoxNumber.Mask = "00";
             this.maskedTextBoxNumber.Name = "maskedTextBoxNumber";
-            this.maskedTextBoxNumber.Size = new System.Drawing.Size(157, 27);
+            this.maskedTextBoxNumber.Size = new System.Drawing.Size(138, 23);
             this.maskedTextBoxNumber.TabIndex = 5;
             this.maskedTextBoxNumber.ValidatingType = typeof(int);
             // 
@@ -114,27 +116,29 @@
             // 
             this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(741, 63);
+            this.label1.Location = new System.Drawing.Point(648, 47);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(66, 20);
+            this.label1.Size = new System.Drawing.Size(52, 15);
             this.label1.TabIndex = 7;
             this.label1.Text = "Наборы";
             // 
             // listBoxStorages
             // 
             this.listBoxStorages.FormattingEnabled = true;
-            this.listBoxStorages.ItemHeight = 20;
+            this.listBoxStorages.ItemHeight = 15;
-            this.listBoxStorages.Location = new System.Drawing.Point(741, 209);
+            this.listBoxStorages.Location = new System.Drawing.Point(648, 157);
+            this.listBoxStorages.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.listBoxStorages.Name = "listBoxStorages";
-            this.listBoxStorages.Size = new System.Drawing.Size(150, 144);
+            this.listBoxStorages.Size = new System.Drawing.Size(132, 109);
             this.listBoxStorages.TabIndex = 8;
             this.listBoxStorages.SelectedIndexChanged += new System.EventHandler(this.listBoxObjects_SelectedIndexChanged);
             // 
             // buttonAddStorage
             // 
-            this.buttonAddStorage.Location = new System.Drawing.Point(741, 132);
+            this.buttonAddStorage.Location = new System.Drawing.Point(648, 99);
+            this.buttonAddStorage.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.buttonAddStorage.Name = "buttonAddStorage";
-            this.buttonAddStorage.Size = new System.Drawing.Size(150, 33);
+            this.buttonAddStorage.Size = new System.Drawing.Size(131, 25);
             this.buttonAddStorage.TabIndex = 9;
             this.buttonAddStorage.Text = "Добавить набор";
             this.buttonAddStorage.UseVisualStyleBackColor = true;
@@ -142,9 +146,10 @@
             // 
             // buttonDeleteStorage
             // 
-            this.buttonDeleteStorage.Location = new System.Drawing.Point(741, 360);
+            this.buttonDeleteStorage.Location = new System.Drawing.Point(648, 270);
+            this.buttonDeleteStorage.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.buttonDeleteStorage.Name = "buttonDeleteStorage";
-            this.buttonDeleteStorage.Size = new System.Drawing.Size(150, 33);
+            this.buttonDeleteStorage.Size = new System.Drawing.Size(131, 25);
             this.buttonDeleteStorage.TabIndex = 10;
             this.buttonDeleteStorage.Text = "Удалить набор";
             this.buttonDeleteStorage.UseVisualStyleBackColor = true;
@@ -152,16 +157,59 @@
             // 
             // textBoxStorageName
             // 
-            this.textBoxStorageName.Location = new System.Drawing.Point(741, 99);
+            this.textBoxStorageName.Location = new System.Drawing.Point(648, 74);
+            this.textBoxStorageName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.textBoxStorageName.Name = "textBoxStorageName";
-            this.textBoxStorageName.Size = new System.Drawing.Size(150, 27);
+            this.textBoxStorageName.Size = new System.Drawing.Size(132, 23);
             this.textBoxStorageName.TabIndex = 11;
             // 
+            // menuStrip
+            // 
+            this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.toolStripMenuItem1});
+            this.menuStrip.Location = new System.Drawing.Point(0, 0);
+            this.menuStrip.Name = "menuStrip";
+            this.menuStrip.Size = new System.Drawing.Size(797, 24);
+            this.menuStrip.TabIndex = 12;
+            this.menuStrip.Text = "menuStrip1";
+            // 
+            // toolStripMenuItem1
+            // 
+            this.toolStripMenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.saveToolStripMenuItem,
+            this.loadToolStripMenuItem});
+            this.toolStripMenuItem1.Name = "toolStripMenuItem1";
+            this.toolStripMenuItem1.Size = new System.Drawing.Size(48, 20);
+            this.toolStripMenuItem1.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);
+            // 
+            // saveFileDialog
+            // 
+            this.saveFileDialog.Filter = "txt file | *.txt";
+            // 
+            // openFileDialog
+            // 
+            this.openFileDialog.FileName = "openFileDialog1";
+            this.openFileDialog.Filter = "txt file | *.txt";
+            // 
             // FormTruckCollection
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(911, 591);
+            this.ClientSize = new System.Drawing.Size(797, 465);
             this.Controls.Add(this.textBoxStorageName);
             this.Controls.Add(this.buttonDeleteStorage);
             this.Controls.Add(this.buttonAddStorage);
@@ -173,10 +221,13 @@
             this.Controls.Add(this.buttonUpdate);
             this.Controls.Add(this.labelInstruments);
             this.Controls.Add(this.pictureBoxCollection);
-            this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+            this.Controls.Add(this.menuStrip);
+            this.MainMenuStrip = this.menuStrip;
             this.Name = "FormTruckCollection";
             this.Text = "Набор грузовиков";
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxCollection)).EndInit();
+            this.menuStrip.ResumeLayout(false);
+            this.menuStrip.PerformLayout();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -196,5 +247,11 @@
         private Button buttonAddStorage;
         private Button buttonDeleteStorage;
         private TextBox textBoxStorageName;
+        private MenuStrip menuStrip;
+        private ToolStripMenuItem toolStripMenuItem1;
+        private ToolStripMenuItem saveToolStripMenuItem;
+        private ToolStripMenuItem loadToolStripMenuItem;
+        private SaveFileDialog saveFileDialog;
+        private OpenFileDialog openFileDialog;
     }
 }

GasolineTanker/ProjectGasolineTanker/FormTruckCollection.cs

@@ -77,11 +77,13 @@ namespace ProjectGasolineTanker
             }
         }
 
+
         private void buttonAddTruck_Click(object sender, EventArgs e)
         {
 
             var formTruckConfig = new FormTruckConfig();
             
+            // TODO Call method AddEvent from formCarConfig
             formTruckConfig.AddEvent(AddTruck);
             formTruckConfig.Show();
         }
@@ -163,6 +165,39 @@ namespace ProjectGasolineTanker
             pictureBoxCollection.Image = obj.ShowTruck();
         }
 
+        private void SaveToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            if (saveFileDialog.ShowDialog() == DialogResult.OK)
+            {
+                if (_storage.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 (_storage.LoadData(openFileDialog.FileName))
+                {
+                    ReloadObjects();
+                    var obj = _storage[listBoxStorages.SelectedItem.ToString() ?? string.Empty];
+                    pictureBoxCollection.Image = obj.ShowTruck();
+                    MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                }
+                else
+                {
+                    MessageBox.Show("Не загрузилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                }
+            }
+        }
 
     }
 }

GasolineTanker/ProjectGasolineTanker/FormTruckCollection.resx

@@ -60,6 +60,15 @@
   <metadata name="colorDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>131, 17</value>
+  </metadata>
+  <metadata name="saveFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>239, 17</value>
+  </metadata>
+  <metadata name="openFileDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>375, 17</value>
+  </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>36</value>
   </metadata>

GasolineTanker/ProjectGasolineTanker/FormTruckConfig.cs

@@ -16,10 +16,14 @@ namespace ProjectGasolineTanker
     {
         
         DrawingTruck? _truck = null;
-
+        /// <summary>
+        /// Событие
+        /// </summary>
         private event Action<DrawingTruck>? EventAddTruck;
 
-
+        /// <summary>
+        /// Конструктор
+        /// </summary>
         public FormTruckConfig()
         {
             InitializeComponent();
@@ -34,6 +38,9 @@ namespace ProjectGasolineTanker
             buttonCancel.Click += (s, e) => Close();
         }
 
+        /// <summary>
+        /// Отрисовка объекта
+        /// </summary>
         private void DrawTruck()
         {
             Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height);
@@ -42,7 +49,10 @@ namespace ProjectGasolineTanker
             _truck?.DrawTransport(gr);
             pictureBoxObject.Image = bmp;
         }
- 
+        /// <summary>labelSimpleObject
+        /// Добавление события
+        /// </summary>
+        /// <param name="ev">Привязанный методlabelSimpleObject</param>labelSimpleObject
         public void AddEvent(Action<DrawingTruck> ev)
         {
             if (EventAddTruck == null)
@@ -72,7 +82,11 @@ namespace ProjectGasolineTanker
                 e.Effect = DragDropEffects.None;
             }
         }
-
+        /// <summary>
+        /// Действия при приеме перетаскиваемой информации (имени Label)
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void PanelObject_DragDrop(object sender, DragEventArgs e)
         {
             switch (e.Data?.GetData(DataFormats.Text).ToString())
@@ -96,13 +110,21 @@ namespace ProjectGasolineTanker
             }
             DrawTruck();
         }
-
+        /// <summary>
+        /// Передача цвета при нажатии на одну из Panel с цветом
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void PanelColor_MouseDown(object sender, MouseEventArgs e)
         {
             (sender as Panel)?.DoDragDrop((sender as Panel)?.BackColor,
             DragDropEffects.Move | DragDropEffects.Copy);
         }
-
+        /// <summary>
+        /// Проверка получаемой информации (ее типа на соответствие требуемому: цвет) для Label с основным цветом
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void LabelMainColor_DragEnter(object sender, DragEventArgs e)
         {
             if (e.Data.GetDataPresent(typeof(Color)) && _truck != null)
@@ -114,7 +136,11 @@ namespace ProjectGasolineTanker
                 e.Effect = DragDropEffects.None;
             }
         }
-
+        /// <summary>
+        /// Действия при приеме перетаскиваемого цвета
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void LabelMainColor_DragDrop(object sender, DragEventArgs e)
         {
             var color = (Color)e.Data.GetData(typeof(Color));

GasolineTanker/ProjectGasolineTanker/Generic/SetGeneric.cs

@@ -9,11 +9,11 @@ namespace ProjectGasolineTanker.Generic
     internal class SetGeneric<T>
         where T : class
     {
-
+        // список объектов
         private readonly List<T?> _places;
-
+        // кол-во объектов
         public int Count => _places.Count;
-
+        // максимальное количество
         private readonly int _maxCount;
         public SetGeneric(int count)
         {
@@ -21,15 +21,17 @@ namespace ProjectGasolineTanker.Generic
             _places = new List<T?>(count);
         }
 
+        // Добавление объекта в начало
         public int Insert(T truck)
         {
             _places.Insert(0, truck);                                                     
             return 0;
         }
         
+        // Добавление объекта в набор на конкретную позицию
         public bool Insert(T truck, int position)
         {
-
+            // TODO проверка позиции
             if (position < 0 || position >= Count || Count >= _maxCount)
             {
                 return false;
@@ -40,22 +42,26 @@ namespace ProjectGasolineTanker.Generic
             return true;
         }
 
-
+        // Удаление объекта из набора с конкретной позиции
         public bool Remove(int position)
         {
+            // TODO проверка позиции
             if (position < 0 || position >= Count)
             {
                 return false;
             }
+            // TODO удаление объекта из списка
             _places.RemoveAt(position);
 
             return true;
         }
 
+        // Получение объекта из набора по позиции
         public T? this[int position]
         {
             get
             {
+                // TODO проверка позиции
                 if (position < 0 || position >= Count)
                 {
                     return null;
@@ -64,14 +70,18 @@ namespace ProjectGasolineTanker.Generic
             }
             set
             {
+                // TODO проверка позиции
                 if (position < 0 || position > Count || Count >= _maxCount)
                 {
                     return;
                 }
+
+                // TODO вставка в список по позиции
                 _places.Insert(position, value);
             }
         }
 
+        // Проход по списку
         public IEnumerable<T?> GetTruck(int? maxTruck = null)
         {
             for (int i = 0; i < _places.Count; ++i)

GasolineTanker/ProjectGasolineTanker/Generic/TruckGenericCollection.cs

@@ -14,10 +14,10 @@ namespace ProjectGasolineTanker.Generic
     {
         private readonly int _pictureWidth;
         private readonly int _pictureHeight;
-
+        // Размер занимаемого места
         private readonly int _placeSizeWidth = 200;
         private readonly int _placeSizeHeight = 80;
-
+        // коллекция
         private readonly SetGeneric<T> _collection;
 
         public TruckGenericCollection(int picWidth, int picHeight)
@@ -46,11 +46,16 @@ namespace ProjectGasolineTanker.Generic
             return collect?._collection.Remove(pos) ?? false;
         }
 
+        // получение объектов коллекции
+        public IEnumerable<T?> GetTruck => _collection.GetTruck();
+
+        // получение объекта IMoveableObjecr
         public U? GetU(int pos)
         {
             return (U?)_collection[pos]?.GetMoveableObject;
         }
 
+        // вывод всего набора
         public Bitmap ShowTruck()
         {
             Bitmap bmp = new(_pictureWidth, _pictureHeight);
@@ -60,6 +65,7 @@ namespace ProjectGasolineTanker.Generic
             return bmp;
         }
 
+        // прорисовка фона
         private void DrawBackground(Graphics gr)
         {
             Pen pen = new(Color.Black, 3);
@@ -67,15 +73,16 @@ namespace ProjectGasolineTanker.Generic
             {
                 for (int j = 0; j < _pictureHeight / _placeSizeHeight + 1; ++j)
                 {
+                    // линия разметки
                     gr.DrawLine(pen, i * _placeSizeWidth, j * _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth / 2, j * _placeSizeHeight);
                     gr.DrawLine(pen, i * _placeSizeWidth, 0, i * _placeSizeWidth, _pictureHeight / _placeSizeHeight * _placeSizeHeight);
                 }
             }
         }
 
-
         private void DrawObjects(Graphics g)
         {
+            // координаты
             int x = 0;
             int y = _pictureHeight / _placeSizeHeight - 1;
 
@@ -83,12 +90,15 @@ namespace ProjectGasolineTanker.Generic
             {
                 if (truck != null)
                 {
+                    // TODO получение объекта
                     if (x > _pictureWidth / _placeSizeWidth - 1)
                     {
                         x = 0;
                         --y;
                     }
+                    // TODO установка позиции
                     truck.SetPosition(_placeSizeWidth * x, _placeSizeHeight * y);
+                    // TODO прорисовка объекта
                     truck.DrawTransport(g);
                     ++x;
                 }

GasolineTanker/ProjectGasolineTanker/Generic/TruckGenericStorage.cs

@@ -10,11 +10,22 @@ namespace ProjectGasolineTanker.Generic
 {
     internal class TruckGenericStorage
     {
+        //Словарь (хранилище)
         readonly Dictionary<string, TruckGenericCollection<DrawingTruck, DrawingObjectTruck>> _TruckStorages;
+        //Возвращение списка названий наборов
         public List<string> Keys => _TruckStorages.Keys.ToList();
+        //Ширина окна отрисовки
         private readonly int _pictureWidth;
+        //Высота окна отрисовки
         private readonly int _pictureHeight;
 
+        // Разделитель для записи ключа и значения элемента словаря
+        private static readonly char _separatorForKeyValue = '|';
+        // Разделитель для записей коллекции данных в файл
+        private readonly char _separatorRecords = ';';
+        // Разделитель для записи информации по объекту в файл
+        private static readonly char _separatorForObject = ':';
+
         public TruckGenericStorage(int pictureWidth, int pictureHeight)
         {
             _TruckStorages = new Dictionary<string, TruckGenericCollection<DrawingTruck, DrawingObjectTruck>>();
@@ -22,8 +33,11 @@ namespace ProjectGasolineTanker.Generic
             _pictureHeight = pictureHeight;
         }
 
+        // Добавление набора
         public void AddSet(string name)
         {
+            // TODO Прописать логику для добавления
+            // проверка, что нет набора с таким именем
             foreach (string nameStorage in Keys)
             {
                 if (nameStorage == name)
@@ -35,9 +49,10 @@ namespace ProjectGasolineTanker.Generic
             _TruckStorages.Add(name, new TruckGenericCollection<DrawingTruck, DrawingObjectTruck>(_pictureWidth, _pictureHeight));
         }
 
+        // Удаление набора
         public void DelSet(string name)
         {
-
+            // TODO Прописать логику для удаления
             if (_TruckStorages.ContainsKey(name))
             {
                 _TruckStorages.Remove(name);
@@ -45,6 +60,7 @@ namespace ProjectGasolineTanker.Generic
 
         }
 
+        // Доступ к набору
         public TruckGenericCollection<DrawingTruck, DrawingObjectTruck>? this[string ind]
         {
             get
@@ -57,5 +73,80 @@ namespace ProjectGasolineTanker.Generic
                 return null;
             }
         }
+
+        public bool SaveData(string filename)
+        {
+            if (File.Exists(filename))
+            {
+                File.Delete(filename);
+            }
+
+            using (StreamWriter sw = File.CreateText(filename))
+            {
+                sw.WriteLine($"TruckStorage");
+                foreach (var record in _TruckStorages)
+                {
+                    StringBuilder records = new();
+                    foreach (DrawingTruck? elem in record.Value.GetTruck)
+                    {
+                        records.Append($"{elem?.GetDataForSave(_separatorForObject)}{_separatorRecords}");
+                    }
+                    sw.WriteLine($"{record.Key}{_separatorForKeyValue}{records}");
+                }
+            }
+
+            return true;
+        }
+
+        // Загрузка информации по автомобилям в хранилище из файла
+        public bool LoadData(string filename)
+        {
+            if (!File.Exists(filename))
+            {
+                return false;
+            }
+
+            using (StreamReader sr = File.OpenText(filename))
+            {
+                // 1-ая строка
+                string? curLine = sr.ReadLine();
+                // пустая или не те данные
+                if (curLine == null || !curLine.Contains("TruckStorage"))
+                {
+                    return false;
+                }
+                // очищаем
+                _TruckStorages.Clear();
+
+                // загружаем данные построчно
+                curLine = sr.ReadLine();
+                while (curLine != null)
+                {
+                    // загружаем запись
+                    string[] record = curLine.Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries);
+
+                    // загружаем набор
+                    TruckGenericCollection<DrawingTruck, DrawingObjectTruck> collection = new(_pictureWidth, _pictureHeight);
+                    // record[0] - название набора, record[1] - куча объектов
+                    string[] set = record[1].Split(_separatorRecords, StringSplitOptions.RemoveEmptyEntries);
+
+                    foreach (string elem in set)
+                    {
+                        DrawingTruck? Truck = elem?.CreateDrawingTruck(_separatorForObject, _pictureWidth, _pictureHeight);
+                        // проверяем, не переполнится ли коллекция
+                        if (Truck != null)
+                        {
+                            if (collection + Truck == -1)
+                            {
+                                return false;
+                            }
+                        }
+                    }
+                    _TruckStorages.Add(record[0], collection);
+                    curLine = sr.ReadLine();
+                }
+            }
+            return true;
+        }
     }
 }

GasolineTanker/ProjectGasolineTanker/MovementStratg/IMoveableObject.cs

@@ -12,6 +12,7 @@ namespace ProjectGasolineTanker.MovementStratg
 
     public interface IMoveableObject
     {
+
         ObjectParameters? GetObjectPosition { get; }
 
         int GetStep { get; }
@@ -19,5 +20,7 @@ namespace ProjectGasolineTanker.MovementStratg
         bool CheckCanMove(DirectionType direction);
 
         void MoveObject(DirectionType direction);
+
+
     }
 }

GasolineTanker/ProjectGasolineTanker/MovementStratg/MoveToCenter.cs

@@ -6,7 +6,9 @@ using System.Threading.Tasks;
 
 namespace ProjectGasolineTanker.MovementStratg
 {
-
+    /// <summary>
+    /// Стратегия перемещения объекта в центр экрана
+    /// </summary>
     public class MoveToCenter : AbstractStrategy
     {
         protected override bool IsTargetDestinaion()