tellsense/ISEbd-22_Baygulov_A.A._ElectricLocomotive_Base
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Исправления

Browse Source
This commit is contained in:
Андрей Байгулов 2023-11-12 22:01:56 +04:00
parent 0feb1800b4
commit 26e3503e00
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ElectricLocomotive/ElectricLocomotive/DrawingLocomotive.cs
View File

@ -15,8 +15,8 @@ namespace ProjectElectricLocomotive.DrawingObjects
{ {
public EntityLocomotive? EntityLocomotive { get; protected set; } public EntityLocomotive? EntityLocomotive { get; protected set; }
protected int _pictureWidth; public int _pictureWidth;
protected int _pictureHeight; public int _pictureHeight;
protected int _startPosX; protected int _startPosX;
protected int _startPosY; protected int _startPosY;
protected readonly int _locomWidth = 80; protected readonly int _locomWidth = 80;

10
ElectricLocomotive/ElectricLocomotive/FormLocomotiveCollection.cs
View File

@ -48,6 +48,9 @@ namespace ProjectElectricLocomotive
} }
public void AddLocomotive(DrawingLocomotive loco) public void AddLocomotive(DrawingLocomotive loco)
{ {
loco._pictureWidth = pictureBoxCollection.Width;
loco._pictureHeight = pictureBoxCollection.Height;
if (listBoxStorages.SelectedIndex == -1) return; if (listBoxStorages.SelectedIndex == -1) return;
var obj = _storage[listBoxStorages.SelectedItem.ToString() ?? string.Empty]; var obj = _storage[listBoxStorages.SelectedItem.ToString() ?? string.Empty];
@ -55,11 +58,9 @@ namespace ProjectElectricLocomotive
{ {
return; return;
} }
FormElectricLocomotive form = new();
if (form.ShowDialog() == DialogResult.OK)
{
//проверяем, удалось ли нам загрузить объект //проверяем, удалось ли нам загрузить объект
if (obj + form.SelectedLocomotive > -1) if (obj + loco > -1)
{ {
MessageBox.Show("Объект добавлен"); MessageBox.Show("Объект добавлен");
pictureBoxCollection.Image = obj.ShowLocomotives(); pictureBoxCollection.Image = obj.ShowLocomotives();
@ -69,7 +70,6 @@ namespace ProjectElectricLocomotive
MessageBox.Show("Не удалось добавить объект"); MessageBox.Show("Не удалось добавить объект");
} }
} }
}
private void buttonRemoveLocomotive_Click(object sender, EventArgs e) private void buttonRemoveLocomotive_Click(object sender, EventArgs e)
{ {
if (listBoxStorages.SelectedIndex == -1) return; if (listBoxStorages.SelectedIndex == -1) return;