diff --git a/lab_0/DirectionType.cs b/lab_0/Drawnings/DirectionType.cs similarity index 68% rename from lab_0/DirectionType.cs rename to lab_0/Drawnings/DirectionType.cs index 0fab0ff..bcea611 100644 --- a/lab_0/DirectionType.cs +++ b/lab_0/Drawnings/DirectionType.cs @@ -1,10 +1,8 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +namespace ProjectBus. Drawings; -namespace ProjectBus; +/// +/// Направление перемещения +/// public enum DirectionType { diff --git a/lab_0/Drawnings/DrawningBus.cs b/lab_0/Drawnings/DrawningBus.cs new file mode 100644 index 0000000..b98a55b --- /dev/null +++ b/lab_0/Drawnings/DrawningBus.cs @@ -0,0 +1,91 @@ +using ProjectBus.Entities; +using System.Drawing; + +namespace ProjectBus.Drawnings; + +/// +/// Класс, отвечающий за прорисовку и перемещение объекта-сущности +/// +public class DrawningBus : DrawningSimpleBus +{ + /// + /// Конструктор + /// + /// Скорость + /// Вес + /// Основной цвет + /// Дополнительный цвет + /// Признак наличия дополнительного отсека + /// Признак наличия гармошки + public DrawningBus(int speed, double weight, Color bodyColor, Color additionalColor, bool additionalCompartment, bool accordion) : base(310,52) + { + EntitySimpleBus = new EntityBus(speed, weight, bodyColor, additionalColor, additionalCompartment, accordion); + } + + public override void DrawTransport(Graphics g) + { + if (EntitySimpleBus == null || EntitySimpleBus is not EntityBus bus || !_startPosX.HasValue || !_startPosY.HasValue) + { + return; + } + + Pen pen = new(Color.Black); + Brush additionalBrush= new SolidBrush(bus.AdditionalColor); + + //доп отсек + if (bus.AdditionalCompartment) + { + //корпус + g.DrawRectangle(pen, _startPosX.Value + 204, _startPosY.Value - 1, 105, 50); + g.DrawRectangle(pen, _startPosX.Value + 205, _startPosY.Value, 105, 50); + g.FillRectangle(additionalBrush, _startPosX.Value + 205, _startPosY.Value, 105, 50); + + + //окна + g.FillEllipse(additionalBrush, _startPosX.Value + 247, _startPosY.Value + 6, 16, 25); + g.FillEllipse(additionalBrush, _startPosX.Value + 275, _startPosY.Value + 6, 16, 25); + g.DrawEllipse(pen, _startPosX.Value + 247, _startPosY.Value + 6, 16, 25); + g.DrawEllipse(pen, _startPosX.Value + 275, _startPosY.Value + 6, 16, 25); + + + //дверь + g.FillRectangle(additionalBrush, _startPosX.Value + 215, _startPosY.Value + 10, 20, 40); + g.DrawRectangle(pen, _startPosX.Value + 215, _startPosY.Value + 10, 20, 40); + + //колеса + g.FillEllipse(additionalBrush, _startPosX.Value + 250, _startPosY.Value + 40, 20, 20); + g.DrawEllipse(pen, _startPosX.Value + 250, _startPosY.Value + 40, 20, 20); + } + + _startPosX += 0; + _startPosY += 0; + base.DrawTransport(g); + + + //гармошка + if (bus.Accordion) + { + Brush brGray = new SolidBrush(Color.LightGray); + + g.FillRectangle(brGray, _startPosX.Value + 175, _startPosY.Value + 4, 30, 42); + g.FillRectangle(brGray, _startPosX.Value + 180, _startPosY.Value + 4, 5, 42); + g.FillRectangle(brGray, _startPosX.Value + 185, _startPosY.Value + 4, 5, 42); + g.FillRectangle(brGray, _startPosX.Value + 190, _startPosY.Value + 4, 5, 42); + g.FillRectangle(brGray, _startPosX.Value + 195, _startPosY.Value + 4, 5, 42); + + g.DrawRectangle(pen, _startPosX.Value + 175, _startPosY.Value + 4, 30, 42); + g.DrawRectangle(pen, _startPosX.Value + 180, _startPosY.Value + 4, 5, 42); + g.DrawRectangle(pen, _startPosX.Value + 185, _startPosY.Value + 4, 5, 42); + g.DrawRectangle(pen, _startPosX.Value + 190, _startPosY.Value + 4, 5, 42); + g.DrawRectangle(pen, _startPosX.Value + 195, _startPosY.Value + 4, 5, 42); + } + } +} + + + + + + + + diff --git a/lab_0/DrawingBus.cs b/lab_0/Drawnings/DrawningSimpleBus.cs similarity index 56% rename from lab_0/DrawingBus.cs rename to lab_0/Drawnings/DrawningSimpleBus.cs index 24592a5..31fa21a 100644 --- a/lab_0/DrawingBus.cs +++ b/lab_0/Drawnings/DrawningSimpleBus.cs @@ -1,15 +1,14 @@ -namespace ProjectBus; +using ProjectBus.Drawings; +using ProjectBus.Entities; -/// -/// Класс, отвечающий за прорисовку и перемещение объекта-сущности -/// +namespace ProjectBus.Drawnings; -public class DrawingBus +public class DrawningSimpleBus { /// /// Класс-сущность /// - public EntityBus? EntityBus { get; private set; } + public EntitySimpleBus? EntitySimpleBus { get; protected set; } /// /// Ширина окна @@ -24,16 +23,16 @@ public class DrawingBus /// /// Левая координата прорисовки автобуса /// - private int? _startPosX; + protected int? _startPosX; /// /// Верхняя кооридната прорисовки автобуса /// - private int? _startPosY; + protected int? _startPosY; /// - /// /// Ширина прорисовки автобуса + /// Ширина прорисовки автобуса /// /// private readonly int _drawningBusWidth = 310; @@ -43,22 +42,37 @@ public class DrawingBus private readonly int _drawningBusHeight = 52; /// - /// Инициализация свойств + /// Пустой конструктор /// - /// Скорость - /// Вес - /// Основной цвет - /// Дополнительный цвет - /// Признак наличия дополнительного отсека - /// Признак наличия гармошки - public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool additionalCompartment, bool accordion, bool v) + private DrawningSimpleBus() { - EntityBus = new EntityBus(); - EntityBus.Init(speed, weight, bodyColor, additionalColor, additionalCompartment, accordion); _pictureWidth = null; _pictureHeight = null; _startPosX = null; _startPosY = null; + + } + + /// + /// Конструктор + /// + /// Скорость + /// Вес + /// Основной цвет + public DrawningSimpleBus(int speed, double weight, Color bodyColor) : this() + { + EntitySimpleBus = new EntitySimpleBus(speed, weight, bodyColor); + } + + /// + /// Конструктор для наследников + /// + /// Ширина прорисовки автобуса + /// Высота прорисовки автобуса + protected DrawningSimpleBus(int drawningBusWidth, int drawningBusHeight) : this() + { + _drawningBusWidth = drawningBusWidth; + _drawningBusHeight= drawningBusHeight; } /// @@ -67,16 +81,6 @@ public class DrawingBus /// Ширина поля /// Высота поля /// true - границы заданы, false - проверка не пройдена, нельзя разместить объект в этих размерах - //public bool SetPictureSize(int width, int height) - //{ - // // TODO проверка, что объект "влезает" в размеры поля - // // если влезает, сохраняем границы и корректируем позицию объекта, если она была уже установлена - - // _pictureWidth = width; - // _pictureHeight = height; - - // return true; - //} public bool SetPictureSize(int width, int height) { if (width >= _drawningBusWidth && height >= _drawningBusWidth) @@ -148,7 +152,7 @@ public class DrawingBus /// true - перемещене выполнено, false - перемещение невозможно public bool MoveTransport(DirectionType direction) { - if (EntityBus == null || !_startPosX.HasValue || !_startPosY.HasValue) + if (EntitySimpleBus == null || !_startPosX.HasValue || !_startPosY.HasValue) { return false; } @@ -157,30 +161,30 @@ public class DrawingBus { //влево case DirectionType.Left: - if (_startPosX.Value - EntityBus.Step > 0) + if (_startPosX.Value - EntitySimpleBus.Step > 0) { - _startPosX -= (int)EntityBus.Step; + _startPosX -= (int)EntitySimpleBus.Step; } return true; //вверх case DirectionType.Up: - if (_startPosY.Value - EntityBus.Step > 0) + if (_startPosY.Value - EntitySimpleBus.Step > 0) { - _startPosY -= (int)EntityBus.Step; + _startPosY -= (int)EntitySimpleBus.Step; } return true; // вправо case DirectionType.Right: - if (_startPosX.Value + EntityBus.Step <_pictureWidth - _drawningBusWidth) + if (_startPosX.Value + EntitySimpleBus.Step <_pictureWidth - _drawningBusWidth) { - _startPosX += (int)EntityBus.Step; + _startPosX += (int)EntitySimpleBus.Step; } return true; //вниз case DirectionType.Down: - if (_startPosY.Value + EntityBus.Step < _pictureHeight - _drawningBusHeight) + if (_startPosY.Value + EntitySimpleBus.Step < _pictureHeight - _drawningBusHeight) { - _startPosY += (int)EntityBus.Step; + _startPosY += (int)EntitySimpleBus.Step; } return true; default: @@ -192,15 +196,15 @@ public class DrawingBus /// Прорисовка объекта /// /// - public void DrawTransport(Graphics g) + public virtual void DrawTransport(Graphics g) { - if (EntityBus == null || !_startPosX.HasValue || !_startPosY.HasValue) + if (EntitySimpleBus == null || !_startPosX.HasValue || !_startPosY.HasValue) { return; } + Pen pen = new(Color.Black); - Brush additionalBrush = new SolidBrush(EntityBus.AdditionalColor); //корпус автобуса @@ -209,7 +213,8 @@ public class DrawingBus g.DrawRectangle(pen, _startPosX.Value + 0, _startPosY.Value, 175, 50); g.DrawRectangle(pen, _startPosX.Value + 0, _startPosY.Value - 1, 175, 50); - g.FillRectangle(additionalBrush, _startPosX.Value + 0, _startPosY.Value, 175, 50); + Brush br1 = new SolidBrush(EntitySimpleBus.BodyColor); + g.FillRectangle(br1, _startPosX.Value + 0, _startPosY.Value, 175, 50); //окна @@ -231,10 +236,10 @@ public class DrawingBus //дверь - Brush br = new SolidBrush(EntityBus.BodyColor); + Brush br2 = new SolidBrush(EntitySimpleBus.BodyColor); g.DrawRectangle(pen, _startPosX.Value + 49, _startPosY.Value + 9, 20, 40); g.DrawRectangle(pen, _startPosX.Value + 50, _startPosY.Value + 10, 20, 40); - g.FillRectangle(br, _startPosX.Value + 50, _startPosY.Value + 10, 20, 40); + g.FillRectangle(br2, _startPosX.Value + 50, _startPosY.Value + 10, 20, 40); @@ -247,60 +252,7 @@ public class DrawingBus g.DrawEllipse(pen, _startPosX.Value + 115, _startPosY.Value + 40, 20, 20); - //доп отсек - if (EntityBus.AdditionalCompartment) - { - //корпус - g.DrawRectangle(pen, _startPosX.Value + 204, _startPosY.Value - 1, 105, 50); - g.DrawRectangle(pen, _startPosX.Value + 205, _startPosY.Value, 105, 50); - g.FillRectangle(additionalBrush, _startPosX.Value + 205, _startPosY.Value, 105, 50); - - - //окна - g.FillEllipse(brBlue, _startPosX.Value + 247, _startPosY.Value + 6, 16, 25); - g.FillEllipse(brBlue, _startPosX.Value + 275, _startPosY.Value + 6, 16, 25); - g.DrawEllipse(pen, _startPosX.Value + 247, _startPosY.Value + 6, 16, 25); - g.DrawEllipse(pen, _startPosX.Value + 275, _startPosY.Value + 6, 16, 25); - - - - //дверь - g.FillRectangle(br, _startPosX.Value + 215, _startPosY.Value + 10, 20, 40); - g.DrawRectangle(pen, _startPosX.Value + 215, _startPosY.Value + 10, 20, 40); - //колеса - - - g.FillEllipse(brGrey, _startPosX.Value + 250, _startPosY.Value + 40, 20, 20); - g.DrawEllipse(pen, _startPosX.Value + 250, _startPosY.Value + 40, 20, 20); - - - } - - //гармошка - if (EntityBus.Accordion) - { - Brush brGray = new SolidBrush(Color.LightGray); - - g.FillRectangle(brGray, _startPosX.Value + 175, _startPosY.Value + 4, 30, 42); - g.FillRectangle(brGray, _startPosX.Value + 180, _startPosY.Value + 4, 5, 42); - g.FillRectangle(brGray, _startPosX.Value + 185, _startPosY.Value + 4, 5, 42); - g.FillRectangle(brGray, _startPosX.Value + 190, _startPosY.Value + 4, 5, 42); - g.FillRectangle(brGray, _startPosX.Value + 195, _startPosY.Value + 4, 5, 42); - - g.DrawRectangle(pen, _startPosX.Value + 175, _startPosY.Value + 4, 30, 42); - g.DrawRectangle(pen, _startPosX.Value + 180, _startPosY.Value + 4, 5, 42); - g.DrawRectangle(pen, _startPosX.Value + 185, _startPosY.Value + 4, 5, 42); - g.DrawRectangle(pen, _startPosX.Value + 190, _startPosY.Value + 4, 5, 42); - g.DrawRectangle(pen, _startPosX.Value + 195, _startPosY.Value + 4, 5, 42); - - } } -} - - - - - - + } diff --git a/lab_0/EntityBus.cs b/lab_0/Entities/EntityBus.cs similarity index 65% rename from lab_0/EntityBus.cs rename to lab_0/Entities/EntityBus.cs index 13fb1d3..9e89c00 100644 --- a/lab_0/EntityBus.cs +++ b/lab_0/Entities/EntityBus.cs @@ -1,45 +1,27 @@ -namespace ProjectBus; +namespace ProjectBus.Entities; /// /// Класс-сущность "Автобус" /// -public class EntityBus +public class EntityBus : EntitySimpleBus { - /// - /// Скорость - /// - public int Speed { get; set; } - - /// - /// Вес - /// - public double Weight { get; set; } - - /// - /// Основной цвет - /// - public Color BodyColor { get; private set; } - /// /// Дополнительный цвет (для опциональных элементов) /// + /// public Color AdditionalColor { get; private set; } + public Color BodyColor { get; private set; } /// - /// Признак (опция) наличия контейнеров + /// Признак (опция) наличия дополнительного отсека /// public bool AdditionalCompartment { get; private set; } /// - /// Признак (опция) наличия крана для разгрузки + /// Признак (опция) наличия гармошки /// public bool Accordion { get; private set; } - /// - /// Шаг перемещения автобуса - /// - public double Step => Speed * 100 / Weight; - /// /// Инициализация полей объекта-класса спортивного автомобиля /// @@ -49,12 +31,10 @@ public class EntityBus /// Дополнительный цвет /// Признак наличия дополнительного отсека /// Признак наличия гармошки - public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool additionalCompartment, bool accordion) + public EntityBus(int speed, double weight, Color bodyColor, Color additionalColor, bool additionalCompartment, bool accordion) : base(speed, weight, bodyColor) { - Speed = speed; - Weight = weight; - BodyColor = bodyColor; AdditionalColor = additionalColor; + BodyColor = bodyColor; AdditionalCompartment = additionalCompartment; Accordion = accordion; } diff --git a/lab_0/Entities/EntitySimpleBus.cs b/lab_0/Entities/EntitySimpleBus.cs new file mode 100644 index 0000000..9e68233 --- /dev/null +++ b/lab_0/Entities/EntitySimpleBus.cs @@ -0,0 +1,42 @@ +namespace ProjectBus.Entities; + +/// +/// Класс-сущность "Автобус" +/// + +public class EntitySimpleBus +{ + /// + /// Скорость + /// + public int Speed { get; set; } + + /// + /// Вес + /// + public double Weight { get; set; } + + /// + /// Основной цвет + /// + public Color BodyColor { get; private set; } + + + /// + /// Шаг перемещения автомобиля + /// + public double Step => Speed * 100 / Weight; + + /// + /// Конструктор сущности + /// + /// Скорость + /// Вес автобуса + /// Основной цвет + public EntitySimpleBus(int speed, double weight, Color bodyColor) + { + Speed = speed; + Weight = weight; + BodyColor = bodyColor; + } +} diff --git a/lab_0/FormBus.Designer.cs b/lab_0/FormBus.Designer.cs index bdd01e3..885c720 100644 --- a/lab_0/FormBus.Designer.cs +++ b/lab_0/FormBus.Designer.cs @@ -34,6 +34,7 @@ buttonRight = new Button(); buttonUp = new Button(); buttonDown = new Button(); + buttonCreateSimpleBus = new Button(); ((System.ComponentModel.ISupportInitialize)pictureBoxBus).BeginInit(); SuspendLayout(); // @@ -42,18 +43,18 @@ pictureBoxBus.Dock = DockStyle.Fill; pictureBoxBus.Location = new Point(0, 0); pictureBoxBus.Name = "pictureBoxBus"; - pictureBoxBus.Size = new Size(800, 450); + pictureBoxBus.Size = new Size(1155, 557); pictureBoxBus.TabIndex = 7; pictureBoxBus.TabStop = false; // // buttonCreate // buttonCreate.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; - buttonCreate.Location = new Point(12, 392); + buttonCreate.Location = new Point(12, 501); buttonCreate.Name = "buttonCreate"; - buttonCreate.Size = new Size(150, 46); + buttonCreate.Size = new Size(410, 46); buttonCreate.TabIndex = 2; - buttonCreate.Text = "Создать"; + buttonCreate.Text = "Создать автобус с доп.отсеком"; buttonCreate.UseVisualStyleBackColor = true; buttonCreate.Click += ButtonCreate_Click; // @@ -62,7 +63,7 @@ buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; buttonLeft.BackgroundImage = Properties.Resources.arrowLeft; buttonLeft.BackgroundImageLayout = ImageLayout.Stretch; - buttonLeft.Location = new Point(626, 388); + buttonLeft.Location = new Point(981, 495); buttonLeft.Name = "buttonLeft"; buttonLeft.Size = new Size(50, 50); buttonLeft.TabIndex = 3; @@ -74,7 +75,7 @@ buttonRight.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; buttonRight.BackgroundImage = Properties.Resources.arrowRight; buttonRight.BackgroundImageLayout = ImageLayout.Stretch; - buttonRight.Location = new Point(738, 390); + buttonRight.Location = new Point(1093, 497); buttonRight.Name = "buttonRight"; buttonRight.Size = new Size(50, 50); buttonRight.TabIndex = 4; @@ -86,7 +87,7 @@ buttonUp.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; buttonUp.BackgroundImage = Properties.Resources.arrowUp; buttonUp.BackgroundImageLayout = ImageLayout.Stretch; - buttonUp.Location = new Point(682, 332); + buttonUp.Location = new Point(1037, 439); buttonUp.Name = "buttonUp"; buttonUp.Size = new Size(50, 50); buttonUp.TabIndex = 5; @@ -98,18 +99,30 @@ buttonDown.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; buttonDown.BackgroundImage = Properties.Resources.arrowDown; buttonDown.BackgroundImageLayout = ImageLayout.Stretch; - buttonDown.Location = new Point(682, 388); + buttonDown.Location = new Point(1037, 495); buttonDown.Name = "buttonDown"; buttonDown.Size = new Size(50, 50); buttonDown.TabIndex = 6; buttonDown.UseVisualStyleBackColor = true; buttonDown.Click += ButtonMove_Click; // + // buttonCreateSimpleBus + // + buttonCreateSimpleBus.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; + buttonCreateSimpleBus.Location = new Point(428, 501); + buttonCreateSimpleBus.Name = "buttonCreateSimpleBus"; + buttonCreateSimpleBus.Size = new Size(431, 46); + buttonCreateSimpleBus.TabIndex = 8; + buttonCreateSimpleBus.Text = "Создать обычный автобус"; + buttonCreateSimpleBus.UseVisualStyleBackColor = true; + buttonCreateSimpleBus.Click += buttonCreateSimpleBus_Click; + // // FormBus // AutoScaleDimensions = new SizeF(13F, 32F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(800, 450); + ClientSize = new Size(1155, 557); + Controls.Add(buttonCreateSimpleBus); Controls.Add(buttonDown); Controls.Add(buttonUp); Controls.Add(buttonRight); @@ -129,5 +142,6 @@ private Button buttonRight; private Button buttonUp; private Button buttonDown; + private Button buttonCreateSimpleBus; } } \ No newline at end of file diff --git a/lab_0/FormBus.cs b/lab_0/FormBus.cs index d170e9e..e91af74 100644 --- a/lab_0/FormBus.cs +++ b/lab_0/FormBus.cs @@ -1,4 +1,6 @@ -using System; +using ProjectBus.Drawings; +using ProjectBus.Drawnings; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -12,7 +14,7 @@ namespace ProjectBus { public partial class FormBus : Form { - private DrawingBus? _drawingBus; + private DrawningSimpleBus? _drawningSimpleBus; public FormBus() { @@ -21,36 +23,65 @@ namespace ProjectBus private void Draw() { - if (_drawingBus == null) + if (_drawningSimpleBus == null) { return; } Bitmap bmp = new(pictureBoxBus.Width, pictureBoxBus.Height); Graphics gr = Graphics.FromImage(bmp); - _drawingBus.DrawTransport(gr); + _drawningSimpleBus.DrawTransport(gr); pictureBoxBus.Image = bmp; } - - private void ButtonCreate_Click(object sender, EventArgs e) + /// + /// Создание объекта класса-перемещения + /// + /// Тип создаваемого объекта + private void CreateObject(string type) { Random random = new(); - _drawingBus = new DrawingBus(); - _drawingBus.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)), Convert.ToBoolean(random.Next(0, 2))); - _drawingBus.SetPictureSize(pictureBoxBus.Width, pictureBoxBus.Height); - _drawingBus.SetPosition(random.Next(10, 100), random.Next(10, 100)); + switch (type) + { + case nameof(DrawningSimpleBus): + _drawningSimpleBus = new DrawningSimpleBus(random.Next(100, 300), random.Next(1000, 3000), + Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256))); + break; + case nameof(DrawningBus): + _drawningSimpleBus = new DrawningBus(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))); + break; + default: + return; + } + + _drawningSimpleBus.SetPictureSize(pictureBoxBus.Width, pictureBoxBus.Height); + _drawningSimpleBus.SetPosition(random.Next(10, 100), random.Next(10, 100)); Draw(); - } + /// + /// Обработка нажатия кнопки "Создать автобус с доп отсеком" + /// + /// + /// + private void ButtonCreate_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningBus)); + + /// + /// Обработка нажатия кнопки "Создать обычный автобус" + /// + /// + /// + private void buttonCreateSimpleBus_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningSimpleBus)); + + + private void ButtonMove_Click(object sender, EventArgs e) { - if (_drawingBus == null) + if (_drawningSimpleBus == null) { return; } @@ -61,19 +92,19 @@ namespace ProjectBus { case "buttonUp": result = - _drawingBus.MoveTransport(DirectionType.Up); + _drawningSimpleBus.MoveTransport(DirectionType.Up); break; case "buttonDown": result = - _drawingBus.MoveTransport(DirectionType.Down); + _drawningSimpleBus.MoveTransport(DirectionType.Down); break; case "buttonLeft": result = - _drawingBus.MoveTransport(DirectionType.Left); + _drawningSimpleBus.MoveTransport(DirectionType.Left); break; case "buttonRight": result = - _drawingBus.MoveTransport(DirectionType.Right); + _drawningSimpleBus.MoveTransport(DirectionType.Right); break; } @@ -81,7 +112,6 @@ namespace ProjectBus { Draw(); } - } } }