Gavrilov/ISEbd_21_Gavrilov_R.A._DumpTruck_basic
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ISEbd-21 Gavrilov R.A. work lab 4 #6

Closed
Gavrilov wants to merge 3 commits from Laba_4_DumpTruck_Basic into Laba_3_DumpTruck_Basic
pull from: Laba_4_DumpTruck_Basic
merge into: Gavrilov:Laba_3_DumpTruck_Basic
Conversation 1 Commits 3 Files Changed 8 +4 -5
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 65ebe59a78 - Show all commits

2
DumpTruck/DumpTruck/DrawningDumpTruck.cs
View File

@ -40,7 +40,7 @@ namespace DumpTruck.DrawningObjects
if (dumpTruck.Trailer)
{
//прицеп
Brush trailer = new SolidBrush(Color.Black);
Brush trailer = new SolidBrush(EntityTruck.AdditionalColor);
g.FillRectangle(trailer, _startPosX, _startPosY, 5, 38);
g.FillRectangle(trailer, _startPosX + 5, _startPosY + 33, 70, 5);
g.FillRectangle(trailer, _startPosX + 70, _startPosY, 5, 38);

2
DumpTruck/DumpTruck/DrawningTruck.cs
View File

@ -203,7 +203,7 @@ namespace DumpTruck.DrawningObjects
//кузов
Brush br = new SolidBrush(EntityTruck.BodyColor);
g.FillRectangle(br, _startPosX + 81, _startPosY + 1, 29, 40);
Brush br1 = new SolidBrush(EntityTruck.AdditionalColor);
Brush br1 = new SolidBrush(EntityTruck.BodyColor);
g.FillRectangle(br1, _startPosX + 1, _startPosY + 41, 109, 19);
//колеса
Brush wheels = new SolidBrush(Color.Black);

2
DumpTruck/DumpTruck/FormDumpTruck.cs
View File

@ -73,7 +73,7 @@ namespace DumpTruck
}
Color color2 = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256));
ColorDialog dialog2 = new();
if (dialog.ShowDialog() == DialogResult.OK)
if (dialog2.ShowDialog() == DialogResult.OK)
{
color2 = dialog2.Color;
}

3
DumpTruck/DumpTruck/FormTruckCollection.cs
View File

@ -134,8 +134,7 @@ namespace DumpTruck
ReloadObjects();
}
private void listBoxStorages_SelectedIndexChanged(object sender,
EventArgs e)
private void listBoxStorages_SelectedIndexChanged(object sender, EventArgs e)
{
pictureBoxCollection.Image =
_storage[listBoxStorages.SelectedItem?.ToString() ?? string.Empty]?.ShowTrucks();