From 6ffdf8d9a497f8f2a0bc80722eef9efbbd2f0bc3 Mon Sep 17 00:00:00 2001 From: ValAnn Date: Fri, 3 Nov 2023 16:13:39 +0400 Subject: [PATCH] finish --- DumpTruck/DumpTruck/DrawingDumpCar.cs | 5 +---- DumpTruck/DumpTruck/DrawningCar.cs | 6 ------ DumpTruck/DumpTruck/EntityDumpTruck.cs | 4 +--- DumpTruck/DumpTruck/Form1.Designer.cs | 2 +- DumpTruck/DumpTruck/Form1.cs | 13 ------------- DumpTruck/DumpTruck/MoveToBorder.cs | 22 ++++++++++++++++------ 6 files changed, 19 insertions(+), 33 deletions(-) diff --git a/DumpTruck/DumpTruck/DrawingDumpCar.cs b/DumpTruck/DumpTruck/DrawingDumpCar.cs index afc7b18..1b47898 100644 --- a/DumpTruck/DumpTruck/DrawingDumpCar.cs +++ b/DumpTruck/DumpTruck/DrawingDumpCar.cs @@ -14,8 +14,6 @@ namespace DumpTruck.DrawningObjects { public class DrawningDumpTruck : DrawningCar { - - public DrawningDumpTruck(int speed, double weight, Color bodyColor, Color additionalColor, bool bodyKit, bool tent, int width, int height): base(speed, weight, bodyColor, width, height, 110, 60) { if (EntityCar != null) @@ -23,8 +21,7 @@ namespace DumpTruck.DrawningObjects EntityCar = new EntityDumpTruck(speed, weight, bodyColor,additionalColor, bodyKit, tent); } } - - + public override void DrawTransport(Graphics g) { if (EntityCar is not EntityDumpTruck dumpTruck) diff --git a/DumpTruck/DumpTruck/DrawningCar.cs b/DumpTruck/DumpTruck/DrawningCar.cs index 9485372..cf1bb21 100644 --- a/DumpTruck/DumpTruck/DrawningCar.cs +++ b/DumpTruck/DumpTruck/DrawningCar.cs @@ -41,7 +41,6 @@ namespace DumpTruck.DrawningObjects /// public int GetHeight => _carHeight; - public DrawningCar(int speed, double weight, Color bodyColor, int width, int height) { if(width < _carWidth || height < _carHeight) @@ -52,9 +51,6 @@ namespace DumpTruck.DrawningObjects _pictureHeight = height; EntityCar = new EntityCar(speed, weight, bodyColor); - - - } protected DrawningCar(int speed, double weight, Color bodyColor, int @@ -129,7 +125,6 @@ width, int height, int carWidth, int carHeight) }; } - public virtual void DrawTransport(Graphics g) { if (EntityCar == null) @@ -146,7 +141,6 @@ width, int height, int carWidth, int carHeight) g.FillEllipse(brush, _startPosX, _startPosY + 35 + 10, 15, 15); g.FillEllipse(brush, _startPosX + 15, _startPosY + 35 + 10, 15, 15); g.FillEllipse(brush, _startPosX + 95, _startPosY + 35 + 10, 15, 15); - } } diff --git a/DumpTruck/DumpTruck/EntityDumpTruck.cs b/DumpTruck/DumpTruck/EntityDumpTruck.cs index d6024c4..b5ce3e0 100644 --- a/DumpTruck/DumpTruck/EntityDumpTruck.cs +++ b/DumpTruck/DumpTruck/EntityDumpTruck.cs @@ -26,12 +26,10 @@ namespace DumpTruck.Entities /// Признак (опция) наличия tent /// public bool Tent { get; private set; } - public EntityDumpTruck(int speed, double weight, Color bodyColor, Color additionalColor, bool bodyKit, bool tent) : base(speed, weight, bodyColor) - { - + { AdditionalColor = additionalColor; BodyKit = bodyKit; Tent = tent; diff --git a/DumpTruck/DumpTruck/Form1.Designer.cs b/DumpTruck/DumpTruck/Form1.Designer.cs index d529cf8..9fb2e07 100644 --- a/DumpTruck/DumpTruck/Form1.Designer.cs +++ b/DumpTruck/DumpTruck/Form1.Designer.cs @@ -142,7 +142,7 @@ this.comboBoxStrategy.Name = "comboBoxStrategy"; this.comboBoxStrategy.Size = new System.Drawing.Size(164, 23); this.comboBoxStrategy.TabIndex = 9; - this.comboBoxStrategy.SelectedIndexChanged += new System.EventHandler(this.comboBoxStrategy_SelectedIndexChanged); + // // buttonStep // diff --git a/DumpTruck/DumpTruck/Form1.cs b/DumpTruck/DumpTruck/Form1.cs index 4f15732..2d6c230 100644 --- a/DumpTruck/DumpTruck/Form1.cs +++ b/DumpTruck/DumpTruck/Form1.cs @@ -15,12 +15,6 @@ namespace DumpTruck InitializeComponent(); } - private void button_Click(object sender, EventArgs e) - { - - } - - private void Draw() { if (_drawningCar == null) @@ -69,7 +63,6 @@ namespace DumpTruck _drawningCar.SetPosition(random.Next(10, 100), random.Next(10, 100)); Draw(); - } private void buttonDumpTruck_Click(object sender, EventArgs e) @@ -124,12 +117,6 @@ namespace DumpTruck comboBoxStrategy.Enabled = true; _abstractStrategy = null; } - - } - - private void comboBoxStrategy_SelectedIndexChanged(object sender, EventArgs e) - { - } } } diff --git a/DumpTruck/DumpTruck/MoveToBorder.cs b/DumpTruck/DumpTruck/MoveToBorder.cs index 8ff1c45..155dc6d 100644 --- a/DumpTruck/DumpTruck/MoveToBorder.cs +++ b/DumpTruck/DumpTruck/MoveToBorder.cs @@ -29,19 +29,29 @@ namespace DumpTruck.MovementStrategy { return; } - var diffX = FieldWidth - objParams.ObjectMiddleHorizontal; + var diffX = objParams.RightBorder - FieldWidth; if (Math.Abs(diffX) > GetStep()) { - + if (diffX > 0) + { + MoveLeft(); + } + else + { MoveRight(); - + } } - var diffY = FieldHeight - objParams.ObjectMiddleVertical; + var diffY = objParams.DownBorder - FieldHeight; if (Math.Abs(diffY) > GetStep()) { - + if (diffY > 0) + { + MoveUp(); + } + else + { MoveDown(); - + } } }