Третья лабораторная работа

HoistingCrane/HoistingCrane/FormMapWithSetHoistingCrane.cs

@@ -12,19 +12,9 @@ namespace HoistingCrane
 {
     public partial class FormMapWithSetHoistingCrane : Form
     {
-        /// Словарь для выпадающего списка
+
-        /// </summary>
-        private readonly Dictionary<string, AbstractMap> _mapsDict = new()
-        {
-            { "Простая карта", new SimpleMap() },
-            { "Вторая карта", new SecondMap() },
-        };
-        /// <summary>
-        /// Объект от коллекции карт
-        /// </summary>
-        private readonly MapsCollection _mapsCollection;
-        /// <summary>
         private MapWithSetHoistingCraneGeneric<DrawingObjectHoistingCrane, AbstractMap> _mapHoistingCraneCollectionGeneric;
+
         public FormMapWithSetHoistingCrane()
         {
             InitializeComponent();
@@ -62,7 +52,6 @@ namespace HoistingCrane
             AbstractMap map = null;
             switch (comboBoxSelectorMap.Text)
             {
-                case "Простая карта":
                     map = new SimpleMap();
                     break;
                 case "Вторая карта":
@@ -123,30 +112,22 @@ namespace HoistingCrane
         }
         private void ButtonAddHoistingCrane_Click(object sender, EventArgs e)
         {
-            if (listBoxMaps.SelectedIndex == -1)
             {
                 return;
             }
-            var formHoistingCraneConfig = new FormHoistingCraneConfig();
-            formHoistingCraneConfig.AddEvent(AddHoistingCrane);
-            formHoistingCraneConfig.Show();
-        }
-        private void AddHoistingCrane(DrawingHoistingCrane drawingHoistingCrane)
             {
-            DrawingObjectHoistingCrane hoistingCrane = new DrawingObjectHoistingCrane(drawingHoistingCrane);
-            if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + hoistingCrane != -1)
                 {
                     MessageBox.Show("Объект добавлен");
-                pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
                 }
                 else
                 {
                     MessageBox.Show("Не удалось добавить объект");
                 }
             }
+        }
+
         private void ButtonRemoveHoistingCrane_Click(object sender, EventArgs e)
         {
-            if (listBoxMaps.SelectedIndex == -1)
             {
                 return;
             }
@@ -155,35 +136,31 @@ namespace HoistingCrane
                 return;
             }
             int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
-            if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] - pos != null)
             {
                 MessageBox.Show("Объект удален");
-                pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
             }
             else
             {
                 MessageBox.Show("Не удалось удалить объект");
             }
         }
+
         private void ButtonShowStorage_Click(object sender, EventArgs e)
         {
-            if (listBoxMaps.SelectedIndex == -1)
             {
                 return;
             }
-            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
         }
+
         private void ButtonShowOnMap_Click(object sender, EventArgs e)
         {
-            if (listBoxMaps.SelectedIndex == -1)
             {
                 return;
             }
-            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowOnMap();
         }
+
         private void ButtonMove_Click(object sender, EventArgs e)
         {
-            if (listBoxMaps.SelectedIndex == -1)
             {
                 return;
             }
@@ -206,5 +183,10 @@ namespace HoistingCrane
             }
             pictureBox.Image = _mapHoistingCraneCollectionGeneric.MoveObject(enums);
         }
+
+        private void pictureBox_Click(object sender, EventArgs e)
+        {
+
+        }
     }
 }

HoistingCrane/HoistingCrane/MapWithSetHoistingCraneGeneric.cs

@@ -42,7 +42,7 @@ namespace HoistingCrane
             Bitmap bmp = new(_pictureWidth, _pictureWidth);
             Graphics gr = Graphics.FromImage(bmp);
             DrawBackground(gr);
-            DrawHoistingCranes(gr);
+            DrawBulldozers(gr);
             return bmp;
         }
 
@@ -107,7 +107,6 @@ namespace HoistingCrane
             }
         }
 
-        private void DrawHoistingCranes(Graphics gr)
         {
             int heightEl = _pictureHeight / _placeSizeHeight;
             int widthEl = _pictureWidth / _placeSizeWidth;