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

HoistingCrane/HoistingCrane/FormMapWithSetHoistingCrane.cs

@@ -18,40 +18,14 @@ namespace HoistingCrane
         public FormMapWithSetHoistingCrane()
         {
             InitializeComponent();
-            _mapsCollection = new MapsCollection(pictureBox.Width, pictureBox.Height);
-            comboBoxSelectorMap.Items.Clear();
-            foreach (var elem in _mapsDict)
-            {
-                comboBoxSelectorMap.Items.Add(elem.Key);
-            }
-        }
-        /// <summary>
-        /// Заполнение listBoxMaps
-        /// </summary>
-        private void ReloadMaps()
-        {
-            int index = listBoxMaps.SelectedIndex;
-
-            listBoxMaps.Items.Clear();
-            for (int i = 0; i < _mapsCollection.Keys.Count; i++)
-            {
-                listBoxMaps.Items.Add(_mapsCollection.Keys[i]);
         }
 
-            if (listBoxMaps.Items.Count > 0 && (index == -1 || index >= listBoxMaps.Items.Count))
-            {
-                listBoxMaps.SelectedIndex = 0;
-            }
-            else if (listBoxMaps.Items.Count > 0 && index > -1 && index < listBoxMaps.Items.Count)
-            {
-                listBoxMaps.SelectedIndex = index;
-            }
-        }
         private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
         {
             AbstractMap map = null;
             switch (comboBoxSelectorMap.Text)
             {
+                case "Первая карта":
                     map = new SimpleMap();
                     break;
                 case "Вторая карта":
@@ -68,56 +42,21 @@ namespace HoistingCrane
                 _mapHoistingCraneCollectionGeneric = null;
             }
         }
-        /// <summary>
-        /// Добавление карты
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void buttonAddMap_Click_1(object sender, EventArgs e)
-        {
-            if (comboBoxSelectorMap.SelectedIndex == -1 || string.IsNullOrEmpty(textBoxNewMapName.Text))
-            {
-                MessageBox.Show("Не все данные заполнены", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            if (!_mapsDict.ContainsKey(comboBoxSelectorMap.Text))
-            {
-                MessageBox.Show("Нет такой карты", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            _mapsCollection.AddMap(textBoxNewMapName.Text, _mapsDict[comboBoxSelectorMap.Text]);
-            ReloadMaps();
-        }
-        private void ListBoxMaps_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
-        }
-        /// <summary>
-        /// Удаление карты
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void buttonDeleteMap_Click(object sender, EventArgs e)
-        {
-            if (listBoxMaps.SelectedIndex == -1)
-            {
-                return;
-            }
 
-            if (MessageBox.Show($"Удалить карту {listBoxMaps.SelectedItem}?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
-            {
-                _mapsCollection.DelMap(listBoxMaps.SelectedItem?.ToString() ?? string.Empty);
-                ReloadMaps();
-            }
-        }
         private void ButtonAddHoistingCrane_Click(object sender, EventArgs e)
         {
+            if (_mapHoistingCraneCollectionGeneric == null)
             {
                 return;
             }
+            FormHoistingCrane form = new();
+            if (form.ShowDialog() == DialogResult.OK)
             {
+                DrawingObjectHoistingCrane hoistingCrane = new(form.SelectedHoistingCrane);
+                if (_mapHoistingCraneCollectionGeneric + hoistingCrane == 1)
                 {
                     MessageBox.Show("Объект добавлен");
+                    pictureBox.Image = _mapHoistingCraneCollectionGeneric.ShowSet();
                 }
                 else
                 {
@@ -128,6 +67,7 @@ namespace HoistingCrane
 
         private void ButtonRemoveHoistingCrane_Click(object sender, EventArgs e)
         {
+            if (string.IsNullOrEmpty(maskedTextBoxPosition.Text))
             {
                 return;
             }
@@ -136,8 +76,10 @@ namespace HoistingCrane
                 return;
             }
             int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
+            if (_mapHoistingCraneCollectionGeneric - pos == null)
             {
                 MessageBox.Show("Объект удален");
+                pictureBox.Image = _mapHoistingCraneCollectionGeneric.ShowSet();
             }
             else
             {
@@ -147,20 +89,25 @@ namespace HoistingCrane
 
         private void ButtonShowStorage_Click(object sender, EventArgs e)
         {
+            if (_mapHoistingCraneCollectionGeneric == null)
             {
                 return;
             }
+            pictureBox.Image = _mapHoistingCraneCollectionGeneric.ShowSet();
         }
 
         private void ButtonShowOnMap_Click(object sender, EventArgs e)
         {
+            if (_mapHoistingCraneCollectionGeneric == null)
             {
                 return;
             }
+            pictureBox.Image = _mapHoistingCraneCollectionGeneric.ShowOnMap();
         }
 
         private void ButtonMove_Click(object sender, EventArgs e)
         {
+            if (_mapHoistingCraneCollectionGeneric == null)
             {
                 return;
             }

HoistingCrane/HoistingCrane/MapWithSetHoistingCraneGeneric.cs

@@ -107,6 +107,7 @@ namespace HoistingCrane
             }
         }
 
+        private void DrawBulldozers(Graphics gr)
         {
             int heightEl = _pictureHeight / _placeSizeHeight;
             int widthEl = _pictureWidth / _placeSizeWidth;