Firsov_Kirill/PIbd-23_Firsov_Kirill_Tractor_basis
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

комит

Browse Source
This commit is contained in:
Kirill 2023-12-29 21:21:07 +04:00
parent 55bb9dd042
commit b15b824e76
3 changed files with 36 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/FormTractorCollection.cs
View File

@ -130,17 +130,19 @@ namespace ProjectTractor
form.Show();
Action<DrawningTractor>? tractorDelegate = new((m) =>
{
bool isAdditionSuccessful = (obj + m);
if (isAdditionSuccessful)
try
{
bool isAdditionSuccessful = (obj + m);
MessageBox.Show("Объект добавлен");
Log.Information($"Добавлен объект в коллекцию {listBoxStorages.SelectedItem.ToString() ?? string.Empty}");
m.ChangePictureBoxSize(pictureBoxCollection.Width, pictureBoxCollection.Height);
pictureBoxCollection.Image = obj.ShowTractors();
}
else
catch
{
MessageBox.Show("Не удалось добавить объект");
Log.Information($"Не удалось добавить объект в коллекцию {listBoxStorages.SelectedItem.ToString() ?? string.Empty}");
}
});
form.AddEvent(tractorDelegate);
@ -171,18 +173,13 @@ namespace ProjectTractor
int pos = Convert.ToInt32(maskedTextBoxNumber.Text);
try
{
if (obj - pos != null)
{
MessageBox.Show("Объект удален");
pictureBoxCollection.Image = obj.ShowTractors();
}
else
{
MessageBox.Show("Не удалось удалить объект");
}
bool m = obj - pos;
MessageBox.Show("Объект удален");
pictureBoxCollection.Image = obj.ShowTractors();
}
catch (TractorNotFoundException ex)
{
Log.Warning($"Не удалось удалить объкт");
MessageBox.Show(ex.Message);
}

14
RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/SetGeneric.cs
View File

@ -4,6 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using ProjectTractor.Exceptions;
using Serilog;
namespace ProjectTractor.Generics
{
@ -77,9 +78,18 @@ namespace ProjectTractor.Generics
{
get
{
if (!(position >= 0 && position <= Count))
try
{
if (!(position >= 0 && position <= Count))
return null;
return _places[position];
}
catch (TractorNotFoundException ex)
{
return null;
return _places[position];
Log.Warning($"Не удалось удалить объкт");
MessageBox.Show(ex.Message);
}
}
set
{

19
RPP_FirstLaba_Tractor/RPP_FirstLaba_Tractor/TractorsGenericCollection.cs
View File

@ -5,6 +5,8 @@ using System.Text;
using System.Threading.Tasks;
using ProjectTractor.DrawningObjects;
using ProjectTractor.MovementStrategy;
using ProjectTractor.Exceptions;
using Serilog;
namespace ProjectTractor.Generics
{
@ -78,12 +80,21 @@ namespace ProjectTractor.Generics
public static bool operator -(TractorsGenericCollection<T, U> collect, int
pos)
{
T? obj = collect._collection[pos];
if (obj != null)
try
{
collect._collection.Remove(pos);
T? obj = collect._collection[pos];
if (obj != null)
{
collect._collection.Remove(pos);
}
return true;
}
catch (TractorNotFoundException ex)
{
return false;
Log.Warning($"Не удалось удалить объкт");
MessageBox.Show(ex.Message);
}
return true;
}
/// <summary>
/// Получение объектов коллекции