From c2c84d5e29685fb215b25e7ba0bcb35c29951d02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B5=D0=BB=D1=8C=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20?= =?UTF-8?q?=D0=98=D0=B3=D0=BE=D1=80=D1=8C?= Date: Thu, 15 Sep 2022 19:01:14 +0400 Subject: [PATCH 1/2] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B2=D0=B0=D1=8F=20?= =?UTF-8?q?=D0=BB=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82=D0=BE=D1=80=D0=BD?= =?UTF-8?q?=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Locomotives/Locomotives/Direction.cs | 25 +++ Locomotives/Locomotives/DrawningLocomotive.cs | 190 ++++++++++++++++++ Locomotives/Locomotives/EntityLocomotive.cs | 38 ++++ Locomotives/Locomotives/Form1.Designer.cs | 39 ---- Locomotives/Locomotives/Form1.cs | 10 - .../Locomotives/FormLocomotive.Designer.cs | 181 +++++++++++++++++ Locomotives/Locomotives/FormLocomotive.cs | 87 ++++++++ Locomotives/Locomotives/FormLocomotive.resx | 63 ++++++ Locomotives/Locomotives/Locomotives.csproj | 19 ++ Locomotives/Locomotives/Program.cs | 4 +- .../Properties/Resources.Designer.cs | 103 ++++++++++ .../{Form1.resx => Properties/Resources.resx} | 13 ++ .../Locomotives/Resources/ArrowDown.png | Bin 0 -> 483 bytes .../Locomotives/Resources/ArrowLeft.png | Bin 0 -> 444 bytes .../Locomotives/Resources/ArrowRight.png | Bin 0 -> 464 bytes Locomotives/Locomotives/Resources/ArrowUp.png | Bin 0 -> 459 bytes 16 files changed, 720 insertions(+), 52 deletions(-) create mode 100644 Locomotives/Locomotives/Direction.cs create mode 100644 Locomotives/Locomotives/DrawningLocomotive.cs create mode 100644 Locomotives/Locomotives/EntityLocomotive.cs delete mode 100644 Locomotives/Locomotives/Form1.Designer.cs delete mode 100644 Locomotives/Locomotives/Form1.cs create mode 100644 Locomotives/Locomotives/FormLocomotive.Designer.cs create mode 100644 Locomotives/Locomotives/FormLocomotive.cs create mode 100644 Locomotives/Locomotives/FormLocomotive.resx create mode 100644 Locomotives/Locomotives/Properties/Resources.Designer.cs rename Locomotives/Locomotives/{Form1.resx => Properties/Resources.resx} (83%) create mode 100644 Locomotives/Locomotives/Resources/ArrowDown.png create mode 100644 Locomotives/Locomotives/Resources/ArrowLeft.png create mode 100644 Locomotives/Locomotives/Resources/ArrowRight.png create mode 100644 Locomotives/Locomotives/Resources/ArrowUp.png diff --git a/Locomotives/Locomotives/Direction.cs b/Locomotives/Locomotives/Direction.cs new file mode 100644 index 0000000..1a83fbb --- /dev/null +++ b/Locomotives/Locomotives/Direction.cs @@ -0,0 +1,25 @@ +namespace Locomotives +{ + /// + /// Перечисление направлений перемещения + /// + internal enum Direction + { + /// + /// вверх + /// + Up = 1, + /// + /// вниз + /// + Down = 2, + /// + /// влево + /// + Left = 3, + /// + /// вправо + /// + Right = 4 + } +} diff --git a/Locomotives/Locomotives/DrawningLocomotive.cs b/Locomotives/Locomotives/DrawningLocomotive.cs new file mode 100644 index 0000000..bec846b --- /dev/null +++ b/Locomotives/Locomotives/DrawningLocomotive.cs @@ -0,0 +1,190 @@ +namespace Locomotives +{ + /// + /// Класс, отвечающий за отрисовку объекта-сущности + /// + internal class DrawningLocomotive + { + /// + /// Класс-сущность + /// + public EntityLocomotive Locomotive { get; private set; } + /// + /// Левая координата отрисовки локомотива + /// + private float _startPosX; + /// + /// Верхняя координата отрисовки локомотива + /// + private float _startPosY; + /// + /// Ширина окна отрисовки + /// + private int? _pictureWidth; + /// + /// Высота окна отрисовки + /// + private int? _pictureHeight; + /// + /// Ширина локомотива + /// + protected readonly int _locomotiveWidth = 160; + /// + /// Высота локомотива + /// + protected readonly int _locomotiveHeight = 60; + /// + /// Инициализация свойств объекта-сущности + /// + /// Скорость + /// Вес + /// Цвет кузова + public void Init(int speed, float weight, Color bodyColor) + { + Locomotive = new EntityLocomotive(); + Locomotive.Init(speed, weight, bodyColor); + } + /// + /// Установка начальной позиции локомотива + /// + /// Левая координата + /// Правая координата + /// Ширина + /// Высота + public void SetPosition(int x, int y, int width, int height) + { + if (x < 0 || y < 0 || x + _locomotiveWidth > width || y + _locomotiveHeight > height) + { + return; + } + _startPosX = x; + _startPosY = y; + _pictureWidth = width; + _pictureHeight = height; + } + /// + /// Перемещение локомотива в зависимости от направления + /// + /// Направление + public void MoveLocomotive(Direction direction) + { + if (!_pictureWidth.HasValue || !_pictureHeight.HasValue) + { + return; + } + if (!_pictureWidth.HasValue || !_pictureHeight.HasValue) + { + return; + } + switch (direction) + { + //вправо + case Direction.Right: + if (_startPosX + _locomotiveWidth + Locomotive.Step < _pictureWidth) + { + _startPosX += Locomotive.Step; + } + break; + //влево + case Direction.Left: + if (_startPosX >= Locomotive.Step) + { + _startPosX -= Locomotive.Step; + } + break; + //вверх + case Direction.Up: + if (_startPosY >= Locomotive.Step) + { + _startPosY -= Locomotive.Step; + } + break; + //вниз + case Direction.Down: + if (_startPosY + _locomotiveHeight + Locomotive.Step < _pictureHeight) + { + _startPosY += Locomotive.Step; + } + break; + } + } + /// + /// Метод отрисовки локомотива + /// + /// Графика + public void DrawTransport(Graphics g) + { + if (_startPosX < 0 || _startPosY < 0 || !_pictureHeight.HasValue || !_pictureWidth.HasValue) + { + return; + } + //кузов + Pen penBodyColor = new Pen(Locomotive?.BodyColor ?? Color.Black); + for (int i = (int)_startPosX + 10; i <= _startPosX + 20; i++) + { + g.DrawLine(penBodyColor, _startPosX + 20, _startPosY, i, _startPosY + 20); + } + Brush brBodyColor = new SolidBrush(Locomotive?.BodyColor ?? Color.Black); + g.FillRectangle(brBodyColor, _startPosX + 20, _startPosY, 130, 20);//верхняя часть + g.FillRectangle(brBodyColor, _startPosX + 10, _startPosY + 20, 140, 20);//нижняя часть + //переход + Brush brBlack = new SolidBrush(Color.Black); + g.FillRectangle(brBlack, _startPosX + 150, _startPosY + 5, 10, 30); + Pen pen = new(Color.Black); + //границы локомотива + g.DrawLine(pen, _startPosX + 20, _startPosY, _startPosX + 10, _startPosY + 20); + g.DrawLine(pen, _startPosX, _startPosY + 50, _startPosX + 10, _startPosY + 50); + for (int i = (int)_startPosX + 10; i <= (int)_startPosX + 20; i++) + { + g.DrawLine(pen, i, _startPosY + 40, i - 10, _startPosY + 50); + } + for (int i = (int)_startPosX + 140; i <= (int)_startPosX + 150; i++) + { + g.DrawLine(pen, i, _startPosY + 40, i + 10, _startPosY + 50); + } + g.DrawRectangle(pen, _startPosX + 10, _startPosY + 20, 140, 20); + g.DrawLine(pen, _startPosX + 20, _startPosY, _startPosX + 150, _startPosY); + g.DrawLine(pen, _startPosX + 150, _startPosY, _startPosX + 150, _startPosY + 20); + //окна + Brush brWhite = new SolidBrush(Color.White); + g.FillRectangle(brWhite, _startPosX + 25, _startPosY + 5, 10, 10); + g.DrawRectangle(pen, _startPosX + 25, _startPosY + 5, 10, 10); + g.FillRectangle(brWhite, _startPosX + 40, _startPosY + 5, 10, 10); + g.DrawRectangle(pen, _startPosX + 40, _startPosY + 5, 10, 10); + g.FillRectangle(brWhite, _startPosX + 130, _startPosY + 5, 10, 10); + g.DrawRectangle(pen, _startPosX + 130, _startPosY + 5, 10, 10); + //дверь + g.FillRectangle(brBodyColor, _startPosX + 60, _startPosY + 10, 15, 25); + g.DrawRectangle(pen, _startPosX + 60, _startPosY + 10, 15, 25); + //колёса + g.DrawEllipse(pen, _startPosX + 20, _startPosY + 40, 20, 15); + g.DrawEllipse(pen, _startPosX + 50, _startPosY + 40, 20, 15); + g.DrawEllipse(pen, _startPosX + 90, _startPosY + 40, 20, 15); + g.DrawEllipse(pen, _startPosX + 120, _startPosY + 40, 20, 15); + } + /// + /// Метод перерисовки при изменении границ рисунка + /// + /// Новая ширина + /// Новая высота + public void ChangeBorders(int width, int height) + { + _pictureWidth = width; + _pictureHeight = height; + if (_pictureWidth <= _locomotiveWidth || _pictureHeight <= _locomotiveHeight) + { + _pictureWidth = null; + _pictureHeight = null; + return; + } + if (_startPosX + _locomotiveWidth > _pictureWidth) + { + _startPosX = _pictureWidth.Value - _locomotiveWidth; + } + if (_startPosY + _locomotiveHeight > _pictureHeight) + { + _startPosY = _pictureHeight.Value - _locomotiveHeight; + } + } + } +} diff --git a/Locomotives/Locomotives/EntityLocomotive.cs b/Locomotives/Locomotives/EntityLocomotive.cs new file mode 100644 index 0000000..ed3183c --- /dev/null +++ b/Locomotives/Locomotives/EntityLocomotive.cs @@ -0,0 +1,38 @@ +namespace Locomotives +{ + /// + /// Класс-сущность локомотив + /// + internal class EntityLocomotive + { + /// + /// Скорость + /// + 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/Locomotives/Locomotives/Form1.Designer.cs b/Locomotives/Locomotives/Form1.Designer.cs deleted file mode 100644 index db9d739..0000000 --- a/Locomotives/Locomotives/Form1.Designer.cs +++ /dev/null @@ -1,39 +0,0 @@ -namespace Locomotives -{ - 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/Locomotives/Locomotives/Form1.cs b/Locomotives/Locomotives/Form1.cs deleted file mode 100644 index eaedb61..0000000 --- a/Locomotives/Locomotives/Form1.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace Locomotives -{ - public partial class Form1 : Form - { - public Form1() - { - InitializeComponent(); - } - } -} \ No newline at end of file diff --git a/Locomotives/Locomotives/FormLocomotive.Designer.cs b/Locomotives/Locomotives/FormLocomotive.Designer.cs new file mode 100644 index 0000000..0f12d4e --- /dev/null +++ b/Locomotives/Locomotives/FormLocomotive.Designer.cs @@ -0,0 +1,181 @@ +namespace Locomotives +{ + partial class FormLocomotive + { + /// + /// 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.pictureBoxLocomotive = new System.Windows.Forms.PictureBox(); + this.statusStrip = 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.buttonCreate = new System.Windows.Forms.Button(); + this.buttonRight = new System.Windows.Forms.Button(); + this.buttonLeft = new System.Windows.Forms.Button(); + this.buttonDown = new System.Windows.Forms.Button(); + this.buttonUp = new System.Windows.Forms.Button(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxLocomotive)).BeginInit(); + this.statusStrip.SuspendLayout(); + this.SuspendLayout(); + // + // pictureBoxLocomotive + // + this.pictureBoxLocomotive.Dock = System.Windows.Forms.DockStyle.Fill; + this.pictureBoxLocomotive.Location = new System.Drawing.Point(0, 0); + this.pictureBoxLocomotive.MinimumSize = new System.Drawing.Size(1, 1); + this.pictureBoxLocomotive.Name = "pictureBoxLocomotive"; + this.pictureBoxLocomotive.Size = new System.Drawing.Size(800, 428); + this.pictureBoxLocomotive.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; + this.pictureBoxLocomotive.TabIndex = 0; + this.pictureBoxLocomotive.TabStop = false; + this.pictureBoxLocomotive.Resize += new System.EventHandler(this.PictureBoxLocomotive_Resize); + // + // statusStrip + // + this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripStatusLabelSpeed, + this.toolStripStatusLabelWeight, + this.toolStripStatusLabelBodyColor}); + this.statusStrip.Location = new System.Drawing.Point(0, 428); + this.statusStrip.Name = "statusStrip"; + this.statusStrip.Size = new System.Drawing.Size(800, 22); + this.statusStrip.TabIndex = 1; + this.statusStrip.Text = "statusStrip1"; + // + // toolStripStatusLabelSpeed + // + this.toolStripStatusLabelSpeed.Name = "toolStripStatusLabelSpeed"; + this.toolStripStatusLabelSpeed.Size = new System.Drawing.Size(65, 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(39, 17); + this.toolStripStatusLabelBodyColor.Text = "Цвет: "; + // + // buttonCreate + // + this.buttonCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.buttonCreate.Location = new System.Drawing.Point(12, 395); + this.buttonCreate.Name = "buttonCreate"; + this.buttonCreate.Size = new System.Drawing.Size(90, 30); + this.buttonCreate.TabIndex = 2; + this.buttonCreate.Text = "Создать"; + this.buttonCreate.UseVisualStyleBackColor = true; + this.buttonCreate.Click += new System.EventHandler(this.ButtonCreate_Click); + // + // buttonRight + // + this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonRight.BackgroundImage = global::Locomotives.Properties.Resources.ArrowRight; + this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonRight.Location = new System.Drawing.Point(758, 395); + this.buttonRight.Name = "buttonRight"; + this.buttonRight.Size = new System.Drawing.Size(30, 30); + this.buttonRight.TabIndex = 3; + this.buttonRight.UseVisualStyleBackColor = true; + this.buttonRight.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::Locomotives.Properties.Resources.ArrowLeft; + this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonLeft.Location = new System.Drawing.Point(686, 395); + this.buttonLeft.Name = "buttonLeft"; + this.buttonLeft.Size = new System.Drawing.Size(30, 30); + this.buttonLeft.TabIndex = 4; + 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::Locomotives.Properties.Resources.ArrowDown; + this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonDown.Location = new System.Drawing.Point(722, 395); + this.buttonDown.Name = "buttonDown"; + this.buttonDown.Size = new System.Drawing.Size(30, 30); + this.buttonDown.TabIndex = 5; + this.buttonDown.UseVisualStyleBackColor = true; + this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click); + // + // buttonUp + // + this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonUp.BackgroundImage = global::Locomotives.Properties.Resources.ArrowUp; + this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.buttonUp.Location = new System.Drawing.Point(722, 359); + this.buttonUp.Name = "buttonUp"; + this.buttonUp.Size = new System.Drawing.Size(30, 30); + this.buttonUp.TabIndex = 6; + this.buttonUp.UseVisualStyleBackColor = true; + this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click); + // + // FormLocomotive + // + 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.buttonUp); + this.Controls.Add(this.buttonDown); + this.Controls.Add(this.buttonLeft); + this.Controls.Add(this.buttonRight); + this.Controls.Add(this.buttonCreate); + this.Controls.Add(this.pictureBoxLocomotive); + this.Controls.Add(this.statusStrip); + this.Name = "FormLocomotive"; + this.Text = "Локомотив"; + ((System.ComponentModel.ISupportInitialize)(this.pictureBoxLocomotive)).EndInit(); + this.statusStrip.ResumeLayout(false); + this.statusStrip.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private PictureBox pictureBoxLocomotive; + private StatusStrip statusStrip; + private ToolStripStatusLabel toolStripStatusLabelSpeed; + private ToolStripStatusLabel toolStripStatusLabelWeight; + private ToolStripStatusLabel toolStripStatusLabelBodyColor; + private Button buttonCreate; + private Button buttonRight; + private Button buttonLeft; + private Button buttonDown; + private Button buttonUp; + } +} \ No newline at end of file diff --git a/Locomotives/Locomotives/FormLocomotive.cs b/Locomotives/Locomotives/FormLocomotive.cs new file mode 100644 index 0000000..eaf8497 --- /dev/null +++ b/Locomotives/Locomotives/FormLocomotive.cs @@ -0,0 +1,87 @@ +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 Locomotives +{ + public partial class FormLocomotive : Form + { + /// + /// Объект от класса отрисовки локомотива + /// + private DrawningLocomotive _locomotive; + + public FormLocomotive() + { + InitializeComponent(); + } + /// + /// Метод отрисовки локомотива + /// + private void Draw() + { + Bitmap bmp = new(pictureBoxLocomotive.Width, pictureBoxLocomotive.Height); + Graphics gr = Graphics.FromImage(bmp); + _locomotive?.DrawTransport(gr); + pictureBoxLocomotive.Image = bmp; + } + /// + /// Метод обработки нажатия на кнопку "Создать" + /// + /// + /// + private void ButtonCreate_Click(object sender, EventArgs e) + { + Random rnd = new(); + _locomotive = new DrawningLocomotive(); + _locomotive.Init(rnd.Next(100, 300), rnd.Next(1000, 2000), Color.FromArgb(rnd.Next(0, 256), rnd.Next(0, 256), rnd.Next(0, 256))); + _locomotive.SetPosition(rnd.Next(10, 100), rnd.Next(10, 100), pictureBoxLocomotive.Width, pictureBoxLocomotive.Height); + toolStripStatusLabelSpeed.Text = $"Скорость: {_locomotive.Locomotive.Speed}"; + toolStripStatusLabelWeight.Text = $"Вес: {_locomotive.Locomotive.Weight}"; + toolStripStatusLabelBodyColor.Text = $"Цвет: {_locomotive.Locomotive.BodyColor.Name}"; + Draw(); + } + /// + /// Метод обработки нажатия на кнопки перемещения + /// + /// + /// + private void ButtonMove_Click(object sender, EventArgs e) + { + //получаем имя кнопки + string name = ((Button)sender)?.Name ?? string.Empty; + switch (name) + { + case "buttonUp": + _locomotive?.MoveLocomotive(Direction.Up); + break; + case "buttonDown": + _locomotive?.MoveLocomotive(Direction.Down); + break; + case "buttonLeft": + _locomotive?.MoveLocomotive(Direction.Left); + break; + case "buttonRight": + _locomotive?.MoveLocomotive(Direction.Right); + break; + } + Draw(); + } + /// + /// Изменение размеров формы + /// + /// + /// + private void PictureBoxLocomotive_Resize(object sender, EventArgs e) + { + _locomotive?.ChangeBorders(pictureBoxLocomotive.Width, pictureBoxLocomotive.Height); + Draw(); + } + } +} diff --git a/Locomotives/Locomotives/FormLocomotive.resx b/Locomotives/Locomotives/FormLocomotive.resx new file mode 100644 index 0000000..2c0949d --- /dev/null +++ b/Locomotives/Locomotives/FormLocomotive.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/Locomotives/Locomotives/Locomotives.csproj b/Locomotives/Locomotives/Locomotives.csproj index b57c89e..ce86fc6 100644 --- a/Locomotives/Locomotives/Locomotives.csproj +++ b/Locomotives/Locomotives/Locomotives.csproj @@ -8,4 +8,23 @@ enable + + + True + True + Resources.resx + + + + + + ResXFileCodeGenerator + Resources.Designer.cs + + + + + + + \ No newline at end of file diff --git a/Locomotives/Locomotives/Program.cs b/Locomotives/Locomotives/Program.cs index 621b25a..e09e379 100644 --- a/Locomotives/Locomotives/Program.cs +++ b/Locomotives/Locomotives/Program.cs @@ -8,10 +8,8 @@ namespace Locomotives [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 Form1()); + Application.Run(new FormLocomotive()); } } } \ No newline at end of file diff --git a/Locomotives/Locomotives/Properties/Resources.Designer.cs b/Locomotives/Locomotives/Properties/Resources.Designer.cs new file mode 100644 index 0000000..ec0923c --- /dev/null +++ b/Locomotives/Locomotives/Properties/Resources.Designer.cs @@ -0,0 +1,103 @@ +//------------------------------------------------------------------------------ +// +// Этот код создан программой. +// Исполняемая версия:4.0.30319.42000 +// +// Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае +// повторной генерации кода. +// +//------------------------------------------------------------------------------ + +namespace Locomotives.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("Locomotives.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 ArrowDown { + get { + object obj = ResourceManager.GetObject("ArrowDown", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ArrowLeft { + get { + object obj = ResourceManager.GetObject("ArrowLeft", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ArrowRight { + get { + object obj = ResourceManager.GetObject("ArrowRight", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap ArrowUp { + get { + object obj = ResourceManager.GetObject("ArrowUp", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + } +} diff --git a/Locomotives/Locomotives/Form1.resx b/Locomotives/Locomotives/Properties/Resources.resx similarity index 83% rename from Locomotives/Locomotives/Form1.resx rename to Locomotives/Locomotives/Properties/Resources.resx index 1af7de1..1ee1a77 100644 --- a/Locomotives/Locomotives/Form1.resx +++ b/Locomotives/Locomotives/Properties/Resources.resx @@ -117,4 +117,17 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\ArrowDown.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ArrowLeft.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ArrowRight.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ArrowUp.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/Locomotives/Locomotives/Resources/ArrowDown.png b/Locomotives/Locomotives/Resources/ArrowDown.png new file mode 100644 index 0000000000000000000000000000000000000000..d540c5754ccb1f745f83c63e06ea3ccb5503cfb5 GIT binary patch literal 483 zcmeAS@N?(olHy`uVBq!ia0vp^av;pX3?zBp#Z3TGjKx9jPK-BC>eK@{oCO|{#S9GG z!XV7ZFl&wkP%uBhC&aa~vhu)z13=!vg9nR>idL^)EhHr5=H|9@=gzHLw>mjF9XfQ# z)zuZKfQ^kUC@ARg;lum(?F$JBVPIXJ^O3!LfJmUUqhN zYinypMn)?ut2JxZaB*>Qa&o%3xUjIW9NM;e8PF`%k|4j}|4s~c|JVKhpH}_f;y(}= z`TqZ(^WWot+5i86ApS}avG{!BU!aCNo-U3d6?1AYy%uUx5MWKPn#$_R8nJB2)UW@} z&u~&Pza78fK2LQTyOY?AwNJa&be}crpCW4AWNRF+`Y2|pG5|jN7UKGF2A|q-rV1Jr+<7jGpQhE zRmlA>$IWUYgoIyDX+6H9d}7##O0M@u=T+ROk-GiZV9z4K_J^uTe22PQE~;&0j%&Z& zS9#0Exi9vI`Pog}`V-S-kM`ZDo6S{hleaJa+@~FtZIyac<*gI12>p-f{_v0Sr>9i1 UVBhBBKz}lLy85}Sb4q9e07q5M8~^|S literal 0 HcmV?d00001 diff --git a/Locomotives/Locomotives/Resources/ArrowLeft.png b/Locomotives/Locomotives/Resources/ArrowLeft.png new file mode 100644 index 0000000000000000000000000000000000000000..4012bd92829e350358aa51f89926166a954a61e9 GIT binary patch literal 444 zcmeAS@N?(olHy`uVBq!ia0vp^av;pX3?zBp#Z3TGjKx9jPK-BC>eK@{oCO|{#S9GG z!XV7ZFl&wkP%uBhC&U#4|l zSX*1Ov9aykxzokPg^P=ek&!VdDCqFv!&X*S4h{|+931=i?`LOc=j7zvw{KraNC*oH zi<6Vn)~#C)9z1AiX?f_-p>5l?6%`fbbey~mG*q=D$S;^--T$2b|D6K=1HsDw|II-iBz*&@VXLQ$V@SoE+6lLXnhbbc99>j`j&d(z_3r-n-<+#w zo9FCJ>(kS|t9WjjRI-_AbMC(GLrL+66xp;H8IA`p*=857R?~Y;Z)f3F-akdpbEe<2 ze5)K~ef+u~>jImVWntbvE6rAZ-Kx!4H^*$#){VCkbuYgACEh$WT5bx@hAStcXE#U} zm0AQ|nEz9F@BfbzeWo;@U(Q*wgv(%NhUwvpEe{QLEqeU3UTH$PFt5Jzopr027wAZvX%Q literal 0 HcmV?d00001 diff --git a/Locomotives/Locomotives/Resources/ArrowRight.png b/Locomotives/Locomotives/Resources/ArrowRight.png new file mode 100644 index 0000000000000000000000000000000000000000..dac9c8169e23012aede68e85729401b1893ada43 GIT binary patch literal 464 zcmeAS@N?(olHy`uVBq!ia0vp^av;pX3?zBp#Z3TGjKx9jPK-BC>eK@{oCO|{#S9GG z!XV7ZFl&wkP%uBhC&aa=sOZq4LqOiag9n9#gq)n5wr$%6xEfOiBk@8vbtRP zyFM_(`}w5%)w8}!Iq_{UZgKlq*sgd?Kzd*N*oTm45k&zJ>a=Hr$&(5xiv{k zJt;LR|DDU4JyWJ9|7|kV?%&68Y>!Qql7)Fj-yhcW&^XtC-prR4-2!W-UspEEvz;?X z`r!0i+g`uDck(I!^Ou{$udeK@{oCO|{#S9GG z!XV7ZFl&wkP%uBhC&U#<@7uR;@7}#3At82lc3Zb@Wnp1qW@g^8V~3NI6HwOG)%D=P zgPfe4TwGjh)~vC#v}9ytw6?Z(adA0x=+NrbtF5f8+}zwaI5_t2-|yhyaQN`ypr9aj zcJ`e+cW&FZjg5^>NJyxtsOZ3f1C^DP(ws-)fQG7;1o;Is_y+#}U;Y1o&j0`a?f(B? z38em8tOF7r|Be3tPb&kmoc_10>XZj+IO6Hz7*a8(cEW3+CItaEMW>|8L7&5J9ewq8 z{>CRpdXK8=iqfVT%O^9|9N#AJTUT4S^u`6L2OhUgm@Vdd&SiE844T&5*d-n&{LyIR ztd8pscC5Ln_1S85XU=gi8+I2N{SAGOmL9U|x-PIGqVC)_ooVNtxm}&pj(=3Trg3k* z?~&Ix7CpUqYuDRFKaTBxqM3YscE5gej%rMf{hh)+C*N(E6Ds{pEHin+IzXw^5f5c49ge<8dy>~bAkS0@O1TaS?83{1OQgU!n*(f literal 0 HcmV?d00001 From a8b275748d67fd33b324946a15e4d7453996b777 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B5=D0=BB=D1=8C=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2=20?= =?UTF-8?q?=D0=98=D0=B3=D0=BE=D1=80=D1=8C?= Date: Wed, 28 Sep 2022 11:38:36 +0400 Subject: [PATCH 2/2] =?UTF-8?q?=D0=9A=D0=BE=D1=80=D1=80=D0=B5=D0=BA=D1=82?= =?UTF-8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D0=B0=20=D1=80=D0=B0=D0=B7=D0=BC?= =?UTF-8?q?=D0=B5=D1=80=D0=BE=D0=B2=20=D0=BB=D0=BE=D0=BA=D0=BE=D0=BC=D0=BE?= =?UTF-8?q?=D1=82=D0=B8=D0=B2=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Locomotives/Locomotives/DrawningLocomotive.cs | 2 +- Locomotives/Locomotives/FormLocomotive.cs | 12 +----------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/Locomotives/Locomotives/DrawningLocomotive.cs b/Locomotives/Locomotives/DrawningLocomotive.cs index bec846b..39ddb63 100644 --- a/Locomotives/Locomotives/DrawningLocomotive.cs +++ b/Locomotives/Locomotives/DrawningLocomotive.cs @@ -32,7 +32,7 @@ /// /// Высота локомотива /// - protected readonly int _locomotiveHeight = 60; + protected readonly int _locomotiveHeight = 55; /// /// Инициализация свойств объекта-сущности /// diff --git a/Locomotives/Locomotives/FormLocomotive.cs b/Locomotives/Locomotives/FormLocomotive.cs index eaf8497..63b2178 100644 --- a/Locomotives/Locomotives/FormLocomotive.cs +++ b/Locomotives/Locomotives/FormLocomotive.cs @@ -1,14 +1,4 @@ -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 Locomotives +namespace Locomotives { public partial class FormLocomotive : Form {