diff --git a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base/FormMapWithSetBoats.cs b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base/FormMapWithSetBoats.cs index c0a410f..f4239bb 100644 --- a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base/FormMapWithSetBoats.cs +++ b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base/FormMapWithSetBoats.cs @@ -75,7 +75,7 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base /// private void ListBoxMaps_SelectedIndexChanged(object sender, EventArgs e) { - pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet(); + pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowOnMap(); } /// /// Удаление карты diff --git a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base/MapsCollection.cs b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base/MapsCollection.cs index c94f3cc..8ddce4a 100644 --- a/PIbd-22_Kalyshev_Y_V_MotorBoat_Base/MapsCollection.cs +++ b/PIbd-22_Kalyshev_Y_V_MotorBoat_Base/MapsCollection.cs @@ -45,6 +45,18 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base /// Карта public void AddMap(string name, AbstractMap map) { + if (name == null) + { + return; + } + foreach (var key in _mapStorages.Keys) + { + if (key.Equals(name)) + { + MessageBox.Show("Объект с таким именем существует!"); + return; + } + } _mapStorages.Add(name, new MapWithSetBoatsGeneric(_pictureWidth, _pictureHeight, map)); } ///