Tonby73/PIBD-11_Basalov_A.D_Simple
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PIbd-11.Basalov.A.D.LabWork08.Simple #15

Closed
Tonby73 wants to merge 6 commits from LabWork8 into LabWork7
pull from: LabWork8
merge into: Tonby73:LabWork7
Conversation 1 Commits 6 Files Changed 23 +7 -8
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b60f29db2b - Show all commits

15
ProjectElectricLocomotive/FormLocomotiveCollection.cs
View File

@ -96,12 +96,11 @@ public partial class FormLocomotiveCollection : Form
_logger.LogInformation("Добавлен объект: " + locomotive.GetDataForSave());
}
}
catch (ObjectNotFoundException) { }
catch (CollectionOverflowException ex)
catch (Exception ex)
{
//MessageBox.Show("Не удалось добавить объект");
MessageBox.Show(ex.Message);
_logger.LogError("Ошибка: {Message}", ex.Message);
MessageBox.Show($"Объект не добавлен: {ex.Message}", "Результат", MessageBoxButtons.OK,
MessageBoxIcon.Error);
_logger.LogError($"Ошибка: {ex.Message}", ex.Message);
}
}
@ -222,7 +221,7 @@ public partial class FormLocomotiveCollection : Form
ICollectionGenericObjects<DrawningLocomotive>? collection =
_storageCollection[
CollectionInfo.GetCollectionInfo(listBoxCollection.SelectedItem.ToString()!) ??
new CollectionInfo("", CollectionType.None, "")];
new CollectionInfo("", CollectionType.None, "Description")];
if (collection == null)
{
MessageBox.Show("Коллекция не проинициализирована");
@ -231,7 +230,7 @@ public partial class FormLocomotiveCollection : Form
switch (comboBoxSelectorCompany.Text)
{
case "Хранилище":
case "Депо":
_company = new LocomotiveDepo(pictureBox.Width, pictureBox.Height, collection);
break;
}
@ -291,7 +290,7 @@ public partial class FormLocomotiveCollection : Form
}
try
{
_storageCollection.AddCollection(new CollectionInfo(textBoxCollectionName.Text, collectionType, "ХЗ"));
_storageCollection.AddCollection(new CollectionInfo(textBoxCollectionName.Text, collectionType, ""));
_logger.LogInformation("Добавление коллекции");
RerfreshListBoxItems();
}