diff --git a/DoubleDeckerBus/DoubleDeckerBus/DirectionType.cs b/DoubleDeckerBus/DoubleDeckerBus/DirectionType.cs new file mode 100644 index 0000000..a05d391 --- /dev/null +++ b/DoubleDeckerBus/DoubleDeckerBus/DirectionType.cs @@ -0,0 +1,24 @@ + +namespace DoubleDeckerBus; + +public enum DirectionType +{ /// + /// вверх + /// + Up = 1, + + /// + /// вниз + /// + Down = 2, + + /// + /// влево + /// + Left = 3, + + /// + /// вправо + /// + Right = 4 +} diff --git a/DoubleDeckerBus/DoubleDeckerBus/DoubleDeckerBus.csproj b/DoubleDeckerBus/DoubleDeckerBus/DoubleDeckerBus.csproj index e1a0735..244387d 100644 --- a/DoubleDeckerBus/DoubleDeckerBus/DoubleDeckerBus.csproj +++ b/DoubleDeckerBus/DoubleDeckerBus/DoubleDeckerBus.csproj @@ -8,4 +8,19 @@ enable + + + True + True + Resources.resx + + + + + + ResXFileCodeGenerator + Resources.Designer.cs + + + \ No newline at end of file diff --git a/DoubleDeckerBus/DoubleDeckerBus/DrawingDoubleDeckerBus.cs b/DoubleDeckerBus/DoubleDeckerBus/DrawingDoubleDeckerBus.cs new file mode 100644 index 0000000..6d8f6ae --- /dev/null +++ b/DoubleDeckerBus/DoubleDeckerBus/DrawingDoubleDeckerBus.cs @@ -0,0 +1,268 @@ +namespace DoubleDeckerBus; +/// +/// +/// +public class DrawingDoubleDeckerBus +{ + public EntityDoubleDeckerBus? EntityDoubleDeckerBus { get; private set; } + + private int? _pictureWidth; + + private int? _pictureHeight; + + private int? _startPosX; + + private int? _startPosY; + + private readonly int _DrawingBusWidth = 120; + + private readonly int _DrawingBusHight = 60; + + public void Init(int speed, double weight, Color bodyColor, Color additionalColor,bool secondFloor, bool stripes) + { + EntityDoubleDeckerBus = new EntityDoubleDeckerBus(); + EntityDoubleDeckerBus.Init(speed, weight, bodyColor, additionalColor, secondFloor, stripes); + _pictureWidth = null; + _pictureHeight = null; + _startPosX = null; + _startPosY = null; + } + /// + /// размер окна + /// + /// + /// + /// + public bool SetPictureSize(int width, int hight) + { + if (_DrawingBusWidth > width || _DrawingBusHight > hight) + { + return false; + } + + + _pictureWidth = width; + _pictureHeight = hight; + + if (_startPosX.HasValue && (_startPosX.Value + _DrawingBusWidth > _pictureWidth)) + { + _startPosX = _pictureWidth - _DrawingBusWidth; + } + + if (_startPosY.HasValue && (_startPosY + _DrawingBusHight > _pictureHeight)) + { + _startPosY = _pictureHeight - _DrawingBusHight; + } + + return true; + + } + /// + /// установить начальную позицию + /// + /// + /// + public void SetPosition(int x, int y) + { + if (!_pictureHeight.HasValue || !_pictureWidth.HasValue) + { + return; + } + + if (x < 0) + { + x = -x; + } + if (y < 0) + { + y = -y; + } + + if (x + _DrawingBusWidth > _pictureWidth) + { + _startPosX = _pictureWidth - _DrawingBusWidth; + } + else + { + _startPosX = x; + } + + if (y + _DrawingBusHight > _pictureHeight) + { + _startPosY = _pictureHeight - _DrawingBusHight; + } + else + { + _startPosY = y; + } + } + + public bool MoveTransport(DirectionType direction) + { + if (EntityDoubleDeckerBus == null || !_startPosX.HasValue || !_startPosY.HasValue) + { + return false; + } + + switch (direction) + { + case DirectionType.Left: + if (_startPosX.Value - EntityDoubleDeckerBus.Step > 0) + { + _startPosX -= (int)EntityDoubleDeckerBus.Step; + } + return true; + + case DirectionType.Up: + if (_startPosY.Value - EntityDoubleDeckerBus.Step > 0) + { + _startPosY -= (int)EntityDoubleDeckerBus.Step; + } + return true; + case DirectionType.Right: + if (_startPosX.Value + _DrawingBusWidth + EntityDoubleDeckerBus.Step < _pictureWidth) + { + _startPosX += (int)EntityDoubleDeckerBus.Step; + } + return true; + case DirectionType.Down: + if (_startPosY.Value + _DrawingBusHight + EntityDoubleDeckerBus.Step < _pictureHeight) + { + _startPosY += (int)EntityDoubleDeckerBus.Step; + } + return true; + default: + return false; + + } + } + + public void DrawTrasnport(Graphics g) + { + if (EntityDoubleDeckerBus == null || !_startPosX.HasValue || !_startPosY.HasValue) + { + return; + } + + Pen pen = new(Color.Black); + Brush additionalBrush = new SolidBrush(EntityDoubleDeckerBus.AdditionalColor); + Brush mainBrush = new SolidBrush(EntityDoubleDeckerBus.BodyColor); + Brush blueBr = new SolidBrush(Color.LightBlue); + + + //кузов 1го этажа + PointF[] bus = { new PointF((float)_startPosX + 5, (float)_startPosY + 20), + new PointF((float)_startPosX + 5, (float)_startPosY + 45), + new PointF((float)_startPosX + 105, (float)_startPosY + 45), + new PointF((float)_startPosX + 105, (float)_startPosY + 25), + new PointF((float)_startPosX + 102, (float)_startPosY + 20) }; + g.FillPolygon(mainBrush, bus); + g.DrawPolygon(pen, bus); + + //полоски + if (EntityDoubleDeckerBus.Stripes) + { + g.FillRectangle(additionalBrush, _startPosX.Value + 5, _startPosY.Value + 39, 100, 3); + PointF[] stripe = { new PointF((float)_startPosX + 5, (float)_startPosY + 22), new PointF((float)_startPosX + 5, (float)_startPosY + 25), new PointF((float)_startPosX + 104, (float)_startPosY + 25), new PointF((float)_startPosX + 103, (float)_startPosY + 22) }; + g.FillPolygon(additionalBrush, stripe); + + } + + //окна 1ый этаж + g.FillRectangle(blueBr, _startPosX.Value + 7, _startPosY.Value + 25, 12, 10); + g.FillRectangle(blueBr, _startPosX.Value + 21, _startPosY.Value + 25, 12, 10); + g.FillRectangle(blueBr, _startPosX.Value + 47, _startPosY.Value + 25, 6, 10); + g.FillRectangle(blueBr, _startPosX.Value + 55, _startPosY.Value + 25, 13, 10); + g.FillRectangle(blueBr, _startPosX.Value + 71, _startPosY.Value + 25, 14, 10); + + g.DrawRectangle(pen, _startPosX.Value + 7, _startPosY.Value + 25, 12, 10); + g.DrawRectangle(pen, _startPosX.Value + 21, _startPosY.Value + 25, 12, 10); + g.DrawRectangle(pen, _startPosX.Value + 47, _startPosY.Value + 25, 6, 10); + g.DrawRectangle(pen, _startPosX.Value + 55, _startPosY.Value + 25, 13, 10); + g.DrawRectangle(pen, _startPosX.Value + 71, _startPosY.Value + 25, 14, 10); + + //переднее окно первый этаж + PointF[] window2 = { new PointF((float)_startPosX + 90, (float)_startPosY + 25), + new PointF((float)_startPosX + 105, (float)_startPosY + 25), + new PointF((float)_startPosX + 105, (float)_startPosY + 40), + new PointF((float)_startPosX + 90, (float)_startPosY + 35) }; + g.FillPolygon(blueBr, window2); + g.DrawPolygon(pen, window2); + + //дверь + Brush brownBr = new SolidBrush(Color.Brown); + g.FillRectangle(blueBr, _startPosX.Value + 35, _startPosY.Value + 25, 10, 15); + g.FillRectangle(brownBr, _startPosX.Value + 35, _startPosY.Value + 40, 10, 5); + + g.DrawRectangle(pen, _startPosX.Value + 35, _startPosY.Value + 25, 10, 15); + g.DrawRectangle(pen, _startPosX.Value + 35, _startPosY.Value + 40, 10, 5); + + //колёса + g.FillEllipse(brownBr, _startPosX.Value + 11, _startPosY.Value + 37, 16, 16); + g.FillEllipse(brownBr, _startPosX.Value + 83, _startPosY.Value + 37, 16, 16); + + g.DrawEllipse(pen, _startPosX.Value + 11, _startPosY.Value + 37, 16, 16); + g.DrawEllipse(pen, _startPosX.Value + 83, _startPosY.Value + 37, 16, 16); + + //второй этаж с всякими зафуфрючками + if (EntityDoubleDeckerBus.SecondFloor) + { + //верх кузова + PointF[] bus_second_floor = { new PointF((float)_startPosX + 5, (float)_startPosY + 5), + new PointF((float)_startPosX + 5, (float)_startPosY + 20), + new PointF((float)_startPosX + 102, (float)_startPosY + 20), + new PointF((float)_startPosX + 95, (float)_startPosY + 5)}; + g.FillPolygon(mainBrush, bus_second_floor); + g.DrawPolygon(pen, bus_second_floor); + + //окна 2ой этаж + + g.FillRectangle(blueBr, _startPosX.Value + 7, _startPosY.Value + 10, 12, 10); + g.FillRectangle(blueBr, _startPosX.Value + 21, _startPosY.Value + 10, 12, 10); + g.FillRectangle(blueBr, _startPosX.Value + 35, _startPosY.Value + 10, 10, 10); + g.FillRectangle(blueBr, _startPosX.Value + 47, _startPosY.Value + 10, 6, 10); + g.FillRectangle(blueBr, _startPosX.Value + 55, _startPosY.Value + 10, 13, 10); + g.FillRectangle(blueBr, _startPosX.Value + 71, _startPosY.Value + 10, 14, 10); + + g.DrawRectangle(pen, _startPosX.Value + 7, _startPosY.Value + 10, 12, 10); + g.DrawRectangle(pen, _startPosX.Value + 21, _startPosY.Value + 10, 12, 10); + g.DrawRectangle(pen, _startPosX.Value + 35, _startPosY.Value + 10, 10, 10); + g.DrawRectangle(pen, _startPosX.Value + 47, _startPosY.Value + 10, 6, 10); + g.DrawRectangle(pen, _startPosX.Value + 55, _startPosY.Value + 10, 13, 10); + g.DrawRectangle(pen, _startPosX.Value + 71, _startPosY.Value + 10, 14, 10); + + //верхний отсек + PointF[] section = { new PointF((float)_startPosX + 27, (float)_startPosY + 5), + new PointF((float)_startPosX + 37, (float)_startPosY + 1), + new PointF((float)_startPosX + 65, (float)_startPosY + 1), + new PointF((float)_startPosX + 75, (float)_startPosY + 5) }; + g.FillPolygon(additionalBrush, section); + g.DrawPolygon(pen, section); + + //переднее окно 2ой этаж + PointF[] window1 = { new PointF((float)_startPosX + 90, (float)_startPosY + 10), + new PointF((float)_startPosX + 97, (float)_startPosY + 10), + new PointF((float)_startPosX + 102, (float)_startPosY + 20), + new PointF((float)_startPosX + 90, (float)_startPosY + 20) }; + g.FillPolygon(blueBr, window1); + g.DrawPolygon(pen, window1); + + //зеркала + g.FillRectangle(mainBrush, _startPosX.Value + 95, _startPosY.Value + 5, 20, 5); + g.FillRectangle(additionalBrush, _startPosX.Value + 110, _startPosY.Value + 10, 5, 5); + + g.DrawRectangle(pen, _startPosX.Value + 95, _startPosY.Value + 5, 20, 5); + g.DrawRectangle(pen, _startPosX.Value + 110, _startPosY.Value + 10, 5, 5); + + //лестница + g.DrawLine(pen, new Point(_startPosX.Value + 1, _startPosY.Value + 45), new Point(_startPosX.Value + 1, _startPosY.Value + 3)); + g.DrawLine(pen, new Point(_startPosX.Value + 1, _startPosY.Value + 45), new Point(_startPosX.Value + 5, _startPosY.Value + 43)); + g.DrawLine(pen, new Point(_startPosX.Value + 1, _startPosY.Value + 39), new Point(_startPosX.Value + 5, _startPosY.Value + 37)); + g.DrawLine(pen, new Point(_startPosX.Value + 1, _startPosY.Value + 31), new Point(_startPosX.Value + 5, _startPosY.Value + 29)); + g.DrawLine(pen, new Point(_startPosX.Value + 1, _startPosY.Value + 23), new Point(_startPosX.Value + 5, _startPosY.Value + 21)); + g.DrawLine(pen, new Point(_startPosX.Value + 1, _startPosY.Value + 15), new Point(_startPosX.Value + 5, _startPosY.Value + 13)); + g.DrawLine(pen, new Point(_startPosX.Value + 1, _startPosY.Value + 7), new Point(_startPosX.Value + 5, _startPosY.Value + 5)); + } + + } +} diff --git a/DoubleDeckerBus/DoubleDeckerBus/EntityDoubleDeckerBus.cs b/DoubleDeckerBus/DoubleDeckerBus/EntityDoubleDeckerBus.cs new file mode 100644 index 0000000..bdfa702 --- /dev/null +++ b/DoubleDeckerBus/DoubleDeckerBus/EntityDoubleDeckerBus.cs @@ -0,0 +1,46 @@ +namespace DoubleDeckerBus; + public class EntityDoubleDeckerBus +{ + public int Speed { get; private set; } + + public double Weight { get; private set; } + /// + /// Основной цвет + /// + public Color BodyColor { get; private set; } + /// + /// Дополнительный цвет (для опциональных элементов) + /// + public Color AdditionalColor { get; private set; } + /// + /// Признак (опция) наличия второго этажа + /// + public bool SecondFloor { get; private set; } + /// + /// Признак (опция) наличия полосок на автобусе + /// + public bool Stripes { get; private set; } + /// + /// Шаг перемещения автобуса + /// + public double Step => Speed * 100 / Weight; + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool secondFloor, bool stripes) + { + Speed = speed; + Weight = weight; + BodyColor = bodyColor; + AdditionalColor = additionalColor; + SecondFloor = secondFloor; + Stripes = stripes; + } +} \ No newline at end of file diff --git a/DoubleDeckerBus/DoubleDeckerBus/Form1.Designer.cs b/DoubleDeckerBus/DoubleDeckerBus/Form1.Designer.cs deleted file mode 100644 index 3ca1fa2..0000000 --- a/DoubleDeckerBus/DoubleDeckerBus/Form1.Designer.cs +++ /dev/null @@ -1,39 +0,0 @@ -namespace DoubleDeckerBus -{ - 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/DoubleDeckerBus/DoubleDeckerBus/Form1.cs b/DoubleDeckerBus/DoubleDeckerBus/Form1.cs deleted file mode 100644 index fd2d1d7..0000000 --- a/DoubleDeckerBus/DoubleDeckerBus/Form1.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace DoubleDeckerBus -{ - public partial class Form1 : Form - { - public Form1() - { - InitializeComponent(); - } - } -} \ No newline at end of file diff --git a/DoubleDeckerBus/DoubleDeckerBus/FormDoubleDeckerBus.Designer.cs b/DoubleDeckerBus/DoubleDeckerBus/FormDoubleDeckerBus.Designer.cs new file mode 100644 index 0000000..752b2d6 --- /dev/null +++ b/DoubleDeckerBus/DoubleDeckerBus/FormDoubleDeckerBus.Designer.cs @@ -0,0 +1,134 @@ +namespace DoubleDeckerBus +{ + partial class FormDoubleDeckerBus + { + /// + /// 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() + { + buttonCreateDoubleDeckerBus = new Button(); + pictureBoxDoubleDeckerBus = new PictureBox(); + buttonLeft = new Button(); + buttonUp = new Button(); + buttonDown = new Button(); + buttonRight = new Button(); + ((System.ComponentModel.ISupportInitialize)pictureBoxDoubleDeckerBus).BeginInit(); + SuspendLayout(); + // + // buttonCreateDoubleDeckerBus + // + buttonCreateDoubleDeckerBus.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; + buttonCreateDoubleDeckerBus.Location = new Point(12, 415); + buttonCreateDoubleDeckerBus.Name = "buttonCreateDoubleDeckerBus"; + buttonCreateDoubleDeckerBus.Size = new Size(75, 23); + buttonCreateDoubleDeckerBus.TabIndex = 1; + buttonCreateDoubleDeckerBus.Text = "Create"; + buttonCreateDoubleDeckerBus.UseVisualStyleBackColor = true; + buttonCreateDoubleDeckerBus.Click += buttonCreateDoubleDeckerBus_Click; + // + // pictureBoxDoubleDeckerBus + // + pictureBoxDoubleDeckerBus.Dock = DockStyle.Fill; + pictureBoxDoubleDeckerBus.Location = new Point(0, 0); + pictureBoxDoubleDeckerBus.Name = "pictureBoxDoubleDeckerBus"; + pictureBoxDoubleDeckerBus.Size = new Size(800, 450); + pictureBoxDoubleDeckerBus.TabIndex = 2; + pictureBoxDoubleDeckerBus.TabStop = false; + // + // buttonLeft + // + buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + buttonLeft.BackgroundImage = Properties.Resources.arrowleft; + buttonLeft.BackgroundImageLayout = ImageLayout.Stretch; + buttonLeft.Location = new Point(674, 403); + buttonLeft.Name = "buttonLeft"; + buttonLeft.Size = new Size(35, 35); + buttonLeft.TabIndex = 3; + buttonLeft.UseVisualStyleBackColor = true; + buttonLeft.Click += buttonMove_Click; + // + // buttonUp + // + buttonUp.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + buttonUp.BackgroundImage = Properties.Resources.arrowup; + buttonUp.BackgroundImageLayout = ImageLayout.Stretch; + buttonUp.Location = new Point(715, 362); + buttonUp.Name = "buttonUp"; + buttonUp.Size = new Size(35, 35); + buttonUp.TabIndex = 4; + buttonUp.UseVisualStyleBackColor = true; + buttonUp.Click += buttonMove_Click; + // + // buttonDown + // + buttonDown.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + buttonDown.BackgroundImage = Properties.Resources.arrowdown; + buttonDown.BackgroundImageLayout = ImageLayout.Stretch; + buttonDown.Location = new Point(715, 403); + buttonDown.Name = "buttonDown"; + buttonDown.Size = new Size(35, 35); + buttonDown.TabIndex = 5; + buttonDown.UseVisualStyleBackColor = true; + buttonDown.Click += buttonMove_Click; + // + // buttonRight + // + buttonRight.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + buttonRight.BackgroundImage = Properties.Resources.arrowright; + buttonRight.BackgroundImageLayout = ImageLayout.Stretch; + buttonRight.Location = new Point(756, 403); + buttonRight.Name = "buttonRight"; + buttonRight.Size = new Size(35, 35); + buttonRight.TabIndex = 6; + buttonRight.UseVisualStyleBackColor = true; + buttonRight.Click += buttonMove_Click; + // + // FormDoubleDeckerBus + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(800, 450); + Controls.Add(buttonRight); + Controls.Add(buttonDown); + Controls.Add(buttonUp); + Controls.Add(buttonLeft); + Controls.Add(buttonCreateDoubleDeckerBus); + Controls.Add(pictureBoxDoubleDeckerBus); + Name = "FormDoubleDeckerBus"; + StartPosition = FormStartPosition.CenterScreen; + Text = "FormDoubleDeckerBus"; + ((System.ComponentModel.ISupportInitialize)pictureBoxDoubleDeckerBus).EndInit(); + ResumeLayout(false); + } + + #endregion + private Button buttonCreateDoubleDeckerBus; + private PictureBox pictureBoxDoubleDeckerBus; + private Button buttonLeft; + private Button buttonUp; + private Button buttonDown; + private Button buttonRight; + } +} \ No newline at end of file diff --git a/DoubleDeckerBus/DoubleDeckerBus/FormDoubleDeckerBus.cs b/DoubleDeckerBus/DoubleDeckerBus/FormDoubleDeckerBus.cs new file mode 100644 index 0000000..e44a6c5 --- /dev/null +++ b/DoubleDeckerBus/DoubleDeckerBus/FormDoubleDeckerBus.cs @@ -0,0 +1,85 @@ +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 DoubleDeckerBus +{ + public partial class FormDoubleDeckerBus : Form + { + private DrawingDoubleDeckerBus? _drawingDoubleDeckerBus; + public FormDoubleDeckerBus() + { + InitializeComponent(); + } + + private void Draw() + { + if (_drawingDoubleDeckerBus == null) + { + return; + } + + Bitmap bmp = new(pictureBoxDoubleDeckerBus.Width, pictureBoxDoubleDeckerBus.Height); + Graphics gr = Graphics.FromImage(bmp); + _drawingDoubleDeckerBus.DrawTrasnport(gr); + pictureBoxDoubleDeckerBus.Image = bmp; + } + + private void buttonCreateDoubleDeckerBus_Click(object sender, EventArgs e) + { + Random random = new(); + _drawingDoubleDeckerBus = new DrawingDoubleDeckerBus(); + _drawingDoubleDeckerBus.Init(random.Next(100, 300), random.Next(1000, 3000), + Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)), + Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)), + Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2))); + _drawingDoubleDeckerBus.SetPictureSize(pictureBoxDoubleDeckerBus.Width, pictureBoxDoubleDeckerBus.Height); + _drawingDoubleDeckerBus.SetPosition(random.Next(10, 100), random.Next(10, 100)); + + Draw(); + + + + } + + private void buttonMove_Click(object sender, EventArgs e) + { + if (_drawingDoubleDeckerBus == null) + { + return; + } + + string name = ((Button)sender)?.Name ?? string.Empty; + bool result = false; + switch (name) + { + case "buttonLeft": + result = _drawingDoubleDeckerBus.MoveTransport(DirectionType.Left); + break; + + case "buttonRight": + result = _drawingDoubleDeckerBus.MoveTransport(DirectionType.Right); + break; + + case "buttonUp": + result = _drawingDoubleDeckerBus.MoveTransport(DirectionType.Up); + break; + + case "buttonDown": + result = _drawingDoubleDeckerBus.MoveTransport(DirectionType.Down); + break; + } + + if (result) + { + Draw(); + } + } + } +} diff --git a/DoubleDeckerBus/DoubleDeckerBus/Form1.resx b/DoubleDeckerBus/DoubleDeckerBus/FormDoubleDeckerBus.resx similarity index 93% rename from DoubleDeckerBus/DoubleDeckerBus/Form1.resx rename to DoubleDeckerBus/DoubleDeckerBus/FormDoubleDeckerBus.resx index 1af7de1..af32865 100644 --- a/DoubleDeckerBus/DoubleDeckerBus/Form1.resx +++ b/DoubleDeckerBus/DoubleDeckerBus/FormDoubleDeckerBus.resx @@ -1,17 +1,17 @@  - diff --git a/DoubleDeckerBus/DoubleDeckerBus/Program.cs b/DoubleDeckerBus/DoubleDeckerBus/Program.cs index 1cce65b..913b697 100644 --- a/DoubleDeckerBus/DoubleDeckerBus/Program.cs +++ b/DoubleDeckerBus/DoubleDeckerBus/Program.cs @@ -11,7 +11,7 @@ namespace DoubleDeckerBus // 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 FormDoubleDeckerBus()); } } } \ No newline at end of file diff --git a/DoubleDeckerBus/DoubleDeckerBus/Properties/Resources.Designer.cs b/DoubleDeckerBus/DoubleDeckerBus/Properties/Resources.Designer.cs new file mode 100644 index 0000000..7d54747 --- /dev/null +++ b/DoubleDeckerBus/DoubleDeckerBus/Properties/Resources.Designer.cs @@ -0,0 +1,103 @@ +//------------------------------------------------------------------------------ +// +// Этот код создан программой. +// Исполняемая версия:4.0.30319.42000 +// +// Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае +// повторной генерации кода. +// +//------------------------------------------------------------------------------ + +namespace DoubleDeckerBus.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("DoubleDeckerBus.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/DoubleDeckerBus/DoubleDeckerBus/Properties/Resources.resx b/DoubleDeckerBus/DoubleDeckerBus/Properties/Resources.resx new file mode 100644 index 0000000..7415012 --- /dev/null +++ b/DoubleDeckerBus/DoubleDeckerBus/Properties/Resources.resx @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + ..\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/DoubleDeckerBus/DoubleDeckerBus/Resources/arrowdown.png b/DoubleDeckerBus/DoubleDeckerBus/Resources/arrowdown.png new file mode 100644 index 0000000..53b123f Binary files /dev/null and b/DoubleDeckerBus/DoubleDeckerBus/Resources/arrowdown.png differ diff --git a/DoubleDeckerBus/DoubleDeckerBus/Resources/arrowleft.png b/DoubleDeckerBus/DoubleDeckerBus/Resources/arrowleft.png new file mode 100644 index 0000000..e0c5f06 Binary files /dev/null and b/DoubleDeckerBus/DoubleDeckerBus/Resources/arrowleft.png differ diff --git a/DoubleDeckerBus/DoubleDeckerBus/Resources/arrowright.png b/DoubleDeckerBus/DoubleDeckerBus/Resources/arrowright.png new file mode 100644 index 0000000..bf5eaec Binary files /dev/null and b/DoubleDeckerBus/DoubleDeckerBus/Resources/arrowright.png differ diff --git a/DoubleDeckerBus/DoubleDeckerBus/Resources/arrowup.png b/DoubleDeckerBus/DoubleDeckerBus/Resources/arrowup.png new file mode 100644 index 0000000..ae99fbe Binary files /dev/null and b/DoubleDeckerBus/DoubleDeckerBus/Resources/arrowup.png differ