Fr_Alyona/ISEbd-12_Frolova.A.S._Simple
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ISEbd-12_Frolova.A.S._LabWork07_Simple #9

Closed
Fr_Alyona wants to merge 3 commits from LabWork07 into LabWork06
pull from: LabWork07
merge into: Fr_Alyona:LabWork06
Conversation 0 Commits 3 Files Changed 12 +25 -25
2 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 53b04bf136 - Show all commits

43
ProjectCatamaran/ProjectCatamaran/FormBoatCollection.cs
View File

@ -70,24 +70,22 @@ public partial class FormBoatCollection : Form
/// <param name="boat"></param>
private void SetBoat(DrawningBoat boat)
{
try
if (_company == null || boat == null)
{
return;
}
try
{
if (_company == null || boat == null)
{
return;
}
if (_company + boat != -1)
{
MessageBox.Show("Объект добавлен");
pictureBoxBoat.Image = _company.Show();
_logger.LogInformation("Добавлен объект: " + boat.GetDataForSave());
}
var res = _company + boat;
MessageBox.Show("Объект добавлен");
_logger.LogInformation($"Объект добавлен под индексом {res}");
pictureBoxBoat.Image = _company.Show();
}
catch (ObjectNotFoundException) { }
catch (CollectionOverflowException ex)
catch (Exception ex)
{
MessageBox.Show("Не удалось добавить объект");
_logger.LogError("Ошибка: {Message}", ex.Message);
MessageBox.Show($"Объект не добавлен: {ex.Message}", "Результат", MessageBoxButtons.OK,
MessageBoxIcon.Error);
_logger.LogError($"Ошибка: {ex.Message}", ex.Message);
}
}
@ -113,17 +111,16 @@ public partial class FormBoatCollection : Form
int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
try
{
if (_company - pos != null)
{
MessageBox.Show("Объект удален");
pictureBoxBoat.Image = _company.Show();
_logger.LogInformation("Удален объект по позиции " + pos);
}
var res = _company - pos;
MessageBox.Show("Объект удален");
_logger.LogInformation($"Объект удален под индексом {pos}");
pictureBoxBoat.Image = _company.Show();
}
catch (Exception ex)
{
MessageBox.Show("Не удалось удалить объект");
_logger.LogError("Ошибка: {Message}", ex.Message);
MessageBox.Show(ex.Message, "Не удалось удалить объект",
MessageBoxButtons.OK, MessageBoxIcon.Error);
_logger.LogError($"Ошибка: {ex.Message}", ex.Message);
}
}

7
ProjectCatamaran/ProjectCatamaran/ProjectCatamaran.csproj
View File

@ -10,10 +10,13 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
<PackageReference Include="NLog.Extensions.Logging" Version="5.3.11" />
<PackageReference Include="Serilog" Version="3.1.1" />
<PackageReference Include="Serilog.AspNetCore" Version="6.0.1" />
<PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
</ItemGroup>
<ItemGroup>