Zyzf/PIbd-22_Kalyshev_Y_V_MotorBoat_Base
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Laba7 PIbd-22 Kalyshev Y V #10

Closed
Zyzf wants to merge 4 commits from Laba7 into Laba6
pull from: Laba7
merge into: Zyzf:Laba6
Conversation 0 Commits 4 Files Changed 9 +91 -32
5 changed files with 91 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fd438decf0 - Show all commits

19
PIbd-22_Kalyshev_Y_V_MotorBoat_Base/BoatNotFoundException.cs Normal file
View File

@ -0,0 +1,19 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.Serialization;
using System.Text;
using System.Threading.Tasks;
namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base
{
[Serializable]
internal class BoatNotFoundException : ApplicationException
{
public BoatNotFoundException(int i) : base($"Не найден объект по позиции {i}") { }
public BoatNotFoundException() : base() { }
public BoatNotFoundException(string message) : base(message) { }
public BoatNotFoundException(string message, Exception exception) : base(message, exception) { }
protected BoatNotFoundException(SerializationInfo info, StreamingContext context) : base(info, context) { }
}
}

58
PIbd-22_Kalyshev_Y_V_MotorBoat_Base/FormMapWithSetBoats.cs
View File

@ -114,15 +114,26 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base
return;
}
DrawningObjectBoat boat = new DrawningObjectBoat(drawingBoats);
if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + boat != -1)
try
{
MessageBox.Show("Object added");
pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
}
else
if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + boat != -1)
{
MessageBox.Show("Объект добавлен");
pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
}
else
{
MessageBox.Show("Невозможно добавить объект");
}
} catch (StorageOverflowException ex)
{
MessageBox.Show("Cant add object");
MessageBox.Show($"Ошибка добавления: {ex.Message}");
}
catch (Exception ex)
{
MessageBox.Show($"Неизвестная ошибка: {ex.Message}");
}
}
/// <summary>
/// Удаление объекта
@ -144,14 +155,23 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base
return;
}
int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] - pos != null)
try
{
MessageBox.Show("Объект удален");
pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
}
else
if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] - pos != null)
{
MessageBox.Show("Объект удален");
pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
}
else
{
MessageBox.Show("Не удалось удалить объект");
}
} catch (BoatNotFoundException ex)
{
MessageBox.Show("Не удалось удалить объект");
MessageBox.Show($"Ошибка удаления: {ex.Message}");
} catch (Exception ex)
{
MessageBox.Show($"Неизвестная ошибка: {ex.Message}");
}
}
/// <summary>
@ -221,13 +241,13 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base
{
if (saveFileDialog.ShowDialog() == DialogResult.OK)
{
if (_mapsCollection.SaveData(saveFileDialog.FileName))
try
{
_mapsCollection.SaveData(saveFileDialog.FileName);
MessageBox.Show("Сохранение прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
else
} catch(Exception ex)
{
MessageBox.Show("Не сохранилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
MessageBox.Show($"Не сохранилось: {ex.Message}", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
}
@ -240,12 +260,12 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base
{
if (openFileDialog.ShowDialog() == DialogResult.OK)
{
if (_mapsCollection.LoadData(openFileDialog.FileName))
try
{
_mapsCollection.LoadData(openFileDialog.FileName);
ReloadMaps();
MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
else
} catch (Exception ex)
{
MessageBox.Show("Не загрузилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
}

10
PIbd-22_Kalyshev_Y_V_MotorBoat_Base/MapsCollection.cs
View File

@ -94,7 +94,7 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base
/// </summary>
/// <param name="filename">Путь и имя файла</param>
/// <returns></returns>
public bool SaveData(string filename)
public void SaveData(string filename)
{
if (File.Exists(filename))
{
@ -109,18 +109,17 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base
sw.WriteLine($"{storage.Key}{separatorDict}{storage.Value.GetData(separatorDict, separatorData)}{Environment.NewLine}");
}
}
return true;
}
/// <summary>
/// Загрузка нформации по автомобилям на парковках из файла
/// </summary>
/// <param name="filename"></param>
/// <returns></returns>
public bool LoadData(string filename)
public void LoadData(string filename)
{
if (!File.Exists(filename))
{
return false;
throw new Exception("Файл не найден");
}
using (StreamReader sr = new StreamReader(filename))
{
@ -132,7 +131,7 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base
{
if (!str.Contains("MapsCollection"))
{
return false;
throw new Exception("Формат данных в файле не правильный");
} else
{
count++;
@ -154,7 +153,6 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base
_mapStorages.Add(elem[0], new MapWithSetBoatsGeneric<IDrawningObject, AbstractMap>(_pictureWidth, _pictureHeight, map));
_mapStorages[elem[0]].LoadData(elem[2].Split(separatorData, StringSplitOptions.RemoveEmptyEntries));
}
return true;
}
}
}

17
PIbd-22_Kalyshev_Y_V_MotorBoat_Base/SetBoatsGeneric.cs
View File

@ -55,14 +55,17 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base
/// <param name="boat">Добавляемый автомобиль</param>
/// <param name="position">Позиция</param>
/// <returns></returns>
public bool Insert(T boat, int position)
public void Insert(T boat, int position)
{
if (position < 0 || position > _places.Count)
if (_places.Count < _maxCount)
{
return false;
if (position < 0 || position > _places.Count)
{
throw new StorageOverflowException();
}
_places.Insert(position, boat);
}
_places.Insert(position, boat);
return true;
return;
}
/// <summary>
/// Удаление объекта из набора с конкретной позиции
@ -73,11 +76,11 @@ namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base
{
if (position < 0 || position > _places.Count)
{
return null;
throw new BoatNotFoundException(position);
}
if (_places[position] == null)
{
return null;
throw new BoatNotFoundException(position);
}
T removed = _places[position];
_places.RemoveAt(position);

19
PIbd-22_Kalyshev_Y_V_MotorBoat_Base/StorageOverflowException.cs Normal file
View File

@ -0,0 +1,19 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.Serialization;
using System.Text;
using System.Threading.Tasks;
namespace PIbd_22_Kalyshev_Y_V_MotorBoat_Base
{
[Serializable]
internal class StorageOverflowException : ApplicationException
{
public StorageOverflowException(int count) : base($"В наборе превышено допустимое количество: {count} элементов") { }
public StorageOverflowException() :base() { }
public StorageOverflowException(string message) : base(message) { }
public StorageOverflowException(string message, Exception exception) : base(message, exception) { }
protected StorageOverflowException(SerializationInfo info, StreamingContext context) : base(info, context) { }
}
}