From 5f98a27ad43020d0a563fee007a31a57787136c3 Mon Sep 17 00:00:00 2001 From: gavrilov Date: Sat, 23 Sep 2023 18:11:44 +0400 Subject: [PATCH] Laba_1_100% --- DumpTruck/DumpTruck/Direction.cs | 1 - DumpTruck/DumpTruck/DrawningDumpTruck.cs | 32 +++-- DumpTruck/DumpTruck/DumpTruck.cs | 1 - DumpTruck/DumpTruck/Form1.Designer.cs | 39 ------ DumpTruck/DumpTruck/Form1.cs | 10 -- DumpTruck/DumpTruck/Form1.resx | 120 ------------------ DumpTruck/DumpTruck/FormDumpTruck.Designer.cs | 3 - DumpTruck/DumpTruck/FormDumpTruck.cs | 4 - DumpTruck/DumpTruck/FormDumpTruck.resx | 8 +- 9 files changed, 24 insertions(+), 194 deletions(-) delete mode 100644 DumpTruck/DumpTruck/Form1.Designer.cs delete mode 100644 DumpTruck/DumpTruck/Form1.cs delete mode 100644 DumpTruck/DumpTruck/Form1.resx diff --git a/DumpTruck/DumpTruck/Direction.cs b/DumpTruck/DumpTruck/Direction.cs index a8c02b9..a6cc088 100644 --- a/DumpTruck/DumpTruck/Direction.cs +++ b/DumpTruck/DumpTruck/Direction.cs @@ -24,6 +24,5 @@ namespace DumpTruck /// Вправо /// Right = 4 - } } diff --git a/DumpTruck/DumpTruck/DrawningDumpTruck.cs b/DumpTruck/DumpTruck/DrawningDumpTruck.cs index 6277070..eeb611f 100644 --- a/DumpTruck/DumpTruck/DrawningDumpTruck.cs +++ b/DumpTruck/DumpTruck/DrawningDumpTruck.cs @@ -31,11 +31,11 @@ namespace DumpTruck /// /// Ширина прорисовки автомобиля /// - // private readonly int _DumpTruckWidth = 200; + private readonly int _DumpTruckWidth = 110; /// /// Высота прорисовки автомобиля /// - // private readonly int _DumpTruckHeight = 150; + private readonly int _DumpTruckHeight = 85; /// /// Инициализация свойств /// @@ -51,6 +51,10 @@ namespace DumpTruck { _pictureWidth = width; _pictureHeight = height; + if ((_pictureHeight < _DumpTruckHeight) || (_pictureWidth < _DumpTruckWidth)) + { + return false; + } DumpTruck = new DumpTruck(); DumpTruck.Init(speed, weight, bodyColor, additionalColor, body, trailer); @@ -63,9 +67,16 @@ namespace DumpTruck /// Координата Y public void SetPosition(int x, int y) { - // TODO: Изменение x, y - _startPosX = x; - _startPosY = y; + if ((x < 0 || y < 0) || (x + _DumpTruckWidth > _pictureWidth || y + _DumpTruckHeight > _pictureHeight)) + { + _startPosX = 0; + _startPosY = 0; + } + else + { + _startPosX = x; + _startPosY = y; + } } /// /// Изменение направления перемещения @@ -95,14 +106,14 @@ namespace DumpTruck break; // вправо case DirectionType.Right: - if (_startPosX + _pictureWidth + DumpTruck.Step > FormDumpTruck.ActiveForm.ClientSize.Width) + if (_startPosX + _DumpTruckWidth + DumpTruck.Step < _pictureWidth) { _startPosX += (int)DumpTruck.Step; } break; //вниз case DirectionType.Down: - if (_startPosX + _pictureHeight + DumpTruck.Step > FormDumpTruck.ActiveForm.ClientSize.Height) + if (_startPosY + _DumpTruckHeight + DumpTruck.Step < _pictureHeight) { _startPosY += (int)DumpTruck.Step; } @@ -117,7 +128,6 @@ namespace DumpTruck } Pen pen = new(Color.Black); Brush additionalBrush = new SolidBrush(DumpTruck.AdditionalColor); - //грани g.DrawRectangle(pen, _startPosX + 80, _startPosY, 30, 40); g.DrawRectangle(pen, _startPosX, _startPosY + 40, 110, 20); @@ -126,21 +136,19 @@ namespace DumpTruck g.FillRectangle(br, _startPosX + 81, _startPosY + 1, 29, 40); Brush br1 = new SolidBrush(DumpTruck.AdditionalColor); g.FillRectangle(br1, _startPosX + 1, _startPosY + 41, 109, 19); + //колеса Brush wheels = new SolidBrush(Color.Black); g.FillEllipse(wheels, _startPosX, _startPosY + 63, 25, 25); g.FillEllipse(wheels, _startPosX + 25, _startPosY + 63, 25, 25); g.FillEllipse(wheels, _startPosX + 85, _startPosY + 63, 25, 25); - if (DumpTruck.Trailer) { + //прицеп Brush trailer = new SolidBrush(Color.Black); g.FillRectangle(trailer, _startPosX, _startPosY, 5, 38); g.FillRectangle(trailer, _startPosX + 5, _startPosY + 33, 70, 5); g.FillRectangle(trailer, _startPosX + 70, _startPosY, 5, 38); - } - - } } } diff --git a/DumpTruck/DumpTruck/DumpTruck.cs b/DumpTruck/DumpTruck/DumpTruck.cs index 2e4b154..81b0446 100644 --- a/DumpTruck/DumpTruck/DumpTruck.cs +++ b/DumpTruck/DumpTruck/DumpTruck.cs @@ -53,6 +53,5 @@ namespace DumpTruck Body = body; Trailer = trailer; } - } } diff --git a/DumpTruck/DumpTruck/Form1.Designer.cs b/DumpTruck/DumpTruck/Form1.Designer.cs deleted file mode 100644 index 073cfce..0000000 --- a/DumpTruck/DumpTruck/Form1.Designer.cs +++ /dev/null @@ -1,39 +0,0 @@ -namespace DumpTruck -{ - partial class Form1 - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.components = new System.ComponentModel.Container(); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(800, 450); - this.Text = "Form1"; - } - - #endregion - } -} \ No newline at end of file diff --git a/DumpTruck/DumpTruck/Form1.cs b/DumpTruck/DumpTruck/Form1.cs deleted file mode 100644 index 2326120..0000000 --- a/DumpTruck/DumpTruck/Form1.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace DumpTruck -{ - public partial class Form1 : Form - { - public Form1() - { - InitializeComponent(); - } - } -} \ No newline at end of file diff --git a/DumpTruck/DumpTruck/Form1.resx b/DumpTruck/DumpTruck/Form1.resx deleted file mode 100644 index 1af7de1..0000000 --- a/DumpTruck/DumpTruck/Form1.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/DumpTruck/DumpTruck/FormDumpTruck.Designer.cs b/DumpTruck/DumpTruck/FormDumpTruck.Designer.cs index 2850ced..781d9b0 100644 --- a/DumpTruck/DumpTruck/FormDumpTruck.Designer.cs +++ b/DumpTruck/DumpTruck/FormDumpTruck.Designer.cs @@ -19,7 +19,6 @@ } base.Dispose(disposing); } - #region Windows Form Designer generated code /// @@ -46,7 +45,6 @@ this.pictureBoxDumpTruck.Size = new System.Drawing.Size(800, 450); this.pictureBoxDumpTruck.TabIndex = 0; this.pictureBoxDumpTruck.TabStop = false; - this.pictureBoxDumpTruck.Click += new System.EventHandler(this.ButtonMove_Click); // // Button_Create // @@ -120,7 +118,6 @@ this.Controls.Add(this.pictureBoxDumpTruck); this.Name = "FormDumpTruck"; this.Text = "FormDumpTruck"; - this.Load += new System.EventHandler(this.FormDumpTruck_Load); ((System.ComponentModel.ISupportInitialize)(this.pictureBoxDumpTruck)).EndInit(); this.ResumeLayout(false); diff --git a/DumpTruck/DumpTruck/FormDumpTruck.cs b/DumpTruck/DumpTruck/FormDumpTruck.cs index e7d1da8..db3b870 100644 --- a/DumpTruck/DumpTruck/FormDumpTruck.cs +++ b/DumpTruck/DumpTruck/FormDumpTruck.cs @@ -70,9 +70,5 @@ namespace DumpTruck } Draw(); } - private void FormDumpTruck_Load(object sender, EventArgs e) - { - - } } } diff --git a/DumpTruck/DumpTruck/FormDumpTruck.resx b/DumpTruck/DumpTruck/FormDumpTruck.resx index 594ec33..abf2eae 100644 --- a/DumpTruck/DumpTruck/FormDumpTruck.resx +++ b/DumpTruck/DumpTruck/FormDumpTruck.resx @@ -61,7 +61,7 @@ iVBORw0KGgoAAAANSUhEUgAAA4QAAAOEBAMAAAALYOIIAAAABGdBTUEAALGPC/xhBQAAABJQTFRF5ubm - AQEB////AAAAa2trubm55kNtzgAAAAlwSFlzAAAOwQAADsEBuJFr7QAAGRlJREFUeNrt3Vt26jy2huHg + AQEB////AAAAa2trubm55kNtzgAAAAlwSFlzAAAOwAAADsABataJCQAAGRlJREFUeNrt3Vt26jy2huHg dCDC1QCTsu+jobUaALQgofrflkIHOySLEA4+aE69vvH49kX9yM/WXIEpyU/pql7jRZQaeRziI49DfORx iI88DvGRxyE+8jjERx6H+MjjEB95HOIjj0N85HGIjzwO8ZHHIT7yOATHdG/S/50oLvI4xEfVI6z+10Ao Ozb1B4SyY2teGgglx+q9/gOh6FgZaz8glBxbU7s1hILjsY66YyXVO8AntUPq47GOumMl1TvAJ7VD6mNn @@ -175,7 +175,7 @@ iVBORw0KGgoAAAANSUhEUgAAA4QAAAOEBAMAAAALYOIIAAAABGdBTUEAALGPC/xhBQAAABJQTFRF5ubm - AQEB////AAAAa2trubm55kNtzgAAAAlwSFlzAAAOvwAADr8BOAVTJAAAFy1JREFUeNrtnV2S6ka2RkFB + AQEB////AAAAa2trubm55kNtzgAAAAlwSFlzAAAOvgAADr4B6kKxwAAAFy1JREFUeNrtnV2S6ka2RkFB v7ese98VCmkA6hwBlzsB4tjzn0qTPxLC5lBCKH++qsVDVy932yf5VmxD1lbmPnT+1R78C5RD4pBH4pBH 4pBH4pBH4pBH4pBH4pBH4pBH4pBH4pBH4pBH4pBH4pBH4pDH6VWFvw6qInHII3HII3HII3HII3HII3HI I3HII3HII3HII3HII3HII3HII3HII3EIY/hJ700WiUMeiUMeiUMeiUMeiUMeiUMeiUMeiUMeiUMeiUMe @@ -280,7 +280,7 @@ iVBORw0KGgoAAAANSUhEUgAAA4QAAAOEBAMAAAALYOIIAAAABGdBTUEAALGPC/xhBQAAABJQTFRF5ubm - AQEB////AAAAa2trubm55kNtzgAAAAlwSFlzAAAOwQAADsEBuJFr7QAAFlpJREFUeNrtndFy47h2RT36 + AQEB////AAAAa2trubm55kNtzgAAAAlwSFlzAAAOwAAADsABataJCQAAFlpJREFUeNrtndFy47h2RT36 ArNov8tKfgAF3XdHlfueuCr//ysRQJCy3W7LkkUSC1p80aypm+45e+W0dRoE8LAbnu3D8Ig4NA48Ggce jQOPxoFH48CjceDROPBoHHg0DjwaBx6NA4/GgUfjwKNx4HF8NuXfi1Q0DjwaBx6NA4/GgUfjwKNx4NE4 8GgceDQOPBoHHo0Dj8aBR+PAo3GAsXy69oZF48CjceDROPBoHHg0DjwaBx6NA4/GgUfjwKNx4NE48Ggc @@ -382,7 +382,7 @@ iVBORw0KGgoAAAANSUhEUgAAA4QAAAOEBAMAAAALYOIIAAAABGdBTUEAALGPC/xhBQAAABJQTFRF5ubm - AQEB////AAAAa2trubm55kNtzgAAAAlwSFlzAAAOwQAADsEBuJFr7QAAGBNJREFUeNrt3V9y+r7Vx3Fj + AQEB////AAAAa2trubm55kNtzgAAAAlwSFlzAAAOwAAADsABataJCQAAGBNJREFUeNrt3V9y+r7Vx3Fj NoARuTeacB9VYQGPM92A2f9eimTZSb5PSAD/05Hens7QTy/6i/WqjqFHkotwlbq7oosf1fWy3WWq7lo+ WvsW4+B8jRBCmDahglA6oYUQQgghhBBCCCGEEEIIIRwT+V0IIYQQQjg2KgilE1bqJV7C8FmH/zy2WH5c i5gNI6rCkK4Qq5e6iHSsIIQQQgghhBBCCCGEEEIIIYQQQgghhBBCCCGE8K+oIJROaM/xEoaLfuGvka49