Damir_Nugaev_ISEbd-22/ISEbd-22_Nugaev_D.N._DoubleDeckerBus_Base
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Nugaev D.N. Lab_work04 #4

Closed
Damir_Nugaev_ISEbd-22 wants to merge 7 commits from Lab_work04 into Lab_work03
pull from: Lab_work04
merge into: Damir_Nugaev_ISEbd-22:Lab_work03
Conversation 0 Commits 7 Files Changed 6 +13 -7
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ca865bc1f0 - Show all commits

2
Bus/Bus/DrawingBus.cs
View File

@ -1,4 +1,4 @@
using System;
using Bus;
using System.Collections.Generic;
using System.Linq;
using System.Text;

18
Bus/Bus/FormMapWithSetDoubleDeckerBus.cs
View File

@ -80,7 +80,7 @@ namespace Bus
private void ButtonAddBus_Click(object sender, EventArgs e)
{
if (_mapBusCollectionGeneric == null)
if (listBoxMaps.SelectedIndex == -1)
{
return;
}
@ -94,11 +94,10 @@ namespace Bus
}
DrawingObjectBus bus = new(form.SelectedBus);
if (_mapBusCollectionGeneric + bus != -1)
if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] + bus != -1)
{
MessageBox.Show("Объект добавлен");
pictureBox.Image = _mapBusCollectionGeneric.ShowSet();
pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
}
else
{
@ -109,20 +108,27 @@ namespace Bus
private void ButtonRemoveBus_Click(object sender, EventArgs e)
{
if (listBoxMaps.SelectedIndex == -1)
{
return;
}
if (string.IsNullOrEmpty(maskedTextBoxPosition.Text))
{
return;
}
if (MessageBox.Show("Удалить объект?", "Удаление",
MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
{
return;
}
int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
if (_mapBusCollectionGeneric - pos != null)
if (_mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty] - pos != null)
{
MessageBox.Show("Объект удален");
pictureBox.Image = _mapBusCollectionGeneric.ShowSet();
pictureBox.Image = _mapsCollection[listBoxMaps.SelectedItem?.ToString() ?? string.Empty].ShowSet();
}
else
{