YourDax/PIbd-23_Tikhonenkov_A.E_AntiAircraftGun
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed

Browse Source
This commit is contained in:
Алексей Тихоненков 2023-10-15 20:14:11 +04:00
parent d9c313d1bf
commit 4bc51728fe
2 changed files with 14 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
AntiAirCraftGun/AntiAirCraftGun/DrawingAntiAirCraftGun.cs
View File

@ -72,7 +72,7 @@ namespace AntiAircraftGun
if (AntiAircraftGun == null) return; if (AntiAircraftGun == null) return;
_startPosX = x; _startPosX = x;
_startPosY = y; _startPosY = y;
if (x + _zenitWidth >= _pictureWidth || y + _zenitHeight>= _pictureHeight) if (x < 0 || y < 0 ||x + _zenitWidth >= _pictureWidth || y + _zenitHeight>= _pictureHeight)
{ {
_startPosX = 1; _startPosX = 1;
_startPosY = 1; _startPosY = 1;
@ -106,14 +106,14 @@ namespace AntiAircraftGun
break; break;
// вправо // вправо
case DirectionType.Right: case DirectionType.Right:
if (_startPosX + AntiAircraftGun.Step < _pictureWidth-110) if (_startPosX + AntiAircraftGun.Step + _zenitWidth < _pictureWidth)
{ {
_startPosX += (int)AntiAircraftGun.Step; _startPosX += (int)AntiAircraftGun.Step;
} }
break; break;
//вниз //вниз
case DirectionType.Down: case DirectionType.Down:
if (_startPosY + AntiAircraftGun.Step < _pictureHeight-60) if (_startPosY + AntiAircraftGun.Step + _zenitHeight < _pictureHeight)
{ {
_startPosY += (int)AntiAircraftGun.Step; _startPosY += (int)AntiAircraftGun.Step;
} }

57
AntiAirCraftGun/AntiAirCraftGun/FormAntiAirCraftGun.cs
View File

@ -5,63 +5,28 @@ namespace AntiAircraftGun
/// <summary> /// <summary>
/// Ïîëå-îáúåêò äëÿ ïðîðèñîâêè îáúåêòà /// Ïîëå-îáúåêò äëÿ ïðîðèñîâêè îáúåêòà
/// </summary> /// </summary>
private DrawingAntiAirCraftGun? _drawing; private DrawingAntiAirCraftGun? _drawingAntiAirCraftGun;
public FormAntiAirCraftGun() public FormAntiAirCraftGun()
{ {
InitializeComponent(); InitializeComponent();
} }
private void Move_Click(object sender, EventArgs e)
{
if (_drawing == null)
{
return;
}
string name = ((Button)sender)?.Name ?? string.Empty;
switch (name)
{
case "buttonUp":
_drawing.MoveTransport(DirectionType.Up);
break;
case "buttonDown":
_drawing.MoveTransport(DirectionType.Down);
break;
case "buttonLeft":
_drawing.MoveTransport(DirectionType.Left);
break;
case "buttonRight":
_drawing.MoveTransport(DirectionType.Right);
break;
}
Draw();
}
private void pictureBoxZenit_Click(object sender, EventArgs e)
{
}
/// <summary> /// <summary>
/// Ìåòîä ïðîðèñîâêè ìàøèíû /// Ìåòîä ïðîðèñîâêè ìàøèíû
/// </summary> /// </summary>
private void Draw() private void Draw()
{ {
if (_drawing == null) if (_drawingAntiAirCraftGun == null)
{ {
return; return;
} }
Bitmap bmp = new(pictureBoxAntiAircraftGun.Width,pictureBoxAntiAircraftGun.Height); Bitmap bmp = new(pictureBoxAntiAircraftGun.Width,pictureBoxAntiAircraftGun.Height);
Graphics gr = Graphics.FromImage(bmp); Graphics gr = Graphics.FromImage(bmp);
_drawing.DrawTransport(gr); _drawingAntiAirCraftGun.DrawTransport(gr);
pictureBoxAntiAircraftGun.Image = bmp; pictureBoxAntiAircraftGun.Image = bmp;
} }
private void ButtonMove_Click(object sender, EventArgs e) private void ButtonMove_Click(object sender, EventArgs e)
{ {
if (_drawing == null) if (_drawingAntiAirCraftGun == null)
{ {
return; return;
} }
@ -69,16 +34,16 @@ namespace AntiAircraftGun
switch (name) switch (name)
{ {
case "buttonUp": case "buttonUp":
_drawing.MoveTransport(DirectionType.Up); _drawingAntiAirCraftGun.MoveTransport(DirectionType.Up);
break; break;
case "buttonDown": case "buttonDown":
_drawing.MoveTransport(DirectionType.Down); _drawingAntiAirCraftGun.MoveTransport(DirectionType.Down);
break; break;
case "buttonLeft": case "buttonLeft":
_drawing.MoveTransport(DirectionType.Left); _drawingAntiAirCraftGun.MoveTransport(DirectionType.Left);
break; break;
case "buttonRight": case "buttonRight":
_drawing.MoveTransport(DirectionType.Right); _drawingAntiAirCraftGun.MoveTransport(DirectionType.Right);
break; break;
} }
Draw(); Draw();
@ -86,8 +51,8 @@ namespace AntiAircraftGun
private void buttonCreate_Click(object sender, EventArgs e) private void buttonCreate_Click(object sender, EventArgs e)
{ {
Random random = new(); Random random = new();
_drawing = new DrawingAntiAirCraftGun(); _drawingAntiAirCraftGun = new DrawingAntiAirCraftGun();
_drawing.Init(random.Next(100, 300),//cêîðîñòü _drawingAntiAirCraftGun.Init(random.Next(100, 300),//cêîðîñòü
random.Next(1000, 3000), //âåñ random.Next(1000, 3000), //âåñ
Color.FromArgb(random.Next(0, 256), random.Next(0, 256),//îñíîâíîé öâåò Color.FromArgb(random.Next(0, 256), random.Next(0, 256),//îñíîâíîé öâåò
random.Next(0, 256)), random.Next(0, 256)),
@ -99,7 +64,7 @@ namespace AntiAircraftGun
Convert.ToBoolean(random.Next(2)), // Radar Convert.ToBoolean(random.Next(2)), // Radar
pictureBoxAntiAircraftGun.Width, pictureBoxAntiAircraftGun.Height); pictureBoxAntiAircraftGun.Width, pictureBoxAntiAircraftGun.Height);
_drawing.SetPosition(random.Next(10, 100), _drawingAntiAirCraftGun.SetPosition(random.Next(10, 100),
random.Next(10, 100)); random.Next(10, 100));