ПИбд-21 Ярускин Салих 7 лаб простая #7
@ -8,6 +8,18 @@
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
|
||||
<PackageReference Include="NLog.Extensions.Logging" Version="5.3.5" />
|
||||
<PackageReference Include="Serilog" Version="3.1.1" />
|
||||
<PackageReference Include="Serilog.Extensions.Hosting" Version="8.0.0" />
|
||||
<PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
|
||||
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
|
||||
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Compile Update="Properties\Resources.Designer.cs">
|
||||
<DesignTime>True</DesignTime>
|
||||
|
@ -43,15 +43,14 @@ namespace AirBomber.Generics
|
||||
return collect._collection.Insert(obj);
|
||||
}
|
||||
|
||||
public static bool operator -(BomberGenericCollection<T, U> collect, int
|
||||
pos)
|
||||
public static T? operator -(BomberGenericCollection<T, U> collect, int pos)
|
||||
{
|
||||
T? obj = collect._collection[pos];
|
||||
if (obj == null)
|
||||
if (obj != null)
|
||||
{
|
||||
return false;
|
||||
collect._collection.Remove(pos);
|
||||
}
|
||||
return collect._collection.Remove(pos);
|
||||
return obj;
|
||||
}
|
||||
|
||||
public U? GetU(int pos)
|
||||
@ -104,6 +103,5 @@ namespace AirBomber.Generics
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -4,6 +4,7 @@ using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using AirBomber.DrawningObjects;
|
||||
using AirBomber.Exceptions;
|
||||
using AirBomber.MovementStrategy;
|
||||
|
||||
namespace AirBomber.Generics
|
||||
@ -77,7 +78,7 @@ namespace AirBomber.Generics
|
||||
return null;
|
||||
}
|
||||
}
|
||||
public bool SaveData(string filename)
|
||||
public void SaveData(string filename)
|
||||
{
|
||||
if (File.Exists(filename))
|
||||
{
|
||||
@ -95,15 +96,13 @@ namespace AirBomber.Generics
|
||||
}
|
||||
if (data.Length == 0)
|
||||
{
|
||||
return false;
|
||||
throw new InvalidOperationException("Невалидная операция, нет данных для сохранения");
|
||||
}
|
||||
|
||||
using (StreamWriter writer = new StreamWriter(filename))
|
||||
{
|
||||
writer.Write($"BomberStorage{Environment.NewLine}{data}");
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@ -111,11 +110,11 @@ namespace AirBomber.Generics
|
||||
/// </summary>
|
||||
/// <param name="filename">Путь и имя файла</param>
|
||||
/// <returns>true - загрузка прошла успешно, false - ошибка при загрузке данных</returns>
|
||||
public bool LoadData(string filename)
|
||||
public void LoadData(string filename)
|
||||
{
|
||||
if (!File.Exists(filename))
|
||||
{
|
||||
return false;
|
||||
throw new FileNotFoundException("Файл не найден");
|
||||
}
|
||||
|
||||
using (StreamReader reader = new StreamReader(filename))
|
||||
@ -123,11 +122,11 @@ namespace AirBomber.Generics
|
||||
string cheker = reader.ReadLine();
|
||||
if (cheker == null)
|
||||
{
|
||||
return false;
|
||||
throw new Exception("Нет данных для загрузки");
|
||||
}
|
||||
if (!cheker.StartsWith("BomberStorage"))
|
||||
{
|
||||
return false;
|
||||
throw new FormatException("Неверный формат ввода");
|
||||
}
|
||||
_bomberStorage.Clear();
|
||||
string strs;
|
||||
@ -136,31 +135,35 @@ namespace AirBomber.Generics
|
||||
{
|
||||
if (strs == null && firstinit)
|
||||
{
|
||||
return false;
|
||||
throw new Exception("Нет данных для загрузки");
|
||||
}
|
||||
if (strs == null)
|
||||
{
|
||||
return false;
|
||||
break;
|
||||
}
|
||||
firstinit = false;
|
||||
string name = strs.Split(_separatorForKeyValue)[0];
|
||||
BomberGenericCollection<DrawningBomber, DrawningObjectBomber> collection = new(_pictureWidth, _pictureHeight);
|
||||
foreach (string data in strs.Split(_separatorForKeyValue)[1].Split(_separatorRecords))
|
||||
{
|
||||
DrawningBomber? usta =
|
||||
DrawningBomber? air =
|
||||
data?.CreateDrawningBomber(_separatorForObject, _pictureWidth, _pictureHeight);
|
||||
if (usta != null)
|
||||
if (air != null)
|
||||
{
|
||||
int? result = collection + usta;
|
||||
if (result == null || result.Value == -1)
|
||||
try { _ = collection + air; }
|
||||
catch (BomberNotFoundException e)
|
||||
{
|
||||
return false;
|
||||
throw e;
|
||||
}
|
||||
catch (StorageOverflowException e)
|
||||
{
|
||||
throw e;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
_bomberStorage.Add(name, collection);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
19
AirBomber/BomberNotFoundException.cs
Normal file
19
AirBomber/BomberNotFoundException.cs
Normal 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 AirBomber.Exceptions
|
||||
{
|
||||
[Serializable]
|
||||
internal class BomberNotFoundException : ApplicationException
|
||||
{
|
||||
public BomberNotFoundException(int i) : base($"Не найден объект по позиции {i}") { }
|
||||
public BomberNotFoundException() : base() { }
|
||||
public BomberNotFoundException(string message) : base(message) { }
|
||||
public BomberNotFoundException(string message, Exception exception) : base(message, exception) { }
|
||||
protected BomberNotFoundException(SerializationInfo info, StreamingContext contex) : base(info, contex) { }
|
||||
}
|
||||
}
|
73
AirBomber/FormBomberCollection.Designer.cs
generated
73
AirBomber/FormBomberCollection.Designer.cs
generated
@ -58,9 +58,11 @@
|
||||
Tools.Controls.Add(ButtonRemoveBomber);
|
||||
Tools.Controls.Add(ButtonAddBomber);
|
||||
Tools.Controls.Add(MessageBoxBomber);
|
||||
Tools.Location = new Point(538, 5);
|
||||
Tools.Location = new Point(471, 4);
|
||||
Tools.Margin = new Padding(3, 2, 3, 2);
|
||||
Tools.Name = "Tools";
|
||||
Tools.Size = new Size(250, 556);
|
||||
Tools.Padding = new Padding(3, 2, 3, 2);
|
||||
Tools.Size = new Size(219, 417);
|
||||
Tools.TabIndex = 0;
|
||||
Tools.TabStop = false;
|
||||
Tools.Text = "Инструменты";
|
||||
@ -71,18 +73,21 @@
|
||||
Kit.Controls.Add(AddKit);
|
||||
Kit.Controls.Add(KitTextbox);
|
||||
Kit.Controls.Add(listBoxStorages);
|
||||
Kit.Location = new Point(17, 33);
|
||||
Kit.Location = new Point(15, 25);
|
||||
Kit.Margin = new Padding(3, 2, 3, 2);
|
||||
Kit.Name = "Kit";
|
||||
Kit.Size = new Size(227, 282);
|
||||
Kit.Padding = new Padding(3, 2, 3, 2);
|
||||
Kit.Size = new Size(199, 212);
|
||||
Kit.TabIndex = 4;
|
||||
Kit.TabStop = false;
|
||||
Kit.Text = "Наборы";
|
||||
//
|
||||
// RemoveKit
|
||||
//
|
||||
RemoveKit.Location = new Point(11, 231);
|
||||
RemoveKit.Location = new Point(10, 173);
|
||||
RemoveKit.Margin = new Padding(3, 2, 3, 2);
|
||||
RemoveKit.Name = "RemoveKit";
|
||||
RemoveKit.Size = new Size(193, 36);
|
||||
RemoveKit.Size = new Size(169, 27);
|
||||
RemoveKit.TabIndex = 3;
|
||||
RemoveKit.Text = "Удалить набор";
|
||||
RemoveKit.UseVisualStyleBackColor = true;
|
||||
@ -90,9 +95,10 @@
|
||||
//
|
||||
// AddKit
|
||||
//
|
||||
AddKit.Location = new Point(11, 63);
|
||||
AddKit.Location = new Point(10, 47);
|
||||
AddKit.Margin = new Padding(3, 2, 3, 2);
|
||||
AddKit.Name = "AddKit";
|
||||
AddKit.Size = new Size(193, 36);
|
||||
AddKit.Size = new Size(169, 27);
|
||||
AddKit.TabIndex = 2;
|
||||
AddKit.Text = "Добавить набор";
|
||||
AddKit.UseVisualStyleBackColor = true;
|
||||
@ -100,26 +106,29 @@
|
||||
//
|
||||
// KitTextbox
|
||||
//
|
||||
KitTextbox.Location = new Point(15, 30);
|
||||
KitTextbox.Location = new Point(13, 22);
|
||||
KitTextbox.Margin = new Padding(3, 2, 3, 2);
|
||||
KitTextbox.Name = "KitTextbox";
|
||||
KitTextbox.Size = new Size(189, 27);
|
||||
KitTextbox.Size = new Size(166, 23);
|
||||
KitTextbox.TabIndex = 1;
|
||||
//
|
||||
// listBoxStorages
|
||||
//
|
||||
listBoxStorages.FormattingEnabled = true;
|
||||
listBoxStorages.ItemHeight = 20;
|
||||
listBoxStorages.Location = new Point(11, 109);
|
||||
listBoxStorages.ItemHeight = 15;
|
||||
listBoxStorages.Location = new Point(10, 82);
|
||||
listBoxStorages.Margin = new Padding(3, 2, 3, 2);
|
||||
listBoxStorages.Name = "listBoxStorages";
|
||||
listBoxStorages.Size = new Size(193, 104);
|
||||
listBoxStorages.Size = new Size(169, 79);
|
||||
listBoxStorages.TabIndex = 0;
|
||||
listBoxStorages.SelectedIndexChanged += ListBoxObjects_SelectedIndexChanged;
|
||||
//
|
||||
// ButtonRefreshCollection
|
||||
//
|
||||
ButtonRefreshCollection.Location = new Point(28, 448);
|
||||
ButtonRefreshCollection.Location = new Point(24, 336);
|
||||
ButtonRefreshCollection.Margin = new Padding(3, 2, 3, 2);
|
||||
ButtonRefreshCollection.Name = "ButtonRefreshCollection";
|
||||
ButtonRefreshCollection.Size = new Size(193, 37);
|
||||
ButtonRefreshCollection.Size = new Size(169, 28);
|
||||
ButtonRefreshCollection.TabIndex = 3;
|
||||
ButtonRefreshCollection.Text = "Обновить коллекцию";
|
||||
ButtonRefreshCollection.UseVisualStyleBackColor = true;
|
||||
@ -127,9 +136,10 @@
|
||||
//
|
||||
// ButtonRemoveBomber
|
||||
//
|
||||
ButtonRemoveBomber.Location = new Point(28, 401);
|
||||
ButtonRemoveBomber.Location = new Point(24, 301);
|
||||
ButtonRemoveBomber.Margin = new Padding(3, 2, 3, 2);
|
||||
ButtonRemoveBomber.Name = "ButtonRemoveBomber";
|
||||
ButtonRemoveBomber.Size = new Size(193, 41);
|
||||
ButtonRemoveBomber.Size = new Size(169, 31);
|
||||
ButtonRemoveBomber.TabIndex = 2;
|
||||
ButtonRemoveBomber.Text = "Удалить самолёт";
|
||||
ButtonRemoveBomber.UseVisualStyleBackColor = true;
|
||||
@ -137,9 +147,10 @@
|
||||
//
|
||||
// ButtonAddBomber
|
||||
//
|
||||
ButtonAddBomber.Location = new Point(28, 321);
|
||||
ButtonAddBomber.Location = new Point(24, 241);
|
||||
ButtonAddBomber.Margin = new Padding(3, 2, 3, 2);
|
||||
ButtonAddBomber.Name = "ButtonAddBomber";
|
||||
ButtonAddBomber.Size = new Size(193, 41);
|
||||
ButtonAddBomber.Size = new Size(169, 31);
|
||||
ButtonAddBomber.TabIndex = 1;
|
||||
ButtonAddBomber.Text = "Добавить самолёт";
|
||||
ButtonAddBomber.UseVisualStyleBackColor = true;
|
||||
@ -147,16 +158,18 @@
|
||||
//
|
||||
// MessageBoxBomber
|
||||
//
|
||||
MessageBoxBomber.Location = new Point(28, 368);
|
||||
MessageBoxBomber.Location = new Point(24, 276);
|
||||
MessageBoxBomber.Margin = new Padding(3, 2, 3, 2);
|
||||
MessageBoxBomber.Name = "MessageBoxBomber";
|
||||
MessageBoxBomber.Size = new Size(193, 27);
|
||||
MessageBoxBomber.Size = new Size(169, 23);
|
||||
MessageBoxBomber.TabIndex = 0;
|
||||
//
|
||||
// PicBoxBomberCollection
|
||||
//
|
||||
PicBoxBomberCollection.Location = new Point(0, 38);
|
||||
PicBoxBomberCollection.Location = new Point(7, 28);
|
||||
PicBoxBomberCollection.Margin = new Padding(3, 2, 3, 2);
|
||||
PicBoxBomberCollection.Name = "PicBoxBomberCollection";
|
||||
PicBoxBomberCollection.Size = new Size(473, 563);
|
||||
PicBoxBomberCollection.Size = new Size(473, 422);
|
||||
PicBoxBomberCollection.TabIndex = 1;
|
||||
PicBoxBomberCollection.TabStop = false;
|
||||
//
|
||||
@ -166,7 +179,8 @@
|
||||
menuStrip.Items.AddRange(new ToolStripItem[] { fileToolStripMenuItem });
|
||||
menuStrip.Location = new Point(0, 0);
|
||||
menuStrip.Name = "menuStrip";
|
||||
menuStrip.Size = new Size(800, 28);
|
||||
menuStrip.Padding = new Padding(5, 2, 0, 2);
|
||||
menuStrip.Size = new Size(700, 24);
|
||||
menuStrip.TabIndex = 2;
|
||||
menuStrip.Text = "Файл";
|
||||
//
|
||||
@ -174,20 +188,20 @@
|
||||
//
|
||||
fileToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { SaveToolStripMenuItem, LoadToolStripMenuItem });
|
||||
fileToolStripMenuItem.Name = "fileToolStripMenuItem";
|
||||
fileToolStripMenuItem.Size = new Size(59, 24);
|
||||
fileToolStripMenuItem.Size = new Size(48, 20);
|
||||
fileToolStripMenuItem.Text = "Файл";
|
||||
//
|
||||
// SaveToolStripMenuItem
|
||||
//
|
||||
SaveToolStripMenuItem.Name = "SaveToolStripMenuItem";
|
||||
SaveToolStripMenuItem.Size = new Size(224, 26);
|
||||
SaveToolStripMenuItem.Size = new Size(141, 22);
|
||||
SaveToolStripMenuItem.Text = "Сохранение";
|
||||
SaveToolStripMenuItem.Click += SaveToolStripMenuItem_Click;
|
||||
//
|
||||
// LoadToolStripMenuItem
|
||||
//
|
||||
LoadToolStripMenuItem.Name = "LoadToolStripMenuItem";
|
||||
LoadToolStripMenuItem.Size = new Size(224, 26);
|
||||
LoadToolStripMenuItem.Size = new Size(141, 22);
|
||||
LoadToolStripMenuItem.Text = "Загрузка";
|
||||
LoadToolStripMenuItem.Click += LoadToolStripMenuItem_Click;
|
||||
//
|
||||
@ -203,13 +217,14 @@
|
||||
//
|
||||
// FormBomberCollection
|
||||
//
|
||||
AutoScaleDimensions = new SizeF(8F, 20F);
|
||||
AutoScaleDimensions = new SizeF(7F, 15F);
|
||||
AutoScaleMode = AutoScaleMode.Font;
|
||||
ClientSize = new Size(800, 619);
|
||||
ClientSize = new Size(700, 467);
|
||||
Controls.Add(PicBoxBomberCollection);
|
||||
Controls.Add(Tools);
|
||||
Controls.Add(menuStrip);
|
||||
MainMenuStrip = menuStrip;
|
||||
Margin = new Padding(3, 2, 3, 2);
|
||||
Name = "FormBomberCollection";
|
||||
Text = "FormBomberCollection";
|
||||
Tools.ResumeLayout(false);
|
||||
|
@ -10,6 +10,9 @@ using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows.Forms;
|
||||
using System.Xml.Linq;
|
||||
using AirBomber.Exceptions;
|
||||
using Microsoft.Extensions.Logging;
|
||||
|
||||
namespace AirBomber
|
||||
{
|
||||
@ -17,10 +20,13 @@ namespace AirBomber
|
||||
{
|
||||
private readonly BomberGenericStorage _bomber;
|
||||
|
||||
public FormBomberCollection()
|
||||
private readonly ILogger _logger;
|
||||
|
||||
public FormBomberCollection(ILogger<FormBomberCollection> logger)
|
||||
{
|
||||
InitializeComponent();
|
||||
_bomber = new BomberGenericStorage(PicBoxBomberCollection.Width, PicBoxBomberCollection.Height);
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
private void ReloadObjects()
|
||||
@ -57,41 +63,45 @@ namespace AirBomber
|
||||
}
|
||||
PicBoxBomberCollection.Image = obj.ShowBomber();
|
||||
}
|
||||
private void AddBomber(DrawningBomber bomber)
|
||||
{
|
||||
|
||||
var obj = _bomber[listBoxStorages.SelectedItem.ToString() ?? string.Empty];
|
||||
if (obj == null)
|
||||
{
|
||||
_logger.LogWarning("Добавление пустого объекта");
|
||||
return;
|
||||
}
|
||||
try
|
||||
{
|
||||
_ = obj + bomber;
|
||||
|
||||
MessageBox.Show("Объект добавлен");
|
||||
PicBoxBomberCollection.Image = obj.ShowBomber();
|
||||
_logger.LogInformation($"Добавлен объект в набор {listBoxStorages.SelectedItem.ToString()}");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
MessageBox.Show("Не удалось добавить объект");
|
||||
_logger.LogWarning($"{ex.Message} в наборе {listBoxStorages.SelectedItem.ToString()}");
|
||||
}
|
||||
}
|
||||
private void ButtonAddBomber_Click(object sender, EventArgs e)
|
||||
{
|
||||
if (listBoxStorages.SelectedIndex == -1)
|
||||
{
|
||||
return;
|
||||
}
|
||||
var formBomberConfig = new FormBomberConfig();
|
||||
|
||||
formBomberConfig.AddEvent(bomber =>
|
||||
{
|
||||
if (listBoxStorages.SelectedIndex != -1)
|
||||
{
|
||||
var obj = _bomber[listBoxStorages.SelectedItem?.ToString() ?? string.Empty];
|
||||
if (obj != null)
|
||||
{
|
||||
if (obj + bomber != 1)
|
||||
{
|
||||
MessageBox.Show("Объект добавлен");
|
||||
PicBoxBomberCollection.Image = obj.ShowBomber();
|
||||
}
|
||||
else
|
||||
{
|
||||
MessageBox.Show("Не удалось добавить объект");
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
formBomberConfig.Show();
|
||||
FormBomberConfig form = new FormBomberConfig();
|
||||
form.Show();
|
||||
form.AddEvent(AddBomber);
|
||||
}
|
||||
|
||||
private void ButtonRemoveBomber_Click(object sender, EventArgs e)
|
||||
{
|
||||
if (listBoxStorages.SelectedIndex == -1)
|
||||
{
|
||||
_logger.LogWarning("Удаление объекта из несуществующего набора");
|
||||
return;
|
||||
}
|
||||
var obj = _bomber[listBoxStorages.SelectedItem.ToString() ??
|
||||
@ -106,14 +116,24 @@ namespace AirBomber
|
||||
return;
|
||||
}
|
||||
int pos = Convert.ToInt32(MessageBoxBomber.Text);
|
||||
if (obj - pos != null)
|
||||
try
|
||||
{
|
||||
MessageBox.Show("Объект удален");
|
||||
PicBoxBomberCollection.Image = obj.ShowBomber();
|
||||
if (obj - pos != null)
|
||||
{
|
||||
MessageBox.Show("Объект удален");
|
||||
PicBoxBomberCollection.Image = obj.ShowBomber();
|
||||
_logger.LogInformation($"Удален объект из набора {listBoxStorages.SelectedItem.ToString()}");
|
||||
}
|
||||
else
|
||||
{
|
||||
MessageBox.Show("Не удалось удалить объект");
|
||||
_logger.LogWarning($"Не удалось удалить объект из набора {listBoxStorages.SelectedItem.ToString()}");
|
||||
}
|
||||
}
|
||||
else
|
||||
catch (BomberNotFoundException ex)
|
||||
{
|
||||
MessageBox.Show("Не удалось удалить объект");
|
||||
MessageBox.Show(ex.Message);
|
||||
_logger.LogWarning($"{ex.Message} из набора {listBoxStorages.SelectedItem.ToString()}");
|
||||
}
|
||||
}
|
||||
|
||||
@ -123,23 +143,28 @@ namespace AirBomber
|
||||
{
|
||||
MessageBox.Show("Не все данные заполнены", "Ошибка",
|
||||
MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||
_logger.LogWarning("Пустое название набора");
|
||||
return;
|
||||
}
|
||||
_bomber.AddSet(KitTextbox.Text);
|
||||
ReloadObjects();
|
||||
_logger.LogInformation($"Добавлен набор: {KitTextbox.Text}");
|
||||
}
|
||||
|
||||
private void RemoveKit_Click(object sender, EventArgs e)
|
||||
{
|
||||
if (listBoxStorages.SelectedIndex == -1)
|
||||
{
|
||||
_logger.LogWarning("Удаление невыбранного набора");
|
||||
return;
|
||||
}
|
||||
string name = listBoxStorages.SelectedItem.ToString() ?? string.Empty;
|
||||
if (MessageBox.Show($"Удалить объект {listBoxStorages.SelectedItem}?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
|
||||
{
|
||||
_bomber.DelSet(listBoxStorages.SelectedItem.ToString()
|
||||
?? string.Empty);
|
||||
ReloadObjects();
|
||||
_logger.LogInformation($"Удален набор: {name}");
|
||||
}
|
||||
}
|
||||
private void ListBoxObjects_SelectedIndexChanged(object sender, EventArgs e)
|
||||
@ -152,15 +177,16 @@ namespace AirBomber
|
||||
{
|
||||
if (saveFileDialog.ShowDialog() == DialogResult.OK)
|
||||
{
|
||||
if (_bomber.SaveData(saveFileDialog.FileName))
|
||||
try
|
||||
{
|
||||
MessageBox.Show("Сохранение прошло успешно",
|
||||
"Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
|
||||
_bomber.SaveData(saveFileDialog.FileName);
|
||||
MessageBox.Show("Сохранение прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
|
||||
_logger.LogInformation($"Сохранение наборов в файл {saveFileDialog.FileName}");
|
||||
}
|
||||
else
|
||||
catch (Exception ex)
|
||||
{
|
||||
MessageBox.Show("Не сохранилось", "Результат",
|
||||
MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||
MessageBox.Show($"Не сохранилось: {ex.Message}", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||
_logger.LogWarning($"Не удалось сохранить наборы с ошибкой: {ex.Message}");
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -169,14 +195,17 @@ namespace AirBomber
|
||||
{
|
||||
if (openFileDialog.ShowDialog() == DialogResult.OK)
|
||||
{
|
||||
if (_bomber.LoadData(openFileDialog.FileName))
|
||||
try
|
||||
{
|
||||
MessageBox.Show("Данные успешно загружены.", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information);
|
||||
_bomber.LoadData(openFileDialog.FileName);
|
||||
ReloadObjects();
|
||||
MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
|
||||
_logger.LogInformation($"Загрузились наборы из файла {openFileDialog.FileName}");
|
||||
}
|
||||
else
|
||||
catch (Exception ex)
|
||||
{
|
||||
MessageBox.Show("Ошибка при загрузке данных.", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||
MessageBox.Show($"Не загрузилось: {ex.Message}", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||
_logger.LogWarning($"Не удалось сохранить наборы с ошибкой: {ex.Message}");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -127,6 +127,6 @@
|
||||
<value>315, 1</value>
|
||||
</metadata>
|
||||
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>25</value>
|
||||
<value>62</value>
|
||||
</metadata>
|
||||
</root>
|
@ -1,3 +1,8 @@
|
||||
using Microsoft.Extensions.Configuration;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using Serilog;
|
||||
|
||||
namespace AirBomber
|
||||
{
|
||||
internal static class Program
|
||||
@ -11,7 +16,30 @@ namespace AirBomber
|
||||
// To customize application configuration such as set high DPI settings or default font,
|
||||
// see https://aka.ms/applicationconfiguration.
|
||||
ApplicationConfiguration.Initialize();
|
||||
Application.Run(new FormBomberCollection());
|
||||
var services = new ServiceCollection();
|
||||
ConfigureServices(services);
|
||||
using (ServiceProvider serviceProvider = services.BuildServiceProvider())
|
||||
{
|
||||
Application.Run(serviceProvider.GetRequiredService<FormBomberCollection>());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private static void ConfigureServices(ServiceCollection services)
|
||||
{
|
||||
services.AddSingleton<FormBomberCollection>().AddLogging(option =>
|
||||
{
|
||||
string[] path = Directory.GetCurrentDirectory().Split('\\');
|
||||
string pathNeed = "";
|
||||
for (int i = 0; i < path.Length - 3; i++)
|
||||
{
|
||||
pathNeed += path[i] + "\\";
|
||||
}
|
||||
var configuration = new ConfigurationBuilder().SetBasePath(Directory.GetCurrentDirectory()).AddJsonFile(path: $"{pathNeed}appsettings.json", optional: false, reloadOnChange: true).Build(); var logger = new LoggerConfiguration().ReadFrom.Configuration(configuration).CreateLogger();
|
||||
|
||||
option.SetMinimumLevel(LogLevel.Information);
|
||||
option.AddSerilog(logger);
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
@ -1,4 +1,5 @@
|
||||
using System;
|
||||
using AirBomber.Exceptions;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Numerics;
|
||||
@ -53,12 +54,11 @@ namespace ProjectBomber.Generics
|
||||
public int Insert(T plane, int position)
|
||||
{
|
||||
if (position < 0 || position >= _maxCount)
|
||||
return -1;
|
||||
throw new BomberNotFoundException(position);
|
||||
|
||||
if (Count >= _maxCount)
|
||||
return -1;
|
||||
|
||||
_places.Insert(position, plane);
|
||||
throw new StorageOverflowException(position);
|
||||
_places.Insert(0, plane);
|
||||
return position;
|
||||
}
|
||||
/// <summary>
|
||||
@ -69,15 +69,15 @@ namespace ProjectBomber.Generics
|
||||
public bool Remove(int position)
|
||||
{
|
||||
/// Проверка позиции
|
||||
if (position < 0 || position >= _places.Count)
|
||||
return false;
|
||||
if (position < 0 || position > _maxCount || position >= Count)
|
||||
throw new BomberNotFoundException(position);
|
||||
/// Удаление объекта из массива, присвоив элементу массива значение null
|
||||
_places[position] = null;
|
||||
_places.RemoveAt(position);
|
||||
return true;
|
||||
}
|
||||
/// <summary>
|
||||
/// Получение объекта из набора по позиции
|
||||
/// </summary>
|
||||
/// </summary>
|
||||
/// <param name="position"></param>
|
||||
/// <returns></returns>
|
||||
public T? this[int position]
|
||||
@ -86,12 +86,16 @@ namespace ProjectBomber.Generics
|
||||
{
|
||||
if (position < 0 || position > _maxCount)
|
||||
return null;
|
||||
if (_places.Count <= position)
|
||||
return null;
|
||||
return _places[position];
|
||||
}
|
||||
set
|
||||
{
|
||||
if (position < 0 || position > _maxCount)
|
||||
return;
|
||||
if (_places.Count <= position)
|
||||
return;
|
||||
_places[position] = value;
|
||||
}
|
||||
}
|
||||
|
19
AirBomber/StorageOverflowException.cs
Normal file
19
AirBomber/StorageOverflowException.cs
Normal 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 AirBomber.Exceptions
|
||||
{
|
||||
[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 contex) : base(info, contex) { }
|
||||
}
|
||||
}
|
20
AirBomber/appsettings.json
Normal file
20
AirBomber/appsettings.json
Normal file
@ -0,0 +1,20 @@
|
||||
{
|
||||
"Serilog": {
|
||||
"Using": [ "Serilog.Sinks.File" ],
|
||||
"MinimumLevel": "Information",
|
||||
"WriteTo": [
|
||||
{
|
||||
"Name": "File",
|
||||
"Args": {
|
||||
"path": "Logs/log_.log",
|
||||
"rollingInterval": "Day",
|
||||
"outputTemplate": "[{Timestamp:HH:mm:ss.fff}]{Level:u4}: {Message:lj}{NewLine}{Exception}"
|
||||
}
|
||||
}
|
||||
],
|
||||
"Enrich": [ "FromLogContext", "WithMachineName", "WithThreadId" ],
|
||||
"Properties": {
|
||||
"Application": "GasolineTanker"
|
||||
}
|
||||
}
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user