sqdselo/pibd-12_Tangatarov.I.A._Base
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pibd-12_Tangatarov.I.A._Base LabWork02 #2

Closed
sqdselo wants to merge 4 commits from LabWork02 into LabWork01
pull from: LabWork02
merge into: sqdselo:LabWork01
Conversation 0 Commits 4 Files Changed 18 +4 -58
9 changed files with 4 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b32311652f - Show all commits

9
HoistingCrane/HoistingCrane/Drawning/DrawningHoistingCrane.cs
View File

@ -1,4 +1,5 @@
using HoistingCrane.Entities;
using System.Configuration;
namespace HoistingCrane.Drawning;
@ -38,10 +39,6 @@ public class DrawningHoistingCrane : DrawningTrackedVehicle
EntityTrackedVehicle = new EntityHoistingCrane(speed, weight, bodyColor, additionalColor, counterweight, platform);
}
/// <summary>
/// Метод отрисовки объекта
/// </summary>
@ -82,10 +79,6 @@ public class DrawningHoistingCrane : DrawningTrackedVehicle
}
}

35
HoistingCrane/HoistingCrane/Drawning/DrawningTrackedVehicle.cs
View File

@ -6,7 +6,6 @@ namespace HoistingCrane.Drawning
public class DrawningTrackedVehicle
{
/// <summary>
/// Класс - сущность
/// </summary>
@ -46,7 +45,6 @@ namespace HoistingCrane.Drawning
public int GetHeight => _drawingCarHeight;
/// <summary>
/// Конструктор класса, который принимает параметры автомобиля(скорость, вес и цвет) и создает объект класса с данными параметрами
/// </summary>
@ -59,7 +57,6 @@ namespace HoistingCrane.Drawning
}
/// <summary>
/// Конструктор, при вызове которого можем менять границы транспорта
/// </summary>
@ -72,10 +69,6 @@ namespace HoistingCrane.Drawning
}
/// <summary>
/// Приватный конструктор, который делает значения границ окна = null и стартовую позицию = null
/// </summary>
@ -88,10 +81,6 @@ namespace HoistingCrane.Drawning
}
/// <summary>
/// Метод отрисовки игрового поля
/// </summary>
@ -125,8 +114,6 @@ namespace HoistingCrane.Drawning
}
/// <summary>
/// Установим позицию игрока
/// </summary>
@ -157,7 +144,6 @@ namespace HoistingCrane.Drawning
_startPosY = y;
}
}
/// <summary>
@ -165,7 +151,8 @@ namespace HoistingCrane.Drawning
/// </summary>
/// <param name="direction"></param>
/// <returns></returns>
protected bool MoveTransport(DirectionType direction)
public bool MoveTransport(DirectionType direction) //Подключили модив\фикатор virtual для переопределения в дочернем классе
{
if (EntityTrackedVehicle == null || !_startPosX.HasValue || !_startPosY.HasValue)
{
@ -210,12 +197,9 @@ namespace HoistingCrane.Drawning
}
}
/// <summary>
/// Метод отрисовки объекта
/// </summary>
@ -229,10 +213,6 @@ namespace HoistingCrane.Drawning
Pen pen = new Pen(Color.Black);
//границы
gr.DrawRectangle(pen, _startPosX.Value, _startPosY.Value + 25, 75, 20);
gr.DrawRectangle(pen, _startPosX.Value, _startPosY.Value, 25, 25);
@ -249,11 +229,6 @@ namespace HoistingCrane.Drawning
gr.DrawRectangle(pen, _startPosX.Value + 30, _startPosY.Value + 45, 4, 6);
gr.DrawRectangle(pen, _startPosX.Value + 45, _startPosY.Value + 45, 4, 6);
//корпус
Brush br = new SolidBrush(EntityTrackedVehicle.BodyColor);
gr.FillRectangle(br, _startPosX.Value, _startPosY.Value + 25, 75, 25);
@ -276,7 +251,6 @@ namespace HoistingCrane.Drawning
gr.FillEllipse(brDarkGray, _startPosX.Value + 63, _startPosY.Value + 45, 20, 20);
gr.FillRectangle(brDarkGray, _startPosX.Value + 5, _startPosY.Value + 45, 68, 20);
gr.FillEllipse(brq, _startPosX.Value - 1, _startPosY.Value + 46, 18, 18);
gr.FillEllipse(brq, _startPosX.Value + 62, _startPosY.Value + 46, 18, 18);
gr.FillEllipse(brq, _startPosX.Value + 20, _startPosY.Value + 53, 10, 10);
@ -284,9 +258,6 @@ namespace HoistingCrane.Drawning
gr.FillEllipse(brq, _startPosX.Value + 50, _startPosY.Value + 53, 10, 10);
gr.FillRectangle(brq, _startPosX.Value + 30, _startPosY.Value + 45, 4, 6);
gr.FillRectangle(brq, _startPosX.Value + 45, _startPosY.Value + 45, 4, 6);
}
}
}

5
HoistingCrane/HoistingCrane/Entities/EntityHoistingCrane.cs
View File

@ -21,9 +21,6 @@ public class EntityHoistingCrane : EntityTrackedVehicle
/// </summary>
public bool Platform { get; protected set; }
/// <summary>
/// Ìåòîä çàäà÷è ïàðàìåòðîâ
/// </summary>
@ -32,7 +29,6 @@ public class EntityHoistingCrane : EntityTrackedVehicle
/// <param name="Platform">Ïëàòôîðìà íà âåðåâêå</param>
// Äîïîëíÿåò íåäîñòîþùèå ýëåìåíòû èç ðîä. êëàññà
public EntityHoistingCrane(int Speed, int Weight, Color BodyColor, Color AdditionalColor, bool Counterweight, bool Platform) : base(Speed, Weight, BodyColor)
{
@ -42,5 +38,4 @@ public class EntityHoistingCrane : EntityTrackedVehicle
}
}

3
HoistingCrane/HoistingCrane/Entities/EntityTrackedVehicle.cs
View File

@ -30,9 +30,6 @@
public double Step => Speed * 100 / Weight;
/// <summary>
/// Конструктор сущности
/// </summary>

4
HoistingCrane/HoistingCrane/FormHoistingCrane.Designer.cs generated
View File

@ -9,7 +9,6 @@ namespace HoistingCrane
private System.ComponentModel.IContainer components = null;
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
@ -19,9 +18,6 @@ namespace HoistingCrane
base.Dispose(disposing);
}
private void InitializeComponent()
{
pictureBoxHoistingCrane = new PictureBox();

3
HoistingCrane/HoistingCrane/FormHoistingCrane.cs
View File

@ -71,9 +71,6 @@ namespace HoistingCrane
}
private void ButtonMove_Click(object sender, EventArgs e)
{
if (_drawning == null) { return; }

1
HoistingCrane/HoistingCrane/MovementStrategy/MoveableCar.cs
View File

@ -8,7 +8,6 @@ namespace HoistingCrane.MovementStrategy
/// Поле-объект класса DrawningAirplane или его наследника
/// </summary>
private readonly DrawningTrackedVehicle? drawningTrackedVehicle = null;
/// <summary>
/// Конструктор
/// </summary>

1
HoistingCrane/HoistingCrane/MovementStrategy/MovementDirection.cs
View File

@ -20,6 +20,5 @@
/// </summary>
Right = 4
}
}

1
HoistingCrane/HoistingCrane/MovementStrategy/StrategyStatus.cs
View File

@ -17,6 +17,5 @@
/// </summary>
Finish
}
}