b0n3l3sS/PIbd-23_Mochalov_D.V._Locomotive_Base
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: b0n3l3sS:3f65961713e6f89900488d2e6892eb3e38524eeb
Branches Tags
b0n3l3sS:master
b0n3l3sS:LabWork08
b0n3l3sS:LabWork07
b0n3l3sS:LabWork06
b0n3l3sS:LabWork04
b0n3l3sS:LabWork05
b0n3l3sS:LabWork03
b0n3l3sS:LabWork02
b0n3l3sS:LabWork01
..
compare: b0n3l3sS:7f15f74c84aae140c658a95bbab7357ab199abf5
Branches Tags
b0n3l3sS:LabWork08
b0n3l3sS:LabWork07
b0n3l3sS:LabWork06
b0n3l3sS:LabWork04
b0n3l3sS:LabWork05
b0n3l3sS:LabWork03
b0n3l3sS:LabWork02
b0n3l3sS:LabWork01
b0n3l3sS:master

No commits in common. "3f65961713e6f89900488d2e6892eb3e38524eeb" and "7f15f74c84aae140c658a95bbab7357ab199abf5" have entirely different histories.
3f65961713 ... 7f15f74c84

8 changed files with 46 additions and 140 deletions
Show Stats Expand all files Collapse all files

59
Locomotive/Locomotive/FormMapWithSetLocomotives.cs
View File

@ -1,6 +1,4 @@
using Serilog;
using Serilog.Formatting.Compact;
using System;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@ -23,8 +21,6 @@ namespace Locomotive
};
/// Объект от коллекции карт
private readonly MapsCollection _mapsCollection;
/// Конструктор
public FormMapWithSetLocomotives()
{
@ -68,14 +64,12 @@ namespace Locomotive
return;
}
_mapsCollection.AddMap(textBoxNewMapName.Text, _mapsDict[comboBoxSelectorMap.Text]);
Log.Information($"Map {textBoxNewMapName.Text} added");
ReloadMaps();
}
/// Выбор карты
private void listBoxMaps_SelectedIndexChanged(object sender, EventArgs e)
{
pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
Log.Information($"Map switched to {listBoxMaps.SelectedItem?.ToString() ?? string.Empty}");
}
/// Удаление карты
private void buttonDeleteMap_Click(object sender, EventArgs e)
@ -87,7 +81,6 @@ namespace Locomotive
if (MessageBox.Show($"Delete map {listBoxMaps.SelectedItem}?","Deleting", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
{
_mapsCollection.DelMap(listBoxMaps.SelectedItem?.ToString() ?? string.Empty);
Log.Information($"Map {listBoxMaps.SelectedItem?.ToString() ?? string.Empty} deleted");
ReloadMaps();
}
}
@ -106,28 +99,16 @@ namespace Locomotive
return;
}
try
{
if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + new DrawningObjectLocomotive(locomotive) != -1)
{
MessageBox.Show("Object added");
pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
Log.Information($"Object {locomotive} added");
}
else
{
MessageBox.Show("Failed to add object");
}
}
catch(StorageOverflowException ex)
{
MessageBox.Show($"Storage overflow error: {ex.Message}");
}
catch (Exception ex)
{
MessageBox.Show($"Unknown error: {ex.Message}");
}
}
@ -147,12 +128,9 @@ namespace Locomotive
return;
}
int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
try
{
if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] - pos != null)
{
MessageBox.Show("Object removed");
Log.Information($"Locomotive at {pos} deleted");
pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
}
else
@ -160,16 +138,6 @@ namespace Locomotive
MessageBox.Show("Failed to remove object");
}
}
catch(LocomotiveNotFoundException ex)
{
MessageBox.Show($"Delete error: {ex.Message}");
}
catch (Exception ex)
{
MessageBox.Show($"Unknown error: {ex.Message}");
}
}
/// Вывод набора
private void buttonShowStorage_Click(object sender, EventArgs e)
{
@ -222,15 +190,13 @@ namespace Locomotive
{
if (saveFileDialog.ShowDialog() == DialogResult.OK)
{
try
if (_mapsCollection.SaveData(saveFileDialog.FileName))
{
_mapsCollection.SaveData(saveFileDialog.FileName);
MessageBox.Show("Saving success", "Result", MessageBoxButtons.OK, MessageBoxIcon.Information);
Log.Information($"Saved to {saveFileDialog.FileName}");
MessageBox.Show("Saved successfully", "Result", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
catch (Exception ex)
else
{
MessageBox.Show($"Saving error: {ex.Message}", "Result",MessageBoxButtons.OK, MessageBoxIcon.Error);
MessageBox.Show("Saving failed", "Result", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
}
@ -239,20 +205,17 @@ namespace Locomotive
{
if (loadFileDialog.ShowDialog() == DialogResult.OK)
{
try
if (_mapsCollection.LoadData(loadFileDialog.FileName))
{
_mapsCollection.LoadData(loadFileDialog.FileName);
MessageBox.Show("Loaded successfully", "Result", MessageBoxButtons.OK, MessageBoxIcon.Information);
Log.Information($"Loaded from {loadFileDialog.FileName}");
}
else
{
MessageBox.Show("Loading failed", "Result", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
ReloadMaps();
pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
}
catch(Exception ex)
{
MessageBox.Show($"Loading failed + {ex.Message}", "Result", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
}
}
}

7
Locomotive/Locomotive/Locomotive.csproj
View File

@ -8,13 +8,6 @@
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Serilog" Version="2.12.0" />
<PackageReference Include="Serilog.Formatting.Compact" Version="1.1.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
</ItemGroup>
<ItemGroup>
<Compile Update="Properties\Resources.Designer.cs">
<DesignTime>True</DesignTime>

19
Locomotive/Locomotive/LocomotiveNotFoundException.cs
View File

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

10
Locomotive/Locomotive/MapWithSetLocomotivesGeneric.cs
View File

@ -15,9 +15,9 @@ namespace Locomotive
/// Высота окна отрисовки
private readonly int _pictureHeight;
/// Размер занимаемого объектом места (ширина)
private readonly int _placeSizeWidth = 150;
private readonly int _placeSizeWidth = 210;
/// Размер занимаемого объектом места (высота)
private readonly int _placeSizeHeight = 150;
private readonly int _placeSizeHeight = 90;
/// Набор объектов
private readonly SetLocomotivesGeneric<T> _setLocomotives;
/// Карта
@ -138,8 +138,8 @@ namespace Locomotive
/// Метод прорисовки объектов
private void DrawLocomotives(Graphics g)
{
int width = _pictureWidth / _placeSizeWidth - 1;
int height = _pictureHeight / _placeSizeHeight - 1;
int width = _pictureWidth / _placeSizeWidth;
int height = _pictureHeight / _placeSizeHeight;
int curWidth = 0;
int curHeight = 0;
@ -147,7 +147,7 @@ namespace Locomotive
foreach (var locomotive in _setLocomotives.GetLocomotives())
{
// установка позиции
locomotive?.SetObject(curWidth * _placeSizeWidth + 10, curHeight * _placeSizeHeight + 80, _pictureWidth, _pictureHeight);
locomotive?.SetObject(curWidth * _placeSizeWidth + 10, curHeight * _placeSizeHeight + 15, _pictureWidth, _pictureHeight);
locomotive?.DrawningObject(g);
if (curWidth < width) curWidth++;
else

16
Locomotive/Locomotive/MapsCollection.cs
View File

@ -1,5 +1,4 @@
using Serilog;
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@ -55,7 +54,7 @@ namespace Locomotive
}
/// Сохранение информации по локомотивам в хранилище в файл
public void SaveData(string filename)
public bool SaveData(string filename)
{
if (File.Exists(filename))
{
@ -73,14 +72,14 @@ namespace Locomotive
);
}
}
return true;
}
/// Загрузка нформации по локомотивам в депо из файла
public void LoadData(string filename)
public bool LoadData(string filename)
{
if (!File.Exists(filename))
{
Log.Warning($"FileNotFoundException {filename}");
throw new FileNotFoundException("Файл не найден");
return false;
}
using (FileStream fs = new(filename, FileMode.Open))
using (StreamReader sr = new StreamReader(fs, Encoding.UTF8))
@ -89,8 +88,7 @@ namespace Locomotive
if (!curLine.Contains("MapsCollection"))
{
Log.Warning($"FileFormatException");
throw new FileFormatException("Формат данных в файле неправильный");
return false;
}
_mapStorages.Clear();
@ -115,6 +113,8 @@ namespace Locomotive
_mapStorages.Add(elems[0], new MapWithSetLocomotivesGeneric<IDrawningObject, AbstractMap>(_pictureWidth, _pictureHeight, map));
_mapStorages[elems[0]].LoadData(elems[2].Split(separatorData, StringSplitOptions.RemoveEmptyEntries));
}
return true;
}

5
Locomotive/Locomotive/Program.cs
View File

@ -1,5 +1,3 @@
using Serilog;
namespace Locomotive
{
internal static class Program
@ -12,9 +10,6 @@ namespace Locomotive
{
// To customize application configuration such as set high DPI settings or default font,
// see https://aka.ms/applicationconfiguration.
Log.Logger = new LoggerConfiguration().WriteTo.File(new Serilog.Formatting.Compact.CompactJsonFormatter(), "C:\\secondCourse\\OOP\\ProjectLomotive\\Locomotive\\log.clef").CreateLogger();
ApplicationConfiguration.Initialize();
Application.Run(new FormMapWithSetLocomotives());
}

26
Locomotive/Locomotive/SetLocomotivesGeneric.cs
View File

@ -1,5 +1,4 @@
using Serilog;
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@ -31,11 +30,7 @@ namespace Locomotive
/// Добавление объекта в набор на конкретную позицию
public int Insert(T locomotive, int position)
{
if (position < 0) return -1;
if (Count >= _maxCount) {
Log.Warning("StorageOverflowException");
throw new StorageOverflowException(_maxCount);
}
if (position >= _maxCount|| position < 0) return -1;
_places.Insert(position, locomotive);
return position;
@ -44,13 +39,8 @@ namespace Locomotive
public T Remove(int position)
{
if (position >= _maxCount || position < 0) return null;
if (_places[position] is null)
{
Log.Warning($"LocomotiveNotFoundException at {position}");
throw new LocomotiveNotFoundException(position);
}
T result = _places[position];
_places[position] = null; // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! РАНЬШЕ REMOVE
_places.RemoveAt(position);
return result;
}
// Индексатор
@ -72,10 +62,14 @@ namespace Locomotive
{
foreach (var locomotive in _places)
{
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! РАНЬШЕ ВОЗВРАЩАЛОСЬ ТОЛЬКО ЕСЛИ НЕ НУЛЛ
if (locomotive != null)
{
yield return locomotive;
}
else
{
yield break;
}
}
}
}

20
Locomotive/Locomotive/StorageOverflowException.cs
View File

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