SemkaKMLV/PIbd-21_Komlev_S.I._GasolineTanker._Base
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Komlev_S.I. Lab7 #9

Closed
SemkaKMLV wants to merge 3 commits from Lab7 into Lab6
pull from: Lab7
merge into: SemkaKMLV:Lab6
Conversation 0 Commits 3 Files Changed 9 +77 -17
5 changed files with 77 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ee1f6c1637 - Show all commits

37
GasolineTanker/GasolineTanker/FormMapWithSetTankers.cs
View File

@ -126,14 +126,26 @@ namespace GasolineTanker
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();
var deletedTanker = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] - pos;
if (deletedTanker != null)
{
MessageBox.Show("Объект удален");
pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
}
else
{
MessageBox.Show("Не удалось удалить объект");
}
}
else
catch (TankerNotFoundException ex)
{
MessageBox.Show("Не удалось удалить объект");
MessageBox.Show($"Ошибка удаления: {ex.Message}");
}
catch (Exception ex)
{
MessageBox.Show($"Неизвестная ошибка: {ex.Message}");
}
}
@ -184,13 +196,15 @@ namespace GasolineTanker
{
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);
}
}
}
@ -203,14 +217,15 @@ namespace GasolineTanker
{
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);
MessageBox.Show($"Не загрузилось:{ex.Message}", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
}

10
GasolineTanker/GasolineTanker/MapsCollection.cs
View File

@ -54,7 +54,7 @@ namespace GasolineTanker
/// </summary>
/// <param name="filename">Путь и имя файла</param>
/// <returns></returns>
public bool SaveData(string filename)
public void SaveData(string filename)
{
if (File.Exists(filename))
{
@ -68,7 +68,6 @@ namespace GasolineTanker
sw.Write($"{storage.Key}{separatorDict}{storage.Value.GetData(separatorDict, separatorData)}{Environment.NewLine}");
}
}
return true;
}
/// <summary>
@ -76,18 +75,18 @@ namespace GasolineTanker
/// </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 FileNotFoundException("Файл не найден");
}
using (StreamReader sr = new(filename))
{
string str = "";
if ((str = sr.ReadLine()) == null || !str.Contains("MapsCollection"))
{
return false;
throw new FileFormatException("Формат данных в файле не правильный");
}
_mapStorages.Clear();
while ((str = sr.ReadLine()) != null)
@ -111,7 +110,6 @@ namespace GasolineTanker
_mapStorages[tempElem[0]].LoadData(tempElem[2].Split(separatorData, StringSplitOptions.RemoveEmptyEntries));
}
}
return true;
}
}
}

9
GasolineTanker/GasolineTanker/SetTankersGeneric.cs
View File

@ -18,7 +18,12 @@
return Insert(tanker, 0);
}
public int Insert(T tanker, int position)
{
if (Count == _maxCount)
{
throw new StorageOverflowException(_maxCount);
}
if (position <= _places.Count && _places.Count < _maxCount && position >= 0)
{
_places.Insert(position, tanker);
@ -29,6 +34,10 @@
}
public T Remove(int position)
{
if (position >= Count || position < 0)
{
throw new TankerNotFoundException(position);
}
if (position < _places.Count && position >= 0)
{
var tanker = _places[position];

19
GasolineTanker/GasolineTanker/StorageOverflowException.cs Normal file
View File

@ -0,0 +1,19 @@
using System;
using System.Collections.Generic;
using System.Runtime.Serialization;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace GasolineTanker
{
[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) { }
}
}

19
GasolineTanker/GasolineTanker/TankerNotFoundException.cs Normal file
View File

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