diff --git a/ProjectBus/ProjectBoat.sln b/ProjectBus/ProjectBoat.sln
new file mode 100644
index 0000000..1004afb
--- /dev/null
+++ b/ProjectBus/ProjectBoat.sln
@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.9.34728.123
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ProjectBoat", "ProjectBus\ProjectBoat.csproj", "{C59FB840-1FB7-448F-95EC-A93F736DC5A2}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Release|Any CPU = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {C59FB840-1FB7-448F-95EC-A93F736DC5A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {C59FB840-1FB7-448F-95EC-A93F736DC5A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {C59FB840-1FB7-448F-95EC-A93F736DC5A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {C59FB840-1FB7-448F-95EC-A93F736DC5A2}.Release|Any CPU.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {0CABDAF5-45EA-451F-B8F4-E997B01147FB}
+ EndGlobalSection
+EndGlobal
diff --git a/ProjectBus/ProjectBus/DirectionType.cs b/ProjectBus/ProjectBus/DirectionType.cs
index 674b52a..7ef6996 100644
--- a/ProjectBus/ProjectBus/DirectionType.cs
+++ b/ProjectBus/ProjectBus/DirectionType.cs
@@ -1,4 +1,4 @@
-namespace ProjectBus;
+namespace ProjectBoat;
///
/// Направление перемещения
///
diff --git a/ProjectBus/ProjectBus/DrawningBoat.cs b/ProjectBus/ProjectBus/DrawningBoat.cs
new file mode 100644
index 0000000..49b69d1
--- /dev/null
+++ b/ProjectBus/ProjectBus/DrawningBoat.cs
@@ -0,0 +1,219 @@
+using ProjectBoat;
+using System.Drawing.Drawing2D;
+using System.Security.Cryptography.Xml;
+
+namespace ProjectBoat;
+///
+/// Класс, отвечающий за прорисовку и перемещение объекта-сущности
+///
+public class DrawningBoat
+{
+ ///
+ /// Класс-сущность
+ ///
+ public EntityBoat? EntityBoat { get; private set; }
+ ///
+ /// Ширина окна
+ ///
+ private int? _pictureWidth;
+ ///
+ /// Высота окна
+ ///
+ private int? _pictureHeight;
+ ///
+ /// Левая координата прорисовки автомобиля
+ ///
+ private int? _startPosX;
+ ///
+ /// Верхняя кооридната прорисовки автомобиля
+ ///
+ private int? _startPosY;
+
+ ///
+ /// Ширина прорисовки крейсера
+ ///
+ private readonly int _drawningBoatWidth = 150;
+ ///
+ /// Высота прорисовки крейсера
+ ///
+ private readonly int _drawningBoatHeight = 50;
+ private readonly int _drawningEnginesWidth = 3;
+ ///
+ /// Инициализация свойств
+ ///
+ /// Скорость
+ /// Вес
+ /// Основной цвет
+ /// Дополнительный цвет
+ /// Признак наличия вертолетной площадки
+ /// Признак наличия шлюпок
+ /// Признак наличия пушки
+
+ public void Init(int speed, double weight, Color bodyColor, Color
+ additionalColor, bool motor, bool boat, bool glass)
+ {
+ EntityBoat = new EntityBoat();
+ EntityBoat.Init(speed, weight, bodyColor, additionalColor,
+ motor, boat, glass);
+ _pictureWidth = null;
+ _pictureHeight = null;
+ _startPosX = null;
+ _startPosY = null;
+ }
+ ///
+ /// Установка границ поля
+ ///
+ /// Ширина поля
+ /// Высота поля
+ /// true - границы заданы, false - проверка не пройдена, нельзя разместить объект в этих размерах
+ public bool SetPictureSize(int width, int height)
+ {
+ // TODO проверка, что объект "влезает" в размеры поля
+ // если влезает, сохраняем границы и корректируем позицию объекта,если она была уже установлена
+
+ if (_drawningBoatHeight > height || _drawningBoatWidth > width)
+ {
+ return false;
+
+ }
+
+ _pictureWidth = width;
+ _pictureHeight = height;
+
+ if (_startPosX.HasValue && _startPosY.HasValue)
+ {
+ SetPosition(_startPosX.Value, _startPosY.Value);
+ }
+
+ return true;
+ }
+ ///
+ /// Установка позиции
+ ///
+ /// Координата X
+ /// Координата Y
+ public void SetPosition(int x, int y)
+ {
+ if (!_pictureHeight.HasValue || !_pictureWidth.HasValue)
+ {
+ return;
+ }
+
+ if (x < 0 || x + _drawningBoatWidth > _pictureWidth || y < 0 || y + _drawningBoatHeight > _pictureHeight)
+ {
+ _startPosX = _pictureWidth - _drawningBoatWidth;
+ _startPosY = _pictureHeight - _drawningBoatHeight;
+ }
+ else
+ {
+ _startPosX = x;
+ _startPosY = y;
+ }
+
+ }
+ ///
+ /// Изменение направления перемещения
+ ///
+ /// Направление
+ /// true - перемещене выполнено, false - перемещение невозможно
+ public bool MoveTransport(DirectionType direction)
+ {
+ if (EntityBoat == null || !_startPosX.HasValue || !_startPosY.HasValue)
+ {
+ return false;
+ }
+ switch (direction)
+ {
+ //влево
+ case DirectionType.Left:
+ if (_startPosX.Value - EntityBoat.Step - _drawningEnginesWidth > 0)
+ {
+ _startPosX -= (int)EntityBoat.Step;
+ }
+ return true;
+ //вверх
+ case DirectionType.Up:
+ if (_startPosY.Value - EntityBoat.Step > 0)
+ {
+ _startPosY -= (int)EntityBoat.Step;
+ }
+ return true;
+ // вправо
+ case DirectionType.Right:
+ //TODO прописать логику сдвига в право
+ if (_startPosX.Value + EntityBoat.Step + _drawningBoatWidth < _pictureWidth)
+ {
+ _startPosX += (int)EntityBoat.Step;
+ }
+ return true;
+ //вниз
+ case DirectionType.Down:
+ if (_startPosY.Value + EntityBoat.Step + _drawningBoatHeight < _pictureHeight)
+ {
+ _startPosY += (int)EntityBoat.Step;
+ }
+ return true;
+ default:
+ return false;
+ }
+ }
+ ///
+ /// Прорисовка объекта
+ ///
+ ///
+ public void DrawTransport(Graphics g)
+ {
+ if (EntityBoat == null || !_startPosX.HasValue ||
+ !_startPosY.HasValue)
+ {
+ return;
+ }
+ Pen pen = new(EntityBoat.BodyColor, 2);
+ Brush motorBrush = new SolidBrush(Color.Black);
+ Brush glassBrush = new SolidBrush(Color.Blue);
+ Brush glassBrush2 = new SolidBrush(EntityBoat.AdditionalColor);
+ Brush oarsBrush = new HatchBrush(HatchStyle.ZigZag, EntityBoat.AdditionalColor, Color.FromArgb(163, 163, 163));
+ Brush additionalBrush = new SolidBrush(EntityBoat.AdditionalColor);
+
+ //границы круисера
+ g.DrawLine(pen, _startPosX.Value, _startPosY.Value, _startPosX.Value + 105, _startPosY.Value);
+ g.DrawLine(pen, _startPosX.Value + 105, _startPosY.Value, _startPosX.Value + 147, _startPosY.Value + 24);
+
+ g.DrawLine(pen, _startPosX.Value, _startPosY.Value + 49, _startPosX.Value + 105, _startPosY.Value + 49);
+ g.DrawLine(pen, _startPosX.Value + 105, _startPosY.Value + 49, _startPosX.Value + 147, _startPosY.Value + 24);
+
+ g.DrawLine(pen, _startPosX.Value, _startPosY.Value, _startPosX.Value, _startPosY.Value + 49);
+
+ //внутренности круисера
+
+ g.DrawRectangle(pen, _startPosX.Value + 25, _startPosY.Value + 10, 80, 30);
+ g.FillRectangle(additionalBrush, _startPosX.Value + 25, _startPosY.Value + 10, 80, 30);
+
+
+
+
+ if (EntityBoat.Motor)
+ {
+ g.FillRectangle(motorBrush, _startPosX.Value - 3, _startPosY.Value + 15, 20, 17);
+
+ }
+
+ if (EntityBoat.Oars)
+ {
+ g.DrawEllipse(pen, _startPosX.Value + 45, _startPosY.Value - 15, 10, 13);
+ g.FillEllipse(oarsBrush, _startPosX.Value + 45, _startPosY.Value - 15, 10, 13);
+ g.FillRectangle(motorBrush, _startPosX.Value + 49, _startPosY.Value - 1 , 2, 20);
+
+ g.DrawEllipse(pen, _startPosX.Value + 45, _startPosY.Value + 48, 10, 13);
+ g.FillEllipse(oarsBrush, _startPosX.Value + 45, _startPosY.Value + 48, 10, 13);
+ g.FillRectangle(motorBrush, _startPosX.Value + 49, _startPosY.Value + 30, 2, 20);
+ }
+
+ if (EntityBoat.Glass)
+ {
+ g.FillRectangle(glassBrush, _startPosX.Value + 100, _startPosY.Value + 7, 10, 36);
+
+
+ }
+ }
+}
diff --git a/ProjectBus/ProjectBus/DrawningBus.cs b/ProjectBus/ProjectBus/DrawningBus.cs
deleted file mode 100644
index 1f4c025..0000000
--- a/ProjectBus/ProjectBus/DrawningBus.cs
+++ /dev/null
@@ -1,239 +0,0 @@
-using ProjectBus;
-using System.Drawing.Drawing2D;
-using System.Security.Cryptography.Xml;
-
-namespace ProjectBus;
-///
-/// Класс, отвечающий за прорисовку и перемещение объекта-сущности
-///
-public class DrawningBus
-{
- ///
- /// Класс-сущность
- ///
- public EntityBus? EntityBus { get; private set; }
- ///
- /// Ширина окна
- ///
- private int? _pictureWidth;
- ///
- /// Высота окна
- ///
- private int? _pictureHeight;
- ///
- /// Левая координата прорисовки автомобиля
- ///
- private int? _startPosX;
- ///
- /// Верхняя кооридната прорисовки автомобиля
- ///
- private int? _startPosY;
-
- ///
- /// Ширина прорисовки крейсера
- ///
- private readonly int _drawningBusWidth = 150;
- ///
- /// Высота прорисовки крейсера
- ///
- private readonly int _drawningBusHeight = 50;
- private readonly int _drawningEnginesWidth = 3;
- ///
- /// Инициализация свойств
- ///
- /// Скорость
- /// Вес
- /// Основной цвет
- /// Дополнительный цвет
- /// Признак наличия второго этажа
- /// Признак наличия лестнницы
- /// Признак наличия фар
- public void Init(int speed, double weight, Color bodyColor, Color
- additionalColor, bool secondFloor, bool ladder, bool headlights)
- {
- EntityBus = new EntityBus();
- EntityBus.Init(speed, weight, bodyColor, additionalColor,
- secondFloor, ladder, headlights);
- _pictureWidth = null;
- _pictureHeight = null;
- _startPosX = null;
- _startPosY = null;
- }
- ///
- /// Установка границ поля
- ///
- /// Ширина поля
- /// Высота поля
- /// true - границы заданы, false - проверка не пройдена, нельзя разместить объект в этих размерах
- public bool SetPictureSize(int width, int height)
- {
- // TODO проверка, что объект "влезает" в размеры поля
- // если влезает, сохраняем границы и корректируем позицию объекта,если она была уже установлена
-
- if (_drawningBusHeight > height || _drawningBusWidth > width)
- {
- return false;
-
- }
-
- _pictureWidth = width;
- _pictureHeight = height;
-
- if (_startPosX.HasValue && _startPosY.HasValue)
- {
- SetPosition(_startPosX.Value, _startPosY.Value);
- }
-
- return true;
- }
- ///
- /// Установка позиции
- ///
- /// Координата X
- /// Координата Y
- public void SetPosition(int x, int y)
- {
- if (!_pictureHeight.HasValue || !_pictureWidth.HasValue)
- {
- return;
- }
-
- if (x < 0 || x + _drawningBusWidth > _pictureWidth || y < 0 || y + _drawningBusHeight > _pictureHeight)
- {
- _startPosX = _pictureWidth - _drawningBusWidth;
- _startPosY = _pictureHeight - _drawningBusHeight;
- }
- else
- {
- _startPosX = x;
- _startPosY = y;
- }
-
- }
- ///
- /// Изменение направления перемещения
- ///
- /// Направление
- /// true - перемещене выполнено, false - перемещение невозможно
- public bool MoveTransport(DirectionType direction)
- {
- if (EntityBus == null || !_startPosX.HasValue || !_startPosY.HasValue)
- {
- return false;
- }
- switch (direction)
- {
- //влево
- case DirectionType.Left:
- if (_startPosX.Value - EntityBus.Step - _drawningEnginesWidth > 0)
- {
- _startPosX -= (int)EntityBus.Step;
- }
- return true;
- //вверх
- case DirectionType.Up:
- if (_startPosY.Value - EntityBus.Step > 0)
- {
- _startPosY -= (int)EntityBus.Step;
- }
- return true;
- // вправо
- case DirectionType.Right:
- //TODO прописать логику сдвига в право
- if (_startPosX.Value + EntityBus.Step + _drawningBusWidth < _pictureWidth)
- {
- _startPosX += (int)EntityBus.Step;
- }
- return true;
- //вниз
- case DirectionType.Down:
- if (_startPosY.Value + EntityBus.Step + _drawningBusHeight < _pictureHeight)
- {
- _startPosY += (int)EntityBus.Step;
- }
- return true;
- default:
- return false;
- }
- }
- ///
- /// Прорисовка объекта
- ///
- ///
- public void DrawTransport(Graphics g)
- {
- if (EntityBus == null || !_startPosX.HasValue ||
- !_startPosY.HasValue)
- {
- return;
- }
- Pen pen = new(EntityBus.BodyColor, 2);
- Pen pen2 = new(Color.Black, 2);
- Brush additionalBrush = new SolidBrush(Color.Black);
- Brush headlightsBrush = new SolidBrush(Color.Yellow);
- Brush headlightsBrush2 = new SolidBrush(EntityBus.AdditionalColor);
- Brush secondFloorBrush = new HatchBrush(HatchStyle.ZigZag, EntityBus.AdditionalColor, Color.FromArgb(163, 163, 163));
- Brush ladderBrush = new SolidBrush(Color.LightBlue);
-
- //границы круисера
- g.FillRectangle(secondFloorBrush, _startPosX.Value, _startPosY.Value + 50, 150, 50);
- g.DrawRectangle(pen, _startPosX.Value, _startPosY.Value + 50, 150, 50);
-
- g.FillRectangle(headlightsBrush2, _startPosX.Value + 40, _startPosY.Value + 65, 20, 35);
- g.DrawRectangle(pen, _startPosX.Value + 40, _startPosY.Value + 65, 20, 35);
-
- g.FillEllipse(additionalBrush, _startPosX.Value + 15, _startPosY.Value + 90, 22, 22);
- g.FillEllipse(additionalBrush, _startPosX.Value + 110, _startPosY.Value + 90, 22, 22);
-
- g.FillEllipse(ladderBrush, _startPosX.Value + 130, _startPosY.Value + 55, 20, 30);
- g.FillEllipse(ladderBrush, _startPosX.Value + 108, _startPosY.Value + 55, 20, 30);
- g.FillEllipse(ladderBrush, _startPosX.Value + 86, _startPosY.Value + 55, 20, 30);
- g.FillEllipse(ladderBrush, _startPosX.Value + 64, _startPosY.Value + 55, 20, 30);
-
-
-
- if (EntityBus.SecondFloor)
- {
- g.FillRectangle(secondFloorBrush, _startPosX.Value, _startPosY.Value, 150, 50);
- g.DrawRectangle(pen, _startPosX.Value, _startPosY.Value, 150, 50);
- g.FillEllipse(ladderBrush, _startPosX.Value + 130, _startPosY.Value + 5, 20, 30);
- g.FillEllipse(ladderBrush, _startPosX.Value + 105, _startPosY.Value + 5, 20, 30);
- g.FillEllipse(ladderBrush, _startPosX.Value + 80, _startPosY.Value + 5, 20, 30);
- g.FillEllipse(ladderBrush, _startPosX.Value + 55, _startPosY.Value + 5, 20, 30);
- g.FillEllipse(ladderBrush, _startPosX.Value + 30, _startPosY.Value + 5, 20, 30);
- //g.FillEllipse(ladderBrush, _startPosX.Value + 5, _startPosY.Value + 5, 20, 30);
- //g.FillEllipse(ladderBrush, _startPosX.Value + -2, _startPosY.Value + 5, 20, 30);
-
- if (EntityBus.Ladder)
- {
- g.FillRectangle(headlightsBrush2, _startPosX.Value, _startPosY.Value + 15, 20, 35);
- g.DrawRectangle(pen, _startPosX.Value, _startPosY.Value + 15, 20, 35);
- g.DrawLine(pen2, _startPosX.Value, _startPosY.Value + 50, _startPosX.Value, _startPosY.Value + 100);
- g.DrawLine(pen2, _startPosX.Value + 20, _startPosY.Value + 50, _startPosX.Value + 20, _startPosY.Value + 100);
- g.DrawLine(pen2, _startPosX.Value, _startPosY.Value + 60, _startPosX.Value + 20, _startPosY.Value + 60);
- g.DrawLine(pen2, _startPosX.Value, _startPosY.Value + 70, _startPosX.Value + 20, _startPosY.Value + 70);
- g.DrawLine(pen2, _startPosX.Value, _startPosY.Value + 80, _startPosX.Value + 20, _startPosY.Value + 80);
- g.DrawLine(pen2, _startPosX.Value, _startPosY.Value + 90, _startPosX.Value + 20, _startPosY.Value + 90);
-
- }
- else
- {
- g.FillEllipse(ladderBrush, _startPosX.Value + 5, _startPosY.Value + 5, 20, 30);
- g.FillEllipse(ladderBrush, _startPosX.Value + 5, _startPosY.Value + 55, 20, 30);
-
- }
- }
- else
- {
- g.FillEllipse(ladderBrush, _startPosX.Value + 5, _startPosY.Value + 55, 20, 30);
- }
-
-
- if (EntityBus.Headlights)
- {
- g.FillEllipse(headlightsBrush, _startPosX.Value + 143, _startPosY.Value + 80, 8, 15);
-
- }
-
- }
-}
\ No newline at end of file
diff --git a/ProjectBus/ProjectBus/EntityBus.cs b/ProjectBus/ProjectBus/EntityBoat.cs
similarity index 75%
rename from ProjectBus/ProjectBus/EntityBus.cs
rename to ProjectBus/ProjectBus/EntityBoat.cs
index 7720f9f..17649ab 100644
--- a/ProjectBus/ProjectBus/EntityBus.cs
+++ b/ProjectBus/ProjectBus/EntityBoat.cs
@@ -1,8 +1,8 @@
-namespace ProjectBus;
+namespace ProjectBoat;
///
/// Класс-сущность "автобус"
///
-public class EntityBus
+public class EntityBoat
{
//свойства
///
@@ -24,15 +24,15 @@ public class EntityBus
///
/// Признак (опция) наличие второго этажа
///
- public bool SecondFloor { get; private set; }
+ public bool Motor { get; private set; }
///
/// Признак (опция) наличие лестницы
///
- public bool Ladder { get; private set; }
+ public bool Oars { get; private set; }
///
/// Признак (опция) наличие фар
///
- public bool Headlights { get; private set; }
+ public bool Glass { get; private set; }
//поле класса
///
/// Шаг перемещения автомобиля
@@ -45,18 +45,18 @@ public class EntityBus
/// вес
/// основной цвет
/// дополнительный цвет
- /// второй этаж
- /// лестница
- /// наличие фар
+ /// второй этаж
+ /// лестница
+ /// наличие фар
public void Init(int speed, double weight, Color bodyColor, Color
- additionalColor, bool secondFloor, bool ladder, bool headlights)
+ additionalColor, bool motor, bool oars, bool glass)
{
Speed = speed;
Weight = weight;
BodyColor = bodyColor;
AdditionalColor = additionalColor;
- SecondFloor = secondFloor;
- Ladder = ladder;
- Headlights = headlights;
+ Motor = motor;
+ Oars = oars;
+ Glass = glass;
}
}
diff --git a/ProjectBus/ProjectBus/FormBus.Designer.cs b/ProjectBus/ProjectBus/FormBoat.Designer.cs
similarity index 78%
rename from ProjectBus/ProjectBus/FormBus.Designer.cs
rename to ProjectBus/ProjectBus/FormBoat.Designer.cs
index 7698b9a..a3f9cb9 100644
--- a/ProjectBus/ProjectBus/FormBus.Designer.cs
+++ b/ProjectBus/ProjectBus/FormBoat.Designer.cs
@@ -1,6 +1,7 @@
-namespace ProjectBus
+
+namespace ProjectBoat
{
- partial class FormBus
+ partial class FormBoat
{
///
/// Required designer variable.
@@ -28,7 +29,7 @@
///
private void InitializeComponent()
{
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormBus));
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormBoat));
pictureBox1 = new PictureBox();
button1 = new Button();
buttonUp = new Button();
@@ -42,8 +43,9 @@
//
pictureBox1.Dock = DockStyle.Fill;
pictureBox1.Location = new Point(0, 0);
+ pictureBox1.Margin = new Padding(3, 2, 3, 2);
pictureBox1.Name = "pictureBox1";
- pictureBox1.Size = new Size(800, 450);
+ pictureBox1.Size = new Size(700, 338);
pictureBox1.SizeMode = PictureBoxSizeMode.AutoSize;
pictureBox1.TabIndex = 0;
pictureBox1.TabStop = false;
@@ -51,22 +53,24 @@
// button1
//
button1.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
- button1.Location = new Point(12, 409);
+ button1.Location = new Point(10, 307);
+ button1.Margin = new Padding(3, 2, 3, 2);
button1.Name = "button1";
- button1.Size = new Size(94, 29);
+ button1.Size = new Size(82, 22);
button1.TabIndex = 1;
button1.Text = "создать";
button1.UseVisualStyleBackColor = true;
- button1.Click += ButtonCreateBus_Click;
+ button1.Click += ButtonCreateBoat_Click;
//
// buttonUp
//
buttonUp.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
buttonUp.BackgroundImage = (Image)resources.GetObject("buttonUp.BackgroundImage");
buttonUp.BackgroundImageLayout = ImageLayout.Zoom;
- buttonUp.Location = new Point(722, 373);
+ buttonUp.Location = new Point(632, 280);
+ buttonUp.Margin = new Padding(3, 2, 3, 2);
buttonUp.Name = "buttonUp";
- buttonUp.Size = new Size(30, 30);
+ buttonUp.Size = new Size(26, 22);
buttonUp.TabIndex = 2;
buttonUp.UseVisualStyleBackColor = true;
buttonUp.Click += ButtonMove_Click;
@@ -76,9 +80,10 @@
buttonDown.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
buttonDown.BackgroundImage = (Image)resources.GetObject("buttonDown.BackgroundImage");
buttonDown.BackgroundImageLayout = ImageLayout.Zoom;
- buttonDown.Location = new Point(722, 409);
+ buttonDown.Location = new Point(632, 307);
+ buttonDown.Margin = new Padding(3, 2, 3, 2);
buttonDown.Name = "buttonDown";
- buttonDown.Size = new Size(30, 30);
+ buttonDown.Size = new Size(26, 22);
buttonDown.TabIndex = 3;
buttonDown.UseVisualStyleBackColor = true;
buttonDown.Click += ButtonMove_Click;
@@ -88,9 +93,10 @@
buttonRight.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
buttonRight.BackgroundImage = (Image)resources.GetObject("buttonRight.BackgroundImage");
buttonRight.BackgroundImageLayout = ImageLayout.Zoom;
- buttonRight.Location = new Point(758, 409);
+ buttonRight.Location = new Point(663, 307);
+ buttonRight.Margin = new Padding(3, 2, 3, 2);
buttonRight.Name = "buttonRight";
- buttonRight.Size = new Size(30, 30);
+ buttonRight.Size = new Size(26, 22);
buttonRight.TabIndex = 4;
buttonRight.UseVisualStyleBackColor = true;
buttonRight.Click += ButtonMove_Click;
@@ -100,26 +106,29 @@
buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
buttonLeft.BackgroundImage = (Image)resources.GetObject("buttonLeft.BackgroundImage");
buttonLeft.BackgroundImageLayout = ImageLayout.Zoom;
- buttonLeft.Location = new Point(686, 409);
+ buttonLeft.Location = new Point(600, 307);
+ buttonLeft.Margin = new Padding(3, 2, 3, 2);
buttonLeft.Name = "buttonLeft";
- buttonLeft.Size = new Size(30, 30);
+ buttonLeft.Size = new Size(26, 22);
buttonLeft.TabIndex = 5;
buttonLeft.UseVisualStyleBackColor = true;
buttonLeft.Click += ButtonMove_Click;
//
- // Form1
+ // FormBoat
//
- AutoScaleDimensions = new SizeF(8F, 20F);
+ AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleMode = AutoScaleMode.Font;
- ClientSize = new Size(800, 450);
+ ClientSize = new Size(700, 338);
Controls.Add(buttonLeft);
Controls.Add(buttonRight);
Controls.Add(buttonDown);
Controls.Add(buttonUp);
Controls.Add(button1);
Controls.Add(pictureBox1);
- Name = "Form1";
- Text = "FormBus";
+ Margin = new Padding(3, 2, 3, 2);
+ Name = "FormBoat";
+ Text = "FormBoat";
+ //Load += this.FormBoat_Load_1;
Click += ButtonMove_Click;
((System.ComponentModel.ISupportInitialize)pictureBox1).EndInit();
ResumeLayout(false);
diff --git a/ProjectBus/ProjectBus/FormBus.cs b/ProjectBus/ProjectBus/FormBoat.cs
similarity index 72%
rename from ProjectBus/ProjectBus/FormBus.cs
rename to ProjectBus/ProjectBus/FormBoat.cs
index 6bd7f13..0d6b189 100644
--- a/ProjectBus/ProjectBus/FormBus.cs
+++ b/ProjectBus/ProjectBus/FormBoat.cs
@@ -1,12 +1,12 @@
-namespace ProjectBus
+namespace ProjectBoat
{
- public partial class FormBus : Form
+ public partial class FormBoat : Form
{
///
/// Поле-объект для прорисовки объекта
///
- private DrawningBus? _drawningBus;
- public FormBus()
+ private DrawningBoat? _drawningBoat;
+ public FormBoat()
{
InitializeComponent();
@@ -17,14 +17,14 @@
///
private void Draw()
{
- if (_drawningBus == null)
+ if (_drawningBoat == null)
{
return;
}
Bitmap bmp = new(pictureBox1.Width,
pictureBox1.Height);
Graphics gr = Graphics.FromImage(bmp);
- _drawningBus.DrawTransport(gr);
+ _drawningBoat.DrawTransport(gr);
pictureBox1.Image = bmp;
}
///
@@ -32,22 +32,22 @@
///
///
///
- private void ButtonCreateBus_Click(object sender, EventArgs e)
+ private void ButtonCreateBoat_Click(object sender, EventArgs e)
{
Random random = new();
- _drawningBus = new DrawningBus();
- _drawningBus.Init(random.Next(100, 300), random.Next(1000, 3000),
+ _drawningBoat = new DrawningBoat();
+ _drawningBoat.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)));
- _drawningBus.SetPictureSize(pictureBox1.Width,
+ _drawningBoat.SetPictureSize(pictureBox1.Width,
pictureBox1.Height);
//начальное положение круисера
- _drawningBus.SetPosition(random.Next(10, 100), random.Next(10, 100));
+ _drawningBoat.SetPosition(random.Next(10, 100), random.Next(10, 100));
Draw();
}
///
@@ -57,7 +57,7 @@
///
private void ButtonMove_Click(object sender, EventArgs e)
{
- if (_drawningBus == null)
+ if (_drawningBoat == null)
{
return;
}
@@ -67,19 +67,19 @@
{
case "buttonUp":
result =
- _drawningBus.MoveTransport(DirectionType.Up);
+ _drawningBoat.MoveTransport(DirectionType.Up);
break;
case "buttonDown":
result =
- _drawningBus.MoveTransport(DirectionType.Down);
+ _drawningBoat.MoveTransport(DirectionType.Down);
break;
case "buttonLeft":
result =
- _drawningBus.MoveTransport(DirectionType.Left);
+ _drawningBoat.MoveTransport(DirectionType.Left);
break;
case "buttonRight":
result =
- _drawningBus.MoveTransport(DirectionType.Right);
+ _drawningBoat.MoveTransport(DirectionType.Right);
break;
}
if (result)
diff --git a/ProjectBus/ProjectBus/FormBus.resx b/ProjectBus/ProjectBus/FormBoat.resx
similarity index 99%
rename from ProjectBus/ProjectBus/FormBus.resx
rename to ProjectBus/ProjectBus/FormBoat.resx
index c7d6880..ead51ca 100644
--- a/ProjectBus/ProjectBus/FormBus.resx
+++ b/ProjectBus/ProjectBus/FormBoat.resx
@@ -121,7 +121,7 @@
iVBORw0KGgoAAAANSUhEUgAABGsAAAZACAYAAADO3c9BAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- vwAADr8BOAVTJAAAVu1JREFUeF7s3XHE5XXe//HcstZKkiRJMpIkSZIkSZJkJUmSlSRZK1lJxkokK0mS
+ vQAADr0BR/uQrQAAVu1JREFUeF7s3XHE5XXe//HcstZKkiRJMpIkSZIkSZJkJUmSlSRZK1lJxkokK0mS
JGtkJUmSJEkykiRJMpIkyRgjY4wxxhhjjN/v9dnd7rutz3xmrus61/uc8z2PJw+/2++/na7rnO/3dZ3z
+Z4iSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIk
SZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIk
@@ -498,7 +498,7 @@
iVBORw0KGgoAAAANSUhEUgAABGsAAAZACAYAAADO3c9BAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- vwAADr8BOAVTJAAAVmJJREFUeF7s3XGk5nX+//98ZK2VJEkykpEkSZKsJEmyspIkyUqSrJWsJGMlkpUk
+ vQAADr0BR/uQrQAAVmJJREFUeF7s3XGk5nX+//98ZK2VJEkykpEkSZKsJEmyspIkyUqSrJWsJGMlkpUk
SZKVrCRZSVYyVpIkSZKRJEnGGBljjDHGGGP8fo/37mc/36199WzOnHOe531d1+3Ozf69zTnX9X4/znW9
3qdJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJ
kiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJkiRJ
@@ -873,7 +873,7 @@
iVBORw0KGgoAAAANSUhEUgAABkAAAARrCAYAAADb+Gp7AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- vwAADr8BOAVTJAAASClJREFUeF7s3Q+k3vX///F85SNJJjMzk0ySyXwkk8nMJEkyyWQySSaZZGYmGUmS
+ vQAADr0BR/uQrQAASClJREFUeF7s3Q+k3vX///F85SNJJjMzk0ySyXwkk8nMJEkyyWQySSaZZGYmGUmS
ZJJJZpLMJJlkJjOZj5mZmZmZyczMzBwzxxzHMcfv93hXq7ad/+d9Xdf7/Xrf7tx8vt+vjy/V2RXn4Xq+
7pMkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIk
SZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIk
@@ -1187,7 +1187,7 @@
iVBORw0KGgoAAAANSUhEUgAABkAAAARrCAYAAADb+Gp7AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- vwAADr8BOAVTJAAAUVNJREFUeF7s3X/E34X+//F85DiSTDKTSSbJJEcySZIkSZJkkiTJ5EiSZJJIkiRJ
+ vQAADr0BR/uQrQAAUVNJREFUeF7s3X/E34X+//F85DiSTDKTSSbJJEcySZIkSZJkkiTJ5EiSZJJIkiRJ
JpkkSZJMMpNM5pjMzMzMTGZmZmZmZuZymcv3+3idTufU9tyuX+8frx+3OzfO+bPrer9fF8+Hvd9XSZIk
SZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIk
SZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIkSZIk
diff --git a/ProjectBus/ProjectBus/Program.cs b/ProjectBus/ProjectBus/Program.cs
index 35682ae..3195745 100644
--- a/ProjectBus/ProjectBus/Program.cs
+++ b/ProjectBus/ProjectBus/Program.cs
@@ -1,4 +1,4 @@
-namespace ProjectBus
+namespace ProjectBoat
{
internal static class Program
{
@@ -11,7 +11,7 @@ namespace ProjectBus
// To customize application configuration such as set high DPI settings or default font,
// see https://aka.ms/applicationconfiguration.
ApplicationConfiguration.Initialize();
- Application.Run(new FormBus());
+ Application.Run(new FormBoat());
}
}
}
\ No newline at end of file
diff --git a/ProjectBus/ProjectBus/ProjectBoat.csproj b/ProjectBus/ProjectBus/ProjectBoat.csproj
new file mode 100644
index 0000000..663fdb8
--- /dev/null
+++ b/ProjectBus/ProjectBus/ProjectBoat.csproj
@@ -0,0 +1,11 @@
+
+
+
+ WinExe
+ net8.0-windows
+ enable
+ true
+ enable
+
+
+
\ No newline at end of file