Arklightning/PIbd-21_Yahontov_O.U._Trolleybus_Base
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Yahontov O.U. LabWork1 #1

Merged
eegov merged 5 commits from LabWork1 into master 2022-10-07 08:57:33 +04:00
Conversation 0 Commits 5 Files Changed 13 +11 -11
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ee9c15b506 - Show all commits

14
Trolleybus/Trolleybus/DrawingTrolleybus.cs
View File

@ -25,11 +25,11 @@ namespace Trolleybus
/// <summary>
/// левая координата начала отрисовки
/// </summary>
private float _startX;
//private float _startX;
/// <summary>
/// Верхняя координата начала отрисовки
/// </summary>
private float _startY;
//private float _startY;
/// <summary>
/// Ширина окна отрисовки
/// </summary>
@ -65,12 +65,12 @@ namespace Trolleybus
/// <param name="width">Ширина картинки</param>
/// <param name="height">Высота картинки</param>
// public void SetPosition(int x, int y, int startX, int startY, int width, int height)
public void SetPosition(int x, int y, int startX, int startY, int width, int height)
public void SetPosition(int x, int y, int width, int height)
{
_startPosX = x;
_startPosY = y;
_startX = startX;
_startY = startY;
// _startX = startX;
eegov commented 2022-10-07 08:55:10 +04:00
Review
Copy Link

Закомментированного кода быть не должно

Закомментированного кода быть не должно
// _startY = startY;
_pictureWidth = width;
_pictureHeight = height;
}
@ -95,14 +95,14 @@ namespace Trolleybus
break;
//влево
case Direction.Left:
if (_startPosX > _startX)
if (_startPosX - Trolleybus.Step > 0)
{
_startPosX -= Trolleybus.Step;
}
break;
//вверх
case Direction.Up:
if (_startPosY > _startY)
if (_startPosY - Trolleybus.Step > 0)
{
_startPosY -= Trolleybus.Step;
}

4
Trolleybus/Trolleybus/Form1.Designer.cs generated
View File

@ -129,9 +129,9 @@ namespace Trolleybus
//
// pictureBoxTrolleybus
//
this.pictureBoxTrolleybus.Location = new System.Drawing.Point(12, 12);
this.pictureBoxTrolleybus.Location = new System.Drawing.Point(0, -1);
this.pictureBoxTrolleybus.Name = "pictureBoxTrolleybus";
this.pictureBoxTrolleybus.Size = new System.Drawing.Size(776, 413);
this.pictureBoxTrolleybus.Size = new System.Drawing.Size(800, 451);
this.pictureBoxTrolleybus.TabIndex = 0;
this.pictureBoxTrolleybus.TabStop = false;
//

4
Trolleybus/Trolleybus/Form1.cs
View File

@ -40,8 +40,8 @@ namespace Trolleybus
Random rnd = new Random();
_trolleybus = new DrawingTrolleybus();
_trolleybus.Init(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
_trolleybus.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), Location.X, Location.Y, pictureBoxTrolleybus.Width, pictureBoxTrolleybus.Height);
// _trolleybus.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxTrolleybus.Width, pictureBoxTrolleybus.Height);
//_trolleybus.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), Location.X, Location.Y, pictureBoxTrolleybus.Width, pictureBoxTrolleybus.Height);
eegov commented 2022-10-07 08:55:23 +04:00
Review
Copy Link

Закомментированного кода быть не должно

Закомментированного кода быть не должно
_trolleybus.SetPosition(rnd.Next(10, 100), rnd.Next(pictureBoxTrolleybus.Size.Height - 150, pictureBoxTrolleybus.Size.Height - 100), pictureBoxTrolleybus.Width, pictureBoxTrolleybus.Height);
eegov commented 2022-10-07 08:55:58 +04:00
Review
Copy Link

Дополнительное задание в итоговый код не включается

Дополнительное задание в итоговый код не включается
toolStripStatusLabelSpeed.Text = $"Скорость: {_trolleybus.Trolleybus.Speed}";
toolStripStatusLabelWeight.Text = $"Вес: {_trolleybus.Trolleybus.Weight}";
toolStripStatusLabelBodyColor.Text = $"Цвет: {_trolleybus.Trolleybus.BodyColor.Name}";