anastasia_prytkina/PIbd-23_Prytkina_A.V._AirplaneWithRadar_Base
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Мелкие исправления.

Browse Source
This commit is contained in:
Anastasia 2022-11-13 10:04:54 +04:00
parent aae1f51ef5
commit e1eb80499e
12 changed files with 37 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AirplaneWithRadar/AirplaneWithRadar/AbstractMap.cs
View File

@ -66,7 +66,6 @@ namespace AirplaneWithRadar
}
return DrawMapWithObject();
}
private bool CheckBarriers(float leftMove, float rightMove, float topMove, float bottomMove)
{
int left = Convert.ToInt32((_drawingObject.GetCurrentPosition().Left + leftMove) / _size_x);
@ -89,7 +88,6 @@ namespace AirplaneWithRadar
}
return true;
}
private bool SetObjectOnMap()
{
if (_drawingObject == null || _map == null)
@ -99,13 +97,11 @@ namespace AirplaneWithRadar
int x = _random.Next(0, 10);
int y = _random.Next(0, 10);
_drawingObject.SetObject(x, y, _width, _height);
// TODO проверка, что объект не "накладывается" на закрытые участки
if (!CheckBarriers(0, 0, 0, 0))
{
return false;
}
return true;
}
private Bitmap DrawMapWithObject()
{

4
AirplaneWithRadar/AirplaneWithRadar/BlockMap.cs
View File

@ -26,9 +26,7 @@ namespace AirplaneWithRadar
protected override void DrawRoadPart(Graphics g, int i, int j)
{
g.FillRectangle(roadColor, i * _size_x, j * _size_y, (i + 1) * (_size_x + 1), (j + 1) * (_size_y + 1));
}
protected override void GenerateMap()
{
_map = new int[100, 100];
@ -49,7 +47,6 @@ namespace AirplaneWithRadar
int y = _random.Next(0, 80);
int blockWidth = _random.Next(0, 19);
int blockHeight = _random.Next(0, 19);
bool isFree = true;
for (int i = x; i < x + blockWidth; i++)
{
@ -60,7 +57,6 @@ namespace AirplaneWithRadar
isFree = false;
break;
}
}
}
if (isFree)

32
AirplaneWithRadar/AirplaneWithRadar/DrawingAirplane.cs
View File

@ -16,11 +16,11 @@ namespace AirplaneWithRadar
/// </summary>
public EntityAirplane Airplane { get; protected set; }
/// <summary>
/// Левая координата отрисовки автомобиля
/// Левая координата отрисовки самолета
/// </summary>
protected float _startPosX;
/// <summary>
/// Верхняя кооридната отрисовки автомобиля
/// Верхняя кооридната отрисовки самолета
/// </summary>
protected float _startPosY;
/// <summary>
@ -32,18 +32,18 @@ namespace AirplaneWithRadar
/// </summary>
private int? _pictureHeight = null;
/// <summary>
/// Ширина отрисовки автомобиля
/// Ширина отрисовки самолета
/// </summary>
private readonly int _airplaneWidth = 303;
/// <summary>
/// Высота отрисовки автомобиля
/// Высота отрисовки самолета
/// </summary>
private readonly int _airplaneHeight = 108;
/// <summary>
/// Инициализация свойств
/// </summary>
/// <param name="speed">Скорость</param>
/// <param name="weight">Вес автомобиля</param>
/// <param name="weight">Вес самолета</param>
/// <param name="bodyColor">Цвет кузова</param>
public DrawingAirplane(int speed, float weight, Color bodyColor)
{
@ -53,10 +53,10 @@ namespace AirplaneWithRadar
/// Инициализация свойств
/// </summary>
/// <param name="speed">Скорость</param>
/// <param name="weight">Вес автомобиля</param>
/// <param name="weight">Вес самолета</param>
/// <param name="bodyColor">Цвет кузова</param>
/// <param name="airplaneWidth">Ширина отрисовки автомобиля</param>
/// <param name="airplaneHeight">Высота отрисовки автомобиля</param>
/// <param name="airplaneWidth">Ширина отрисовки самолета</param>
/// <param name="airplaneHeight">Высота отрисовки самолета</param>
protected DrawingAirplane(int speed, float weight, Color bodyColor, int airplaneWidth, int airplaneHeight) :
this(speed, weight, bodyColor)
{
@ -64,7 +64,7 @@ namespace AirplaneWithRadar
_airplaneHeight = airplaneHeight;
}
/// <summary>
/// Установка позиции автомобиля
/// Установка позиции самолета
/// </summary>
/// <param name="x">Координата X</param>
/// <param name="y">Координата Y</param>
@ -72,7 +72,6 @@ namespace AirplaneWithRadar
/// <param name="height">Высота картинки</param>
public void SetPosition(int x, int y, int width, int height)
{
// TODO checks
if (x > 0 && x < width)
{
_startPosX = x;
@ -89,12 +88,6 @@ namespace AirplaneWithRadar
{
_pictureHeight = height;
}
//_startPosX = x;
//_startPosY = y;
//_pictureWidth = width;
//_pictureHeight = height;
}
/// <summary>
/// Изменение направления пермещения
@ -108,28 +101,24 @@ namespace AirplaneWithRadar
}
switch (direction)
{
// вправо
case Direction.Right:
if (_startPosX + _airplaneWidth + Airplane.Step < _pictureWidth)
{
_startPosX += Airplane.Step;
}
break;
//влево
case Direction.Left:
if (_startPosX - Airplane.Step > 0)
{
_startPosX -= Airplane.Step;
}
break;
//вверх
case Direction.Up:
if (_startPosY - Airplane.Step > 0)
{
_startPosY -= Airplane.Step;
}
break;
//вниз
case Direction.Down:
if (_startPosY + _airplaneHeight + Airplane.Step < _pictureHeight)
{
@ -139,7 +128,7 @@ namespace AirplaneWithRadar
}
}
/// <summary>
/// Отрисовка автомобиля
/// Отрисовка самолета
/// </summary>
/// <param name="g"></param>
public virtual void DrawTransport(Graphics g)
@ -218,6 +207,5 @@ namespace AirplaneWithRadar
{
return (_startPosX, _startPosX + _airplaneWidth, _startPosY, _startPosY + _airplaneHeight);
}
}
}

11
AirplaneWithRadar/AirplaneWithRadar/DrawingAirplaneWithRadar.cs
View File

@ -12,16 +12,15 @@ namespace AirplaneWithRadar
/// Инициализация свойств
/// </summary>
/// <param name="speed">Скорость</param>
/// <param name="weight">Вес автомобиля</param>
/// <param name="weight">Вес самолета</param>
/// <param name="bodyColor">Цвет кузова</param>
/// <param name="dopColor">Дополнительный цвет</param>
/// <param name="radar">Признак наличия обвеса</param>
/// <param name="extraFuelTank">Признак наличия антикрыла</param>
/// <param name="radar">Признак наличия радара</param>
/// <param name="extraFuelTank">Признак наличия дополнительных топливных баков</param>
public DrawingAirplaneWithRadar(int speed, float weight, Color bodyColor, Color dopColor, bool radar, bool extraFuelTank) : base(speed, weight, bodyColor, 304, 109)
{
Airplane = new EntityAirplaneWithRadar(speed, weight, bodyColor, dopColor, radar, extraFuelTank);
}
public override void DrawTransport(Graphics g)
{
if (Airplane is not EntityAirplaneWithRadar airplaneWithRadar)
@ -30,7 +29,6 @@ namespace AirplaneWithRadar
}
Pen pen = new(Color.Black, 5);
Brush dopBrush = new SolidBrush(airplaneWithRadar.DopColor);
if (airplaneWithRadar.Radar)
{
g.DrawLine(pen, _startPosX + 120, _startPosY + 30, _startPosX + 110, _startPosY + 60);
@ -43,15 +41,12 @@ namespace AirplaneWithRadar
g.FillPolygon(dopBrush, radarPoints);
g.DrawEllipse(pen, _startPosX + 85, _startPosY + 15, 90, 20);
g.FillEllipse(dopBrush, _startPosX + 85, _startPosY + 15, 90, 20);
}
_startPosX += 10;
_startPosY += 5;
base.DrawTransport(g);
_startPosX -= 10;
_startPosY -= 5;
if (airplaneWithRadar.ExtraFuelTank)
{
g.DrawLine(pen, _startPosX + 145, _startPosY + 98, _startPosX + 145, _startPosY + 108);

1
AirplaneWithRadar/AirplaneWithRadar/DrawingObjectAirplane.cs
View File

@ -30,6 +30,5 @@ namespace AirplaneWithRadar
{
_airplane.DrawTransport(g);
}
}
}

8
AirplaneWithRadar/AirplaneWithRadar/EntityAirplane.cs
View File

@ -6,7 +6,6 @@ using System.Threading.Tasks;
namespace AirplaneWithRadar
{
/// <summary>
/// Класс-сущность "Самолет"
/// </summary>
@ -25,11 +24,11 @@ namespace AirplaneWithRadar
/// </summary>
public Color BodyColor { get; private set; }
/// <summary>
/// Шаг перемещения автомобиля
/// Шаг перемещения самолета
/// </summary>
public float Step => Speed * 100 / Weight;
/// <summary>
/// Инициализация полей объекта-класса автомобиля
/// Инициализация полей объекта-класса самолета
/// </summary>
/// <param name="speed"></param>
/// <param name="weight"></param>
@ -42,8 +41,5 @@ namespace AirplaneWithRadar
Weight = weight <= 0 ? rnd.Next(40, 70) : weight;
BodyColor = bodyColor;
}
}
}

12
AirplaneWithRadar/AirplaneWithRadar/EntityAirplaneWithRadar.cs
View File

@ -13,29 +13,27 @@ namespace AirplaneWithRadar
/// </summary>
public Color DopColor { get; private set; }
/// <summary>
/// Признак наличия обвеса
/// Признак наличия радара
/// </summary>
public bool Radar { get; private set; }
/// <summary>
/// Признак наличия антикрыла
/// Признак наличия дополнительных топливных баков
/// </summary>
public bool ExtraFuelTank { get; private set; }
/// <summary>
/// Инициализация свойств
/// </summary>
/// <param name="speed">Скорость</param>
/// <param name="weight">Вес автомобиля</param>
/// <param name="weight">Вес самолета</param>
/// <param name="bodyColor">Цвет кузова</param>
/// <param name="dopColor">Дополнительный цвет</param>
/// <param name="radar">Признак наличия обвеса</param>
/// <param name="extraFuelTank">Признак наличия антикрыла</param>
/// <param name="radar">Признак наличия радара</param>
/// <param name="extraFuelTank">Признак наличия дополнительных топливных баков</param>
public EntityAirplaneWithRadar(int speed, float weight, Color bodyColor, Color dopColor, bool radar, bool extraFuelTank) : base(speed, weight, bodyColor)
{
DopColor = dopColor;
Radar = radar;
ExtraFuelTank = extraFuelTank;
}
}
}

1
AirplaneWithRadar/AirplaneWithRadar/FormAirplaneWithRadar.Designer.cs generated
View File

@ -82,7 +82,6 @@
this.pictureBoxAirplane.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
this.pictureBoxAirplane.TabIndex = 1;
this.pictureBoxAirplane.TabStop = false;
this.pictureBoxAirplane.Click += new System.EventHandler(this.pictureBoxAirplane_Click);
//
// buttonCreate
//

25
AirplaneWithRadar/AirplaneWithRadar/FormAirplaneWithRadar.cs
View File

@ -3,14 +3,12 @@ namespace AirplaneWithRadar
public partial class FormAirplaneWithRadar : Form
{
private DrawingAirplane _airplane;
public FormAirplaneWithRadar()
{
InitializeComponent();
}
/// <summary>
/// Ìåòîä ïðîðèñîâêè ìàøèíû
/// Ìåòîä ïðîðèñîâêè ñàìîëåòà
/// </summary>
private void Draw()
{
@ -25,7 +23,6 @@ namespace AirplaneWithRadar
private void SetData()
{
Random rnd = new();
_airplane.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxAirplane.Width, pictureBoxAirplane.Height);
toolStripStatusLabelSpeed.Text = $"Ñêîðîñòü: {_airplane.Airplane.Speed}";
toolStripStatusLabelWeight.Text = $"Âåñ: {_airplane.Airplane.Weight}";
@ -38,16 +35,18 @@ namespace AirplaneWithRadar
/// <param name="e"></param>
private void ButtonCreate_Click(object sender, EventArgs e)
{
Random rnd = new();
_airplane = new DrawingAirplane(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
SetData();
Draw();
}
/// <summary>
/// Ïåðåìåùåíèå
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void ButtonMove_Click(object sender, EventArgs e)
{
//ïîëó÷àåì èìÿ êíîïêè
string name = ((Button)sender)?.Name ?? string.Empty;
switch (name)
{
@ -65,18 +64,6 @@ namespace AirplaneWithRadar
break;
}
Draw();
}
private void FormAirplaneWithRadar_Load(object sender, EventArgs e)
{
}
private void pictureBoxAirplane_Click(object sender, EventArgs e)
{
}
/// <summary>
/// Îáðàáîòêà íàæàòèÿ êíîïêè "Ìîäèôèêàöèÿ"

25
AirplaneWithRadar/AirplaneWithRadar/FormMap.cs
View File

@ -21,7 +21,7 @@ namespace AirplaneWithRadar
/// <summary>
/// Заполнение информации по объекту
/// </summary>
/// <param name="car"></param>
/// <param name="airplane"></param>
private void SetData(DrawingAirplane airplane)
{
toolStripStatusLabelSpeed.Text = $"Скорость: {airplane.Airplane.Speed}";
@ -39,12 +39,14 @@ namespace AirplaneWithRadar
Random rnd = new();
var airplane = new DrawingAirplane(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)));
SetData(airplane);
}
/// <summary>
/// Перемещение
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void ButtonMove_Click(object sender, EventArgs e)
{
//получаем имя кнопки
string name = ((Button)sender)?.Name ?? string.Empty;
Direction dir = Direction.None;
switch (name)
@ -63,9 +65,7 @@ namespace AirplaneWithRadar
break;
}
pictureBoxAirplane.Image = _abstractMap?.MoveObject(dir);
}
/// <summary>
/// Обработка нажатия кнопки "Модификация"
/// </summary>
@ -77,15 +77,12 @@ namespace AirplaneWithRadar
var airplane = new DrawingAirplaneWithRadar(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)),
Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256)), Convert.ToBoolean(rnd.Next(0, 2)), Convert.ToBoolean(rnd.Next(0, 2)));
SetData(airplane);
}
private void FormMap_Load(object sender, EventArgs e)
{
}
/// <summary>
/// Выбор карты
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void ComboBoxSelectorMap_SelectedIndexChanged(object sender, EventArgs e)
{
switch (comboBoxSelectorMap.Text)

5
AirplaneWithRadar/AirplaneWithRadar/LineMap.cs
View File

@ -32,7 +32,6 @@ namespace AirplaneWithRadar
_map = new int[100, 100];
_size_x = (float)_width / _map.GetLength(0);
_size_y = (float)_height / _map.GetLength(1);
//int counter = 0;
for (int i = 0; i < _map.GetLength(0); ++i)
{
for (int j = 0; j < _map.GetLength(1); ++j)
@ -40,10 +39,7 @@ namespace AirplaneWithRadar
_map[i, j] = _freeRoad;
}
}
int counter;
for (int j = 0; j < _map.GetLength(1); j++)
{
int startX = _random.Next(0, 80);
@ -59,7 +55,6 @@ namespace AirplaneWithRadar
}
j += 3;
}
}
}
}

2
AirplaneWithRadar/AirplaneWithRadar/Program.cs
View File

@ -8,8 +8,6 @@ namespace AirplaneWithRadar
[STAThread]
static void Main()
{
// To customize application configuration such as set high DPI settings or default font,
// see https://aka.ms/applicationconfiguration.
ApplicationConfiguration.Initialize();
Application.Run(new FormMap());
}