HoistingCrane/HoistingCrane/CollectionGenericObjects/AbstractCompany.cs

@@ -31,7 +31,7 @@ namespace HoistingCrane.CollectionGenericObjects
         {
             get
             {
-                return (pictureWidth * pictureHeight) / (_placeSizeHeight * _placeSizeWidth);
+                return (pictureWidth * pictureHeight) / (_placeSizeHeight * _placeSizeWidth)-3;
             }
         }
         public AbstractCompany(int picWidth, int picHeight, ICollectionGenericObjects<DrawningTrackedVehicle> array)

HoistingCrane/HoistingCrane/CollectionGenericObjects/StorageCollection.cs

@@ -1,6 +1,5 @@
 using HoistingCrane.Drawning;
 using System;
-using System.Configuration;
 using System.Text;
 
 namespace HoistingCrane.CollectionGenericObjects
@@ -95,7 +94,6 @@ namespace HoistingCrane.CollectionGenericObjects
             using (StreamWriter writer = new StreamWriter(filename))
             {
                 writer.Write(_collectionKey);
-
                 foreach (KeyValuePair<string, ICollectionGenericObjects<T>> value in dict)
                 {
                     StringBuilder sb = new();
@@ -125,8 +123,10 @@ namespace HoistingCrane.CollectionGenericObjects
                     }
                     writer.Write(sb);
                 }
+
             }
             return true;
+
         }
 
         /// <summary>
@@ -156,7 +156,7 @@ namespace HoistingCrane.CollectionGenericObjects
                 while ((strs = fs.ReadLine()) != null)
                 {
                     string[] record = strs.Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries);
-                    if (record.Length != 2)
+                    if (record.Length != 4)
                     {
                         continue;
                     }

HoistingCrane/HoistingCrane/FormCarCollection.Designer.cs

@@ -68,7 +68,7 @@
             groupBoxTools.Dock = DockStyle.Right;
             groupBoxTools.Location = new Point(763, 24);
             groupBoxTools.Name = "groupBoxTools";
-            groupBoxTools.Size = new Size(210, 499);
+            groupBoxTools.Size = new Size(210, 485);
             groupBoxTools.TabIndex = 0;
             groupBoxTools.TabStop = false;
             groupBoxTools.Text = "Инструменты";
@@ -81,7 +81,7 @@
             panelCompanyTool.Controls.Add(buttonRefresh);
             panelCompanyTool.Controls.Add(buttonGoToChek);
             panelCompanyTool.Controls.Add(buttonDeleteCar);
-            panelCompanyTool.Location = new Point(6, 319);
+            panelCompanyTool.Location = new Point(6, 312);
             panelCompanyTool.Name = "panelCompanyTool";
             panelCompanyTool.Size = new Size(204, 185);
             panelCompanyTool.TabIndex = 8;
@@ -198,7 +198,7 @@
             radioButtonList.AutoSize = true;
             radioButtonList.Location = new Point(128, 56);
             radioButtonList.Name = "radioButtonList";
-            radioButtonList.Size = new Size(66, 19);
+            radioButtonList.Size = new Size(67, 19);
             radioButtonList.TabIndex = 3;
             radioButtonList.TabStop = true;
             radioButtonList.Text = "Список";
@@ -209,7 +209,7 @@
             radioButtonMassive.AutoSize = true;
             radioButtonMassive.Location = new Point(18, 56);
             radioButtonMassive.Name = "radioButtonMassive";
-            radioButtonMassive.Size = new Size(67, 19);
+            radioButtonMassive.Size = new Size(69, 19);
             radioButtonMassive.TabIndex = 2;
             radioButtonMassive.TabStop = true;
             radioButtonMassive.Text = "Массив";
@@ -227,7 +227,7 @@
             labelCollectionName.AutoSize = true;
             labelCollectionName.Location = new Point(35, 0);
             labelCollectionName.Name = "labelCollectionName";
-            labelCollectionName.Size = new Size(125, 15);
+            labelCollectionName.Size = new Size(135, 15);
             labelCollectionName.TabIndex = 0;
             labelCollectionName.Text = "Название коллекции:";
             // 
@@ -248,7 +248,7 @@
             pictureBox.Dock = DockStyle.Fill;
             pictureBox.Location = new Point(0, 24);
             pictureBox.Name = "pictureBox";
-            pictureBox.Size = new Size(763, 499);
+            pictureBox.Size = new Size(763, 485);
             pictureBox.TabIndex = 1;
             pictureBox.TabStop = false;
             // 
@@ -265,14 +265,14 @@
             // 
             файлToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { saveToolStripMenuItem, loadToolStripMenuItem });
             файлToolStripMenuItem.Name = "файлToolStripMenuItem";
-            файлToolStripMenuItem.Size = new Size(48, 20);
+            файлToolStripMenuItem.Size = new Size(50, 20);
             файлToolStripMenuItem.Text = "Файл";
             // 
             // saveToolStripMenuItem
             // 
             saveToolStripMenuItem.Name = "saveToolStripMenuItem";
             saveToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.S;
-            saveToolStripMenuItem.Size = new Size(181, 22);
+            saveToolStripMenuItem.Size = new Size(186, 22);
             saveToolStripMenuItem.Text = "Сохранение";
             saveToolStripMenuItem.Click += saveToolStripMenuItem_Click;
             // 
@@ -280,7 +280,7 @@
             // 
             loadToolStripMenuItem.Name = "loadToolStripMenuItem";
             loadToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.L;
-            loadToolStripMenuItem.Size = new Size(181, 22);
+            loadToolStripMenuItem.Size = new Size(186, 22);
             loadToolStripMenuItem.Text = "Загрузка";
             loadToolStripMenuItem.Click += loadToolStripMenuItem_Click;
             // 
@@ -296,7 +296,7 @@
             // 
             AutoScaleDimensions = new SizeF(7F, 15F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(973, 523);
+            ClientSize = new Size(973, 509);
             Controls.Add(pictureBox);
             Controls.Add(groupBoxTools);
             Controls.Add(menuStrip);

Файл_для_лабораторной_6.txt

@@ -1,3 +0,0 @@
-CollectionsStorage
-массив|Massive|25|EntityTrackedVehicle:100:100:Green;EntityHoistingCrane:100:100:Yellow:Black:False:False;EntityTrackedVehicle:100:100:Gray;
-список|List|2|EntityTrackedVehicle:100:100:Blue;EntityHoistingCrane:100:100:Gray:Black:True:True;

Файл_с_машинами.txt

@@ -1,2 +0,0 @@
-CollectionsStorage
-массив|Massive|24|EntityTrackedVehicle:100:100:Gray;EntityTrackedVehicle:100:100:Red;EntityTrackedVehicle:100:100:Blue;EntityTrackedVehicle:100:100:Yellow;EntityTrackedVehicle:100:100:Green;EntityTrackedVehicle:100:100:Black;EntityTrackedVehicle:100:100:White;EntityTrackedVehicle:100:100:Purple;EntityHoistingCrane:100:100:Green:Black:False:False;EntityHoistingCrane:100:100:Yellow:Gray:False:True;EntityHoistingCrane:100:100:Purple:Black:True:True;EntityTrackedVehicle:100:100:White;EntityHoistingCrane:100:100:White:Black:False:True;EntityTrackedVehicle:100:100:Green;EntityTrackedVehicle:100:100:White;EntityTrackedVehicle:100:100:White;EntityTrackedVehicle:100:100:White;EntityTrackedVehicle:100:100:White;EntityHoistingCrane:100:100:White:Black:False:False;EntityTrackedVehicle:100:100:White;EntityTrackedVehicle:100:100:Yellow;EntityTrackedVehicle:100:100:White;EntityHoistingCrane:100:100:Gray:Black:False:False;EntityTrackedVehicle:100:100:Black;

допка3.txt

@@ -1,3 +0,0 @@
-CollectionsStorage
-массив|Massive
-список|List