From 6cc1c208731cb3d58b3ff14cbf7178019210f69b Mon Sep 17 00:00:00 2001 From: prodigygirl Date: Sun, 18 Sep 2022 19:11:53 +0400 Subject: [PATCH 1/4] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=201?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ArmoredCar/ArmoredCar/ArmoredCar.csproj | 15 ++ ArmoredCar/ArmoredCar/Direction.cs | 16 ++ ArmoredCar/ArmoredCar/DrawningArmoredCar.cs | 171 ++++++++++++++++ ArmoredCar/ArmoredCar/EntityArmoredCar.cs | 41 ++++ ArmoredCar/ArmoredCar/Form1.Designer.cs | 41 ---- ArmoredCar/ArmoredCar/Form1.cs | 21 -- ArmoredCar/ArmoredCar/FormCar.Designer.cs | 183 ++++++++++++++++++ ArmoredCar/ArmoredCar/FormCar.cs | 86 ++++++++ ArmoredCar/ArmoredCar/FormCar.resx | 63 ++++++ ArmoredCar/ArmoredCar/Program.cs | 2 +- .../Properties/Resources.Designer.cs | 103 ++++++++++ .../{Form1.resx => Properties/Resources.resx} | 13 ++ ArmoredCar/ArmoredCar/Resources/Down.png | Bin 0 -> 23404 bytes ArmoredCar/ArmoredCar/Resources/Left.png | Bin 0 -> 23180 bytes ArmoredCar/ArmoredCar/Resources/Right.png | Bin 0 -> 23443 bytes ArmoredCar/ArmoredCar/Resources/Up.png | Bin 0 -> 3963 bytes 16 files changed, 692 insertions(+), 63 deletions(-) create mode 100644 ArmoredCar/ArmoredCar/Direction.cs create mode 100644 ArmoredCar/ArmoredCar/DrawningArmoredCar.cs create mode 100644 ArmoredCar/ArmoredCar/EntityArmoredCar.cs delete mode 100644 ArmoredCar/ArmoredCar/Form1.Designer.cs delete mode 100644 ArmoredCar/ArmoredCar/Form1.cs create mode 100644 ArmoredCar/ArmoredCar/FormCar.Designer.cs create mode 100644 ArmoredCar/ArmoredCar/FormCar.cs create mode 100644 ArmoredCar/ArmoredCar/FormCar.resx create mode 100644 ArmoredCar/ArmoredCar/Properties/Resources.Designer.cs rename ArmoredCar/ArmoredCar/{Form1.resx => Properties/Resources.resx} (84%) create mode 100644 ArmoredCar/ArmoredCar/Resources/Down.png create mode 100644 ArmoredCar/ArmoredCar/Resources/Left.png create mode 100644 ArmoredCar/ArmoredCar/Resources/Right.png create mode 100644 ArmoredCar/ArmoredCar/Resources/Up.png diff --git a/ArmoredCar/ArmoredCar/ArmoredCar.csproj b/ArmoredCar/ArmoredCar/ArmoredCar.csproj index 7108dcf..2f866a5 100644 --- a/ArmoredCar/ArmoredCar/ArmoredCar.csproj +++ b/ArmoredCar/ArmoredCar/ArmoredCar.csproj @@ -6,4 +6,19 @@ true + + + True + True + Resources.resx + + + + + + ResXFileCodeGenerator + Resources.Designer.cs + + + \ No newline at end of file diff --git a/ArmoredCar/ArmoredCar/Direction.cs b/ArmoredCar/ArmoredCar/Direction.cs new file mode 100644 index 0000000..4bcfc42 --- /dev/null +++ b/ArmoredCar/ArmoredCar/Direction.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ArmoredCar +{ + enum Direction + { + Up = 1, + Down = 2, + Left = 3, + Right = 4 + } +} diff --git a/ArmoredCar/ArmoredCar/DrawningArmoredCar.cs b/ArmoredCar/ArmoredCar/DrawningArmoredCar.cs new file mode 100644 index 0000000..f3b923f --- /dev/null +++ b/ArmoredCar/ArmoredCar/DrawningArmoredCar.cs @@ -0,0 +1,171 @@ +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ArmoredCar +{ + internal class DrawningArmoredCar + { + /// + /// Класс-сущность + /// + public EntityArmoredCar ArmoredCar { private set; get; } + /// + /// Левая координата отрисовки бронированной машины + /// + private float _startPosX; + /// + /// Верхняя кооридната отрисовки бронированной машины + /// + private float _startPosY; + /// + /// Ширина окна отрисовки + /// + private int? _pictureWidth = null; + /// + /// Высота окна отрисовки + /// + private int? _pictureHeight = null; + /// + /// Ширина отрисовки бронированной машины + /// + private readonly int _carWidth = 80; + /// + /// Высота отрисовки бронированной машины + /// + private readonly int _carHeight = 50; + /// + /// Инициализация свойств + /// + /// Скорость + /// Вес автомобиля + /// Цвет кузова + public void Init(int speed, float weight, Color bodyColor) + { + ArmoredCar = new EntityArmoredCar(); + ArmoredCar.Init(speed, weight, bodyColor); + } + /// + /// Установка позиции автомобиля + /// + /// Координата X + /// Координата Y + /// Ширина картинки + /// Высота картинки + public void SetPosition(int x, int y, int width, int height) + { + + if (x > 0 && y > 0 && x + _carWidth < width && y + _carHeight < height) { + _startPosX = x; + _startPosY = y; + _pictureWidth = width; + _pictureHeight = height; + } + } + + /// + /// Изменение направления перемещения + /// + /// Направление + public void MoveTransport(Direction direction) + { + if (!_pictureWidth.HasValue || !_pictureHeight.HasValue) + { + return; + } + switch (direction) + { + // вправо + case Direction.Right: + if (_startPosX + _carWidth + ArmoredCar.Step < _pictureWidth) + { + _startPosX += ArmoredCar.Step; + } + break; + //влево + case Direction.Left: + + if (_startPosX - ArmoredCar.Step > 0) + { + _startPosX -= ArmoredCar.Step; + } + break; + //вверх + case Direction.Up: + + if (_startPosY - ArmoredCar.Step > 0) + { + _startPosY -= ArmoredCar.Step; + } + break; + //вниз + case Direction.Down: + if (_startPosY + _carHeight + ArmoredCar.Step < _pictureHeight) + { + _startPosY += ArmoredCar.Step; + } + break; + } + } + /// + /// Отрисовка автомобиля + /// + /// + public void DrawTransport(Graphics g) + { + if (_startPosX < 0 || _startPosY < 0 + || !_pictureHeight.HasValue || !_pictureWidth.HasValue) + { + return; + } + Pen pen = new(Color.Black); + + + Brush br = new SolidBrush(ArmoredCar?.BodyColor ?? Color.Black); + g.FillRectangle(br, _startPosX + 20, _startPosY, 40, 20); + g.FillRectangle(br, _startPosX, _startPosY + 20, 80, 20); + + g.FillEllipse(br, _startPosX, _startPosY + 30, 20, 20); + + g.FillEllipse(br, _startPosX + 80 - 20, _startPosY + 30, 20, 20); + + g.FillRectangle(br, _startPosX + 15, _startPosY + 20, 60, 30); + + Brush brGray = new SolidBrush(Color.LightGray); + g.FillEllipse(brGray, _startPosX, _startPosY + 30, 20, 20); + g.FillEllipse(brGray, _startPosX + 30, _startPosY + 30, 20, 20); + g.FillEllipse(brGray, _startPosX + 80 - 20, _startPosY + 30, 20, 20); + + + + } + /// + /// Смена границ формы отрисовки + /// + /// Ширина картинки + /// Высота картинки + public void ChangeBorders(int width, int height) + { + _pictureWidth = width; + _pictureHeight = height; + if (_pictureWidth <= _carWidth || _pictureHeight <= _carHeight) + { + _pictureWidth = null; + _pictureHeight = null; + return; + } + if (_startPosX + _carWidth > _pictureWidth) + { + _startPosX = _pictureWidth.Value - _carWidth; + } + if (_startPosY + _carHeight > _pictureHeight) + { + _startPosY = _pictureHeight.Value - _carHeight; + } + } + + } +} diff --git a/ArmoredCar/ArmoredCar/EntityArmoredCar.cs b/ArmoredCar/ArmoredCar/EntityArmoredCar.cs new file mode 100644 index 0000000..d480da0 --- /dev/null +++ b/ArmoredCar/ArmoredCar/EntityArmoredCar.cs @@ -0,0 +1,41 @@ +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Text; + +namespace ArmoredCar +{ + internal class EntityArmoredCar + { + /// + /// Скорость + /// + public int Speed { get; private set; } + /// + /// Вес + /// + public float Weight { get; private set; } + /// + /// Цвет кузова + /// + public Color BodyColor { get; private set; } + /// + /// Шаг перемещения автомобиля + /// + public float Step => Speed * 100 / Weight; + /// + /// Инициализация полей объекта-класса автомобиля + /// + /// + /// + /// + /// + public void Init(int speed, float weight, Color bodyColor) + { + Random rnd = new(); + Speed = speed <= 0 ? rnd.Next(50, 150) : speed; + Weight = weight <= 0 ? rnd.Next(40, 70) : weight; + BodyColor = bodyColor; + } + } +} diff --git a/ArmoredCar/ArmoredCar/Form1.Designer.cs b/ArmoredCar/ArmoredCar/Form1.Designer.cs deleted file mode 100644 index 7124a9c..0000000 --- a/ArmoredCar/ArmoredCar/Form1.Designer.cs +++ /dev/null @@ -1,41 +0,0 @@ - -namespace ArmoredCar -{ - 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 - } -} - diff --git a/ArmoredCar/ArmoredCar/Form1.cs b/ArmoredCar/ArmoredCar/Form1.cs deleted file mode 100644 index 7dbac09..0000000 --- a/ArmoredCar/ArmoredCar/Form1.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; - -namespace ArmoredCar -{ - public partial class Form1 : Form - { - public Form1() - { - InitializeComponent(); - } - - } -} diff --git a/ArmoredCar/ArmoredCar/FormCar.Designer.cs b/ArmoredCar/ArmoredCar/FormCar.Designer.cs new file mode 100644 index 0000000..ee06a1f --- /dev/null +++ b/ArmoredCar/ArmoredCar/FormCar.Designer.cs @@ -0,0 +1,183 @@ + +namespace ArmoredCar +{ + partial class FormCar + { + /// + /// 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.statusStrip1 = new System.Windows.Forms.StatusStrip(); + this.toolStripStatusLabelSpeed = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusLabelWeight = new System.Windows.Forms.ToolStripStatusLabel(); + this.toolStripStatusLabelBodyColor = new System.Windows.Forms.ToolStripStatusLabel(); + this.pictureBoxCar = new System.Windows.Forms.PictureBox(); + this.button1 = new System.Windows.Forms.Button(); + this.buttonUp = new System.Windows.Forms.Button(); + this.buttonLeft = new System.Windows.Forms.Button(); + this.buttonDown = new System.Windows.Forms.Button(); + this.buttonRight = new System.Windows.Forms.Button(); + this.statusStrip1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxCar)).BeginInit(); + this.SuspendLayout(); + // + // statusStrip1 + // + this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripStatusLabelSpeed, + this.toolStripStatusLabelWeight, + this.toolStripStatusLabelBodyColor}); + this.statusStrip1.Location = new System.Drawing.Point(0, 428); + this.statusStrip1.Name = "statusStrip1"; + this.statusStrip1.Size = new System.Drawing.Size(800, 22); + this.statusStrip1.TabIndex = 0; + this.statusStrip1.Text = "statusStrip1"; + // + // toolStripStatusLabelSpeed + // + this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed"; + this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(62, 17); + this.toolStripStatusLabelSpeed.Text = "Скорость:"; + // + // toolStripStatusLabelWeight + // + this.toolStripStatusLabelWeight.Name = "toolStripStatusLabelWeight"; + this.toolStripStatusLabelWeight.Size = new System.Drawing.Size(32, 17); + this.toolStripStatusLabelWeight.Text = "Вес: "; + // + // toolStripStatusLabelBodyColor + // + this.toolStripStatusLabelBodyColor.Name = "toolStripStatusLabelBodyColor"; + this.toolStripStatusLabelBodyColor.Size = new System.Drawing.Size(36, 17); + this.toolStripStatusLabelBodyColor.Text = "Цвет:"; + // + // pictureBoxCar + // + this.pictureBoxCar.Dock = System.Windows.Forms.DockStyle.Fill; + this.pictureBoxCar.Location = new System.Drawing.Point(0, 0); + this.pictureBoxCar.Name = "pictureBoxCar"; + this.pictureBoxCar.Size = new System.Drawing.Size(800, 428); + this.pictureBoxCar.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; + this.pictureBoxCar.TabIndex = 6; + this.pictureBoxCar.TabStop = false; + this.pictureBoxCar.Resize += new System.EventHandler(this.PictureBoxCar_Resize); + // + // button1 + // + this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.button1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; + this.button1.Location = new System.Drawing.Point(42, 382); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(75, 23); + this.button1.TabIndex = 7; + this.button1.Text = "Создать"; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.ButtonCreate_Click); + // + // buttonUp + // + this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonUp.BackgroundImage = global::ArmoredCar.Properties.Resources.Up; + this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; + this.buttonUp.Location = new System.Drawing.Point(692, 324); + this.buttonUp.Name = "buttonUp"; + this.buttonUp.Size = new System.Drawing.Size(30, 30); + this.buttonUp.TabIndex = 8; + this.buttonUp.UseVisualStyleBackColor = true; + this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click); + // + // buttonLeft + // + this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonLeft.BackgroundImage = global::ArmoredCar.Properties.Resources.Left; + this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; + this.buttonLeft.Location = new System.Drawing.Point(656, 360); + this.buttonLeft.Name = "buttonLeft"; + this.buttonLeft.Size = new System.Drawing.Size(30, 30); + this.buttonLeft.TabIndex = 9; + this.buttonLeft.UseVisualStyleBackColor = true; + this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click); + // + // buttonDown + // + this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonDown.BackgroundImage = global::ArmoredCar.Properties.Resources.Down; + this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; + this.buttonDown.Location = new System.Drawing.Point(692, 360); + this.buttonDown.Name = "buttonDown"; + this.buttonDown.Size = new System.Drawing.Size(30, 30); + this.buttonDown.TabIndex = 10; + this.buttonDown.UseVisualStyleBackColor = true; + this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click); + // + // buttonRight + // + this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonRight.BackgroundImage = global::ArmoredCar.Properties.Resources.Right; + this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; + this.buttonRight.Location = new System.Drawing.Point(728, 360); + this.buttonRight.Name = "buttonRight"; + this.buttonRight.Size = new System.Drawing.Size(30, 30); + this.buttonRight.TabIndex = 11; + this.buttonRight.UseVisualStyleBackColor = true; + this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click); + // + // FormCar + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(800, 450); + this.Controls.Add(this.buttonRight); + this.Controls.Add(this.buttonDown); + this.Controls.Add(this.buttonLeft); + this.Controls.Add(this.buttonUp); + this.Controls.Add(this.button1); + this.Controls.Add(this.pictureBoxCar); + this.Controls.Add(this.statusStrip1); + this.Name = "FormCar"; + this.Text = "Бронированная машина"; + this.statusStrip1.ResumeLayout(false); + this.statusStrip1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxCar)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.StatusStrip statusStrip1; + private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabelSpeed; + private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabelWeight; + private System.Windows.Forms.ToolStripStatusLabel toolStripStatusLabelBodyColor; + private System.Windows.Forms.PictureBox pictureBoxCar; + private System.Windows.Forms.Button button1; + private System.Windows.Forms.Button buttonUp; + private System.Windows.Forms.Button buttonLeft; + private System.Windows.Forms.Button buttonDown; + private System.Windows.Forms.Button buttonRight; + } +} + diff --git a/ArmoredCar/ArmoredCar/FormCar.cs b/ArmoredCar/ArmoredCar/FormCar.cs new file mode 100644 index 0000000..9f5049c --- /dev/null +++ b/ArmoredCar/ArmoredCar/FormCar.cs @@ -0,0 +1,86 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace ArmoredCar +{ + public partial class FormCar : Form + { + private DrawningArmoredCar _car; + + public FormCar() + { + InitializeComponent(); + } + /// + /// Метод прорисовки машины + /// + private void Draw() + { + Bitmap bmp = new(pictureBoxCar.Width, pictureBoxCar.Height); + Graphics gr = Graphics.FromImage(bmp); + _car?.DrawTransport(gr); + pictureBoxCar.Image = bmp; + } + /// + /// Обработка нажатия кнопки "Создать" + /// + /// + /// + private void ButtonCreate_Click(object sender, EventArgs e) + { + Random rnd = new(); + _car = new DrawningArmoredCar(); + _car.Init(rnd.Next(100, 300), rnd.Next(1000, 2000), + Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); + _car.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxCar.Width, pictureBoxCar.Height); + + toolStripStatusLabelSpeed.Text = $"Скорость: {_car.ArmoredCar.Speed}"; + toolStripStatusLabelWeight.Text = $"Вес: {_car.ArmoredCar.Weight}"; + toolStripStatusLabelBodyColor.Text = $"Цвет: { _car.ArmoredCar.BodyColor.Name}"; + Draw(); + } + /// + /// Изменение размеров формы + /// + /// + /// + private void ButtonMove_Click(object sender, EventArgs e) + { + //получаем имя кнопки + string name = ((Button)sender)?.Name ?? string.Empty; + switch (name) + { + case "buttonUp": + _car?.MoveTransport(Direction.Up); + break; + case "buttonDown": + _car?.MoveTransport(Direction.Down); + break; + case "buttonLeft": + _car?.MoveTransport(Direction.Left); + break; + case "buttonRight": + _car?.MoveTransport(Direction.Right); + break; + } + Draw(); + } + /// + /// Изменение размеров формы + /// + /// + /// + private void PictureBoxCar_Resize(object sender, EventArgs e) + { + _car?.ChangeBorders(pictureBoxCar.Width, pictureBoxCar.Height); + Draw(); + } + } +} diff --git a/ArmoredCar/ArmoredCar/FormCar.resx b/ArmoredCar/ArmoredCar/FormCar.resx new file mode 100644 index 0000000..5cb320f --- /dev/null +++ b/ArmoredCar/ArmoredCar/FormCar.resx @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + 17, 17 + + \ No newline at end of file diff --git a/ArmoredCar/ArmoredCar/Program.cs b/ArmoredCar/ArmoredCar/Program.cs index 830c888..d8b6012 100644 --- a/ArmoredCar/ArmoredCar/Program.cs +++ b/ArmoredCar/ArmoredCar/Program.cs @@ -17,7 +17,7 @@ namespace ArmoredCar Application.SetHighDpiMode(HighDpiMode.SystemAware); Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); - Application.Run(new Form1()); + Application.Run(new FormCar()); } } } diff --git a/ArmoredCar/ArmoredCar/Properties/Resources.Designer.cs b/ArmoredCar/ArmoredCar/Properties/Resources.Designer.cs new file mode 100644 index 0000000..9ee6e7c --- /dev/null +++ b/ArmoredCar/ArmoredCar/Properties/Resources.Designer.cs @@ -0,0 +1,103 @@ +//------------------------------------------------------------------------------ +// +// Этот код создан программой. +// Исполняемая версия:4.0.30319.42000 +// +// Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае +// повторной генерации кода. +// +//------------------------------------------------------------------------------ + +namespace ArmoredCar.Properties { + using System; + + + /// + /// Класс ресурса со строгой типизацией для поиска локализованных строк и т.д. + /// + // Этот класс создан автоматически классом StronglyTypedResourceBuilder + // с помощью такого средства, как ResGen или Visual Studio. + // Чтобы добавить или удалить член, измените файл .ResX и снова запустите ResGen + // с параметром /str или перестройте свой проект VS. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// + /// Возвращает кэшированный экземпляр ResourceManager, использованный этим классом. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ArmoredCar.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Перезаписывает свойство CurrentUICulture текущего потока для всех + /// обращений к ресурсу с помощью этого класса ресурса со строгой типизацией. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Down { + get { + object obj = ResourceManager.GetObject("Down", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Left { + get { + object obj = ResourceManager.GetObject("Left", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Right { + get { + object obj = ResourceManager.GetObject("Right", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap Up { + get { + object obj = ResourceManager.GetObject("Up", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + } +} diff --git a/ArmoredCar/ArmoredCar/Form1.resx b/ArmoredCar/ArmoredCar/Properties/Resources.resx similarity index 84% rename from ArmoredCar/ArmoredCar/Form1.resx rename to ArmoredCar/ArmoredCar/Properties/Resources.resx index 1af7de1..885b37b 100644 --- a/ArmoredCar/ArmoredCar/Form1.resx +++ b/ArmoredCar/ArmoredCar/Properties/Resources.resx @@ -117,4 +117,17 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\Left.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Down.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Up.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Right.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/ArmoredCar/ArmoredCar/Resources/Down.png b/ArmoredCar/ArmoredCar/Resources/Down.png new file mode 100644 index 0000000000000000000000000000000000000000..6097b2013ed2543623cf564425f8016fed41c8d6 GIT binary patch literal 23404 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 c4ZR09p1c?*IS* literal 0 HcmV?d00001 diff --git a/ArmoredCar/ArmoredCar/Resources/Left.png b/ArmoredCar/ArmoredCar/Resources/Left.png new file mode 100644 index 0000000000000000000000000000000000000000..ed93e34e48e2aee78d7b6ecbf4d0163cf4873147 GIT binary patch literal 23180 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 Date: Fri, 30 Sep 2022 15:09:33 +0400 Subject: [PATCH 2/4] bugs fixed --- ArmoredCar/ArmoredCar/DrawningArmoredCar.cs | 3 --- ArmoredCar/ArmoredCar/FormCar.Designer.cs | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/ArmoredCar/ArmoredCar/DrawningArmoredCar.cs b/ArmoredCar/ArmoredCar/DrawningArmoredCar.cs index f3b923f..cfc9212 100644 --- a/ArmoredCar/ArmoredCar/DrawningArmoredCar.cs +++ b/ArmoredCar/ArmoredCar/DrawningArmoredCar.cs @@ -138,9 +138,6 @@ namespace ArmoredCar g.FillEllipse(brGray, _startPosX, _startPosY + 30, 20, 20); g.FillEllipse(brGray, _startPosX + 30, _startPosY + 30, 20, 20); g.FillEllipse(brGray, _startPosX + 80 - 20, _startPosY + 30, 20, 20); - - - } /// /// Смена границ формы отрисовки diff --git a/ArmoredCar/ArmoredCar/FormCar.Designer.cs b/ArmoredCar/ArmoredCar/FormCar.Designer.cs index ee06a1f..834216f 100644 --- a/ArmoredCar/ArmoredCar/FormCar.Designer.cs +++ b/ArmoredCar/ArmoredCar/FormCar.Designer.cs @@ -86,7 +86,7 @@ namespace ArmoredCar // // button1 // - this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.button1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.button1.Location = new System.Drawing.Point(42, 382); this.button1.Name = "button1"; From 755567afd7169472d049a3d1a60cd06fe9b7e065 Mon Sep 17 00:00:00 2001 From: prodigygirl Date: Sat, 1 Oct 2022 23:21:50 +0400 Subject: [PATCH 3/4] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D0=B3=D0=BE=D1=82=D0=BE?= =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=BD=D0=B0=D1=8F=20=D0=BB=D0=B0=D0=B1?= =?UTF-8?q?=D0=BE=D1=80=D0=B0=D1=82=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80?= =?UTF-8?q?=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=201?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ArmoredCar/ArmoredCar/DrawningArmoredCar.cs | 6 +++--- ArmoredCar/ArmoredCar/EntityArmoredCar.cs | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ArmoredCar/ArmoredCar/DrawningArmoredCar.cs b/ArmoredCar/ArmoredCar/DrawningArmoredCar.cs index cfc9212..771262b 100644 --- a/ArmoredCar/ArmoredCar/DrawningArmoredCar.cs +++ b/ArmoredCar/ArmoredCar/DrawningArmoredCar.cs @@ -41,7 +41,7 @@ namespace ArmoredCar /// Инициализация свойств /// /// Скорость - /// Вес автомобиля + /// Вес бронированной машины /// Цвет кузова public void Init(int speed, float weight, Color bodyColor) { @@ -49,7 +49,7 @@ namespace ArmoredCar ArmoredCar.Init(speed, weight, bodyColor); } /// - /// Установка позиции автомобиля + /// Установка позиции бронированной машины /// /// Координата X /// Координата Y @@ -111,7 +111,7 @@ namespace ArmoredCar } } /// - /// Отрисовка автомобиля + /// Отрисовка бронированной машины /// /// public void DrawTransport(Graphics g) diff --git a/ArmoredCar/ArmoredCar/EntityArmoredCar.cs b/ArmoredCar/ArmoredCar/EntityArmoredCar.cs index d480da0..a63e8c2 100644 --- a/ArmoredCar/ArmoredCar/EntityArmoredCar.cs +++ b/ArmoredCar/ArmoredCar/EntityArmoredCar.cs @@ -20,11 +20,11 @@ namespace ArmoredCar /// public Color BodyColor { get; private set; } /// - /// Шаг перемещения автомобиля + /// Шаг перемещения бронированной машины /// public float Step => Speed * 100 / Weight; /// - /// Инициализация полей объекта-класса автомобиля + /// Инициализация полей объекта-класса бронированной машины /// /// /// From 5b9d9060045c0ef2c09bfab53dc8a780dfd60d17 Mon Sep 17 00:00:00 2001 From: prodigygirl Date: Sun, 2 Oct 2022 20:08:25 +0400 Subject: [PATCH 4/4] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B0=20?= =?UTF-8?q?=D1=81=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=BE=D0=B9?= =?UTF-8?q?=20=D0=BA=D0=BE=D0=BE=D1=80=D0=B4=D0=B8=D0=BD=D0=B0=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ArmoredCar/ArmoredCar/DrawningArmoredCar.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ArmoredCar/ArmoredCar/DrawningArmoredCar.cs b/ArmoredCar/ArmoredCar/DrawningArmoredCar.cs index 771262b..a0ae58b 100644 --- a/ArmoredCar/ArmoredCar/DrawningArmoredCar.cs +++ b/ArmoredCar/ArmoredCar/DrawningArmoredCar.cs @@ -58,7 +58,7 @@ namespace ArmoredCar public void SetPosition(int x, int y, int width, int height) { - if (x > 0 && y > 0 && x + _carWidth < width && y + _carHeight < height) { + if (x >= 0 && y >= 0 && x + _carWidth < width && y + _carHeight < height) { _startPosX = x; _startPosY = y; _pictureWidth = width;