Markov D.P. LabWork03 #6

Merged
eegov merged 6 commits from LabWork03 into LabWork02 2022-11-07 10:30:45 +04:00
Showing only changes of commit 56aa1980ca - Show all commits

View File

@ -14,12 +14,12 @@ namespace ContainerShip
{
private MapWithSetShipGeneric<DrawingObjectShip, AbstractMap> _mapShipCollectionGeneric;
public bool onMap;
public FormMapWithSetShip()
{
InitializeComponent();
onMap = false;
}
private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
@ -100,25 +100,23 @@ namespace ContainerShip
return;
}
pictureBox.Image = _mapShipCollectionGeneric.ShowSet();
onMap = false;
}
private void ButtonShowOnMap_Click(object sender, EventArgs e)
{
if (_mapShipCollectionGeneric == null)
{
onMap = false;
{
return;
}
pictureBox.Image = _mapShipCollectionGeneric.ShowOnMap();
onMap = true;
}
private void ButtonMove_Click(object sender, EventArgs e)
{
if (_mapShipCollectionGeneric == null || !onMap)
if (_mapShipCollectionGeneric == null)
{
return;
}
//получаем имя кнопки