diff --git a/ContainerShip/ContainerShip/ContainerShip.csproj b/ContainerShip/ContainerShip/ContainerShip.csproj
index b57c89e..13ee123 100644
--- a/ContainerShip/ContainerShip/ContainerShip.csproj
+++ b/ContainerShip/ContainerShip/ContainerShip.csproj
@@ -8,4 +8,19 @@
enable
+
+
+ True
+ True
+ Resources.resx
+
+
+
+
+
+ ResXFileCodeGenerator
+ Resources.Designer.cs
+
+
+
\ No newline at end of file
diff --git a/ContainerShip/ContainerShip/Containers.cs b/ContainerShip/ContainerShip/Containers.cs
new file mode 100644
index 0000000..f1cee47
--- /dev/null
+++ b/ContainerShip/ContainerShip/Containers.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Container
+{
+ public enum Containers
+ {
+ Two,
+ Four,
+ Six
+ }
+}
diff --git a/ContainerShip/ContainerShip/Direction.cs b/ContainerShip/ContainerShip/Direction.cs
new file mode 100644
index 0000000..fd93b71
--- /dev/null
+++ b/ContainerShip/ContainerShip/Direction.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectContainerShip
+{
+ public enum Direction
+ {
+ ///
+ /// Вверх
+ ///
+ Up = 1,
+ ///
+ /// Вниз
+ ///
+ Down = 2,
+ ///
+ /// Влево
+ ///
+ Left = 3,
+ ///
+ /// Вправо
+ ///
+ Right = 4
+ }
+}
diff --git a/ContainerShip/ContainerShip/DrawningContainerShip.cs b/ContainerShip/ContainerShip/DrawningContainerShip.cs
new file mode 100644
index 0000000..8134d8e
--- /dev/null
+++ b/ContainerShip/ContainerShip/DrawningContainerShip.cs
@@ -0,0 +1,196 @@
+using ContainersShip;
+using System;
+using System.Collections.Generic;
+using System.Drawing.Drawing2D;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectContainerShip
+{
+ public class DrawningContainerShip
+ {
+ ///
+ /// Класс-сущность
+ ///
+ public EntityContainerShip? EntityContainerShip { get; private set; }
+ public DrawningContainers drawningContainers;
+ ///
+ /// Ширина окна
+ ///
+ private int _pictureWidth;
+ ///
+ /// Высота окна
+ ///
+ private int _pictureHeight;
+ ///
+ /// /// Левая координата прорисовки контейнеровоза
+ ///
+ private int _startPosX;
+ ///
+ /// Верхняя кооридната прорисовки контенеровоза
+ ///
+ private int _startPosY;
+ ///
+ /// Ширина прорисовки Контейнеровоза
+ ///
+ private readonly int _shipWidth = 200;
+ ///
+ /// Высота прорисовки Контейнеровоза
+ ///
+ private readonly int _shipHeight = 40;
+ ///
+ /// Инициализация свойств
+ ///
+ /// Скорость
+ /// Вес
+ /// Цвет палубы
+ /// Дополнительный цвет
+ /// Признак наличия крана
+ /// Ширина картинки
+ /// Высота картинки
+ /// true - объект создан, false - проверка не пройдена, нельзя создать объект в этих размерах
+ public bool Init(int speed, double weight, Color bodyColor, Color additionalColor, bool crane, int width, int height)
+ {
+ if (width < _shipWidth || height < _shipHeight)
+ {
+ return false;
+ }
+ _pictureWidth = width;
+ _pictureHeight = height;
+ EntityContainerShip = new EntityContainerShip();
+ EntityContainerShip.Init(speed, weight, bodyColor, additionalColor, crane);
+ drawningContainers = new DrawningContainers();
+ return true;
+ }
+ ///
+ /// Установка позиции
+ ///
+ /// Координата X
+ /// Координата Y
+ public void SetPosition(int x, int y)
+ {
+ if((x > 0) && (x < _pictureWidth)) {
+ _startPosX = x;
+ }
+ else { _startPosX = 0; }
+ if ((y > 0) && (y < _pictureHeight))
+ {
+ _startPosY = y;
+ }
+ else
+ {
+ _startPosY = 0;
+ }
+ }
+ ///
+ /// Изменение направления перемещения
+ ///
+ /// Направление
+ public void MoveTransport(Direction direction)
+ {
+ if (EntityContainerShip == null)
+ {
+ return;
+ }
+ switch (direction)
+ {
+ //влево
+ case Direction.Left:
+ if (_startPosX - EntityContainerShip.Step > 0)
+ {
+ _startPosX -= (int)EntityContainerShip.Step;
+ }
+ else
+ {
+ _startPosX = 0;
+ }
+ break;
+ //вверх
+ case Direction.Up:
+ if (_startPosY - EntityContainerShip.Step > 0)
+ {
+ _startPosY -= (int)EntityContainerShip.Step;
+ }
+ else
+ {
+ _startPosY = 0;
+ }
+ break;
+ // вправо
+ case Direction.Right:
+ if (_startPosX + _shipWidth + EntityContainerShip.Step < _pictureWidth)
+ {
+ _startPosX += (int)EntityContainerShip.Step;
+ }
+ else
+ {
+ _startPosX = _pictureWidth - _shipWidth;
+ }
+ break;
+ //вниз
+ case Direction.Down:
+ if (_startPosY + _shipHeight + EntityContainerShip.Step < _pictureHeight)
+ {
+ _startPosY += (int)EntityContainerShip.Step;
+ }
+ else
+ {
+ _startPosY = _pictureHeight - _shipHeight;
+ }
+ break;
+ }
+ }
+ ///
+ /// Прорисовка объекта
+ ///
+ ///
+ public void DrawTransport(Graphics g)
+ {
+ if (EntityContainerShip == null)
+ {
+ return;
+ }
+ Pen pen = new(Color.Black);
+ Brush additionalBrush = new
+ SolidBrush(EntityContainerShip.AdditionalColor);
+ GraphicsPath path1 = new GraphicsPath();
+ //граница палубы
+ Brush brBlue = new SolidBrush(Color.Blue);
+ Point point5 = new Point(_startPosX + 30, _startPosY + 5);
+ Point point6 = new Point(_startPosX + 44, _startPosY + 5);
+ Point point7 = new Point(_startPosX + 44, _startPosY + 17);
+ Point point8 = new Point(_startPosX + 35, _startPosY + 17);
+ Point point9 = new Point(_startPosX + 35, _startPosY + 10);
+ Point point10 = new Point(_startPosX + 30, _startPosY + 5);
+ Point[] curvePoints2 = { point5, point6, point7, point8, point9, point10 };
+ g.FillPolygon(brBlue, curvePoints2);
+ //без крана
+ if (!EntityContainerShip.Crane)
+ {
+ drawningContainers.DrawContainers(g, _startPosX, _startPosY, EntityContainerShip.AdditionalColor);
+ }
+ //кран
+ if (EntityContainerShip.Crane)
+ {
+ Brush brBl = new SolidBrush(Color.Black);
+ g.FillRectangle(brBl, _startPosX + 110, _startPosY + 0, 3, 17);
+ g.FillRectangle(brBl, _startPosX + 105, _startPosY + 2, 20, 2);
+ drawningContainers.DrawContainers(g, _startPosX, _startPosY, EntityContainerShip.AdditionalColor);
+ }
+ //границы корабля
+ Brush brRD = new SolidBrush(Color.Red);
+ Point point1 = new Point(_startPosX, _startPosY + 17);
+ Point point2 = new Point(_startPosX + 25, _startPosY + 40);
+ Point point3 = new Point(_startPosX + 175, _startPosY + 40);
+ Point point4 = new Point(_startPosX + 200, _startPosY + 17);
+ Point[] curvePoints1 = { point1, point2, point3, point4 };
+ g.FillPolygon(brRD, curvePoints1);
+ path1.AddLine(_startPosX , _startPosY + 17, _startPosX + 200, _startPosY + 17);
+ path1.AddLine(_startPosX + 200, _startPosY + 17, _startPosX + 175, _startPosY + 40);
+ path1.AddLine(_startPosX + 175, _startPosY + 40, _startPosX + 25, _startPosY + 40);
+ path1.AddLine(_startPosX + 25, _startPosY + 40, _startPosX , _startPosY + 17);
+ g.DrawPath(pen, path1);
+ }
+ }
+}
diff --git a/ContainerShip/ContainerShip/DrawningContainers.cs b/ContainerShip/ContainerShip/DrawningContainers.cs
new file mode 100644
index 0000000..8f4ef10
--- /dev/null
+++ b/ContainerShip/ContainerShip/DrawningContainers.cs
@@ -0,0 +1,73 @@
+using Container;
+using ProjectContainerShip;
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Drawing.Drawing2D;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ContainersShip
+{
+ public class DrawningContainers
+ {
+ private Containers amount;
+ public int SetAmount
+ {
+ set
+ {
+ if (value <= 3 || value > 6)
+ {
+ amount = Containers.Two;
+ }
+ else if (value == 4 || value == 5)
+ {
+ amount = Containers.Four;
+ }
+ else if (value == 6)
+ {
+ amount = Containers.Six;
+ }
+ }
+ }
+ public void DrawContainers(Graphics g, int _startPosX, int _startPosY, Color ContainerColor)
+ {
+ Brush contColors = new SolidBrush(ContainerColor);
+ Pen pen = new(Color.Black);
+ switch (amount)
+ {
+ case Containers.Two:
+ g.FillRectangle(contColors, _startPosX + 55, _startPosY + 12, 35, 5);
+ g.DrawRectangle(pen, _startPosX + 55, _startPosY + 12, 35, 5);
+ g.FillRectangle(contColors, _startPosX + 135, _startPosY + 12, 35, 5);
+ g.DrawRectangle(pen, _startPosX + 135, _startPosY + 12, 35, 5);
+ break;
+ case Containers.Four:
+ g.FillRectangle(contColors, _startPosX + 55, _startPosY + 12, 35, 5);
+ g.DrawRectangle(pen, _startPosX + 55, _startPosY + 12, 35, 5);
+ g.FillRectangle(contColors, _startPosX + 135, _startPosY + 12, 35, 5);
+ g.DrawRectangle(pen, _startPosX + 135, _startPosY + 12, 35, 5);
+ g.FillRectangle(contColors, _startPosX + 55, _startPosY + 7, 35, 5);
+ g.DrawRectangle(pen, _startPosX + 55, _startPosY + 7, 35, 5);
+ g.FillRectangle(contColors, _startPosX + 135, _startPosY + 7, 35, 5);
+ g.DrawRectangle(pen, _startPosX + 135, _startPosY + 7, 35, 5);
+ break;
+ case Containers.Six:
+ g.FillRectangle(contColors, _startPosX + 55, _startPosY + 12, 35, 5);
+ g.DrawRectangle(pen, _startPosX + 55, _startPosY + 12, 35, 5);
+ g.FillRectangle(contColors, _startPosX + 135, _startPosY + 12, 35, 5);
+ g.DrawRectangle(pen, _startPosX + 135, _startPosY + 12, 35, 5);
+ g.FillRectangle(contColors, _startPosX + 55, _startPosY + 7, 35, 5);
+ g.DrawRectangle(pen, _startPosX + 55, _startPosY + 7, 35, 5);
+ g.FillRectangle(contColors, _startPosX + 135, _startPosY + 7, 35, 5);
+ g.DrawRectangle(pen, _startPosX + 135, _startPosY + 7, 35, 5);
+ g.FillRectangle(contColors, _startPosX + 55, _startPosY + 2, 35, 5);
+ g.DrawRectangle(pen, _startPosX + 55, _startPosY + 2, 35, 5);
+ g.FillRectangle(contColors, _startPosX + 135, _startPosY + 2, 35, 5);
+ g.DrawRectangle(pen, _startPosX + 135, _startPosY + 2, 35, 5);
+ break;
+ }
+ }
+ }
+}
diff --git a/ContainerShip/ContainerShip/EntityContainer.cs b/ContainerShip/ContainerShip/EntityContainer.cs
new file mode 100644
index 0000000..3368444
--- /dev/null
+++ b/ContainerShip/ContainerShip/EntityContainer.cs
@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectContainerShip
+{
+ public class EntityContainerShip
+ {
+ ///
+ /// Скорость
+ ///
+ 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 Crane { get; private set; }
+ public double Step => (double)Speed * 100 / Weight;
+ ///
+ /// Инициализация полей объекта-класса контейнеровоза
+ ///
+ /// Скорость
+ /// Вес
+ /// Основной цвет
+ /// Дополнительный цвет
+ /// Признак наличия крана
+ public void Init(int speed, double weight, Color bodyColor, Color
+ additionalColor, bool crane)
+ {
+ Speed = speed;
+ Weight = weight;
+ BodyColor = bodyColor;
+ AdditionalColor = additionalColor;
+ Crane = crane;
+ }
+ }
+}
diff --git a/ContainerShip/ContainerShip/Form1.Designer.cs b/ContainerShip/ContainerShip/Form1.Designer.cs
deleted file mode 100644
index 91e25af..0000000
--- a/ContainerShip/ContainerShip/Form1.Designer.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-namespace ContainerShip
-{
- 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/ContainerShip/ContainerShip/Form1.cs b/ContainerShip/ContainerShip/Form1.cs
deleted file mode 100644
index 4e3e4f7..0000000
--- a/ContainerShip/ContainerShip/Form1.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace ContainerShip
-{
- public partial class Form1 : Form
- {
- public Form1()
- {
- InitializeComponent();
- }
- }
-}
\ No newline at end of file
diff --git a/ContainerShip/ContainerShip/OutputForm.Designer.cs b/ContainerShip/ContainerShip/OutputForm.Designer.cs
new file mode 100644
index 0000000..e990b35
--- /dev/null
+++ b/ContainerShip/ContainerShip/OutputForm.Designer.cs
@@ -0,0 +1,151 @@
+namespace ProjectContainerShip
+{
+ partial class OutputForm
+ {
+ ///
+ /// 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()
+ {
+ pictureBoxContainerShip = new PictureBox();
+ buttonCreate = new Button();
+ buttonLeft = new Button();
+ buttonDown = new Button();
+ buttonRight = new Button();
+ buttonUp = new Button();
+ numericUpDownContainersNumber = new NumericUpDown();
+ ((System.ComponentModel.ISupportInitialize)pictureBoxContainerShip).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)numericUpDownContainersNumber).BeginInit();
+ SuspendLayout();
+ //
+ // pictureBoxContainerShip
+ //
+ pictureBoxContainerShip.Dock = DockStyle.Fill;
+ pictureBoxContainerShip.Location = new Point(0, 0);
+ pictureBoxContainerShip.Name = "pictureBoxContainerShip";
+ pictureBoxContainerShip.Size = new Size(882, 453);
+ pictureBoxContainerShip.SizeMode = PictureBoxSizeMode.AutoSize;
+ pictureBoxContainerShip.TabIndex = 0;
+ pictureBoxContainerShip.TabStop = false;
+ pictureBoxContainerShip.Click += buttonMove_Click;
+ //
+ // buttonCreate
+ //
+ buttonCreate.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
+ buttonCreate.Location = new Point(12, 412);
+ buttonCreate.Name = "buttonCreate";
+ buttonCreate.Size = new Size(94, 29);
+ buttonCreate.TabIndex = 1;
+ buttonCreate.Text = "Создать";
+ buttonCreate.UseVisualStyleBackColor = true;
+ buttonCreate.Click += buttonCreate_Click;
+ //
+ // buttonLeft
+ //
+ buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+ buttonLeft.BackgroundImage = ContainerShip.Properties.Resources.keyboard_left_arrow_button_icon_icons_com_72692;
+ buttonLeft.BackgroundImageLayout = ImageLayout.Zoom;
+ buttonLeft.Location = new Point(768, 412);
+ buttonLeft.Name = "buttonLeft";
+ buttonLeft.Size = new Size(30, 30);
+ buttonLeft.TabIndex = 2;
+ buttonLeft.UseVisualStyleBackColor = true;
+ buttonLeft.Click += buttonMove_Click;
+ //
+ // buttonDown
+ //
+ buttonDown.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+ buttonDown.BackgroundImage = ContainerShip.Properties.Resources.angle_arrow_down_icon_icons_com_73683;
+ buttonDown.BackgroundImageLayout = ImageLayout.Zoom;
+ buttonDown.Location = new Point(804, 411);
+ buttonDown.Name = "buttonDown";
+ buttonDown.Size = new Size(30, 30);
+ buttonDown.TabIndex = 3;
+ buttonDown.UseVisualStyleBackColor = true;
+ buttonDown.Click += buttonMove_Click;
+ //
+ // buttonRight
+ //
+ buttonRight.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+ buttonRight.BackgroundImage = ContainerShip.Properties.Resources.keyboard_right_arrow_button_1_icon_icons_com_72690;
+ buttonRight.BackgroundImageLayout = ImageLayout.Zoom;
+ buttonRight.Location = new Point(840, 412);
+ buttonRight.Name = "buttonRight";
+ buttonRight.Size = new Size(30, 30);
+ buttonRight.TabIndex = 4;
+ buttonRight.UseVisualStyleBackColor = true;
+ buttonRight.Click += buttonMove_Click;
+ //
+ // buttonUp
+ //
+ buttonUp.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+ buttonUp.BackgroundImage = ContainerShip.Properties.Resources.up_arrow_icon_icons_com_73351;
+ buttonUp.BackgroundImageLayout = ImageLayout.Zoom;
+ buttonUp.Location = new Point(804, 375);
+ buttonUp.Name = "buttonUp";
+ buttonUp.Size = new Size(30, 30);
+ buttonUp.TabIndex = 5;
+ buttonUp.UseVisualStyleBackColor = true;
+ buttonUp.Click += buttonMove_Click;
+ //
+ // numericUpDownContainersNumber
+ //
+ numericUpDownContainersNumber.Location = new Point(112, 414);
+ numericUpDownContainersNumber.Margin = new Padding(3, 4, 3, 4);
+ numericUpDownContainersNumber.Name = "numericUpDownContainersNumber";
+ numericUpDownContainersNumber.Size = new Size(137, 27);
+ numericUpDownContainersNumber.TabIndex = 7;
+ //
+ // OutputForm
+ //
+ AutoScaleDimensions = new SizeF(8F, 20F);
+ AutoScaleMode = AutoScaleMode.Font;
+ ClientSize = new Size(882, 453);
+ Controls.Add(numericUpDownContainersNumber);
+ Controls.Add(buttonUp);
+ Controls.Add(buttonRight);
+ Controls.Add(buttonDown);
+ Controls.Add(buttonLeft);
+ Controls.Add(buttonCreate);
+ Controls.Add(pictureBoxContainerShip);
+ Name = "OutputForm";
+ StartPosition = FormStartPosition.CenterScreen;
+ Text = "ContainerShip";
+ ((System.ComponentModel.ISupportInitialize)pictureBoxContainerShip).EndInit();
+ ((System.ComponentModel.ISupportInitialize)numericUpDownContainersNumber).EndInit();
+ ResumeLayout(false);
+ PerformLayout();
+ }
+
+ #endregion
+
+ private PictureBox pictureBoxContainerShip;
+ private Button buttonCreate;
+ private Button buttonLeft;
+ private Button buttonDown;
+ private Button buttonRight;
+ private Button buttonUp;
+ private NumericUpDown numericUpDownContainersNumber;
+ }
+}
\ No newline at end of file
diff --git a/ContainerShip/ContainerShip/OutputForm.cs b/ContainerShip/ContainerShip/OutputForm.cs
new file mode 100644
index 0000000..b8b8840
--- /dev/null
+++ b/ContainerShip/ContainerShip/OutputForm.cs
@@ -0,0 +1,69 @@
+namespace ProjectContainerShip
+{
+ public partial class OutputForm : Form
+ {
+ ///
+ /// -
+ ///
+ private DrawningContainerShip? _drawningContainerShip;
+ ///
+ ///
+ ///
+ public OutputForm()
+ {
+ InitializeComponent();
+ }
+ ///
+ ///
+ ///
+ private void Draw()
+ {
+ if (_drawningContainerShip == null)
+ {
+ return;
+ }
+ Bitmap bmp = new(pictureBoxContainerShip.Width,
+ pictureBoxContainerShip.Height);
+ Graphics gr = Graphics.FromImage(bmp);
+ _drawningContainerShip.DrawTransport(gr);
+ pictureBoxContainerShip.Image = bmp;
+ }
+ private void buttonCreate_Click(object sender, EventArgs e)
+ {
+ Random random = new();
+ _drawningContainerShip = new DrawningContainerShip();
+ _drawningContainerShip.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)),
+ pictureBoxContainerShip.Width, pictureBoxContainerShip.Height);
+ _drawningContainerShip.SetPosition(random.Next(10, 100), random.Next(10, 100));
+ _drawningContainerShip.drawningContainers.SetAmount = (int)numericUpDownContainersNumber.Value;
+ Draw();
+ }
+ private void buttonMove_Click(object sender, EventArgs e)
+ {
+ if (_drawningContainerShip == null)
+ {
+ return;
+ }
+ string name = ((Button)sender)?.Name ?? string.Empty;
+ switch (name)
+ {
+ case "buttonUp":
+ _drawningContainerShip.MoveTransport(Direction.Up);
+ break;
+ case "buttonDown":
+ _drawningContainerShip.MoveTransport(Direction.Down);
+ break;
+ case "buttonLeft":
+ _drawningContainerShip.MoveTransport(Direction.Left);
+ break;
+ case "buttonRight":
+ _drawningContainerShip.MoveTransport(Direction.Right);
+ break;
+ }
+ Draw();
+ }
+ }
+}
diff --git a/ContainerShip/ContainerShip/Form1.resx b/ContainerShip/ContainerShip/OutputForm.resx
similarity index 93%
rename from ContainerShip/ContainerShip/Form1.resx
rename to ContainerShip/ContainerShip/OutputForm.resx
index 1af7de1..af32865 100644
--- a/ContainerShip/ContainerShip/Form1.resx
+++ b/ContainerShip/ContainerShip/OutputForm.resx
@@ -1,17 +1,17 @@
-
diff --git a/ContainerShip/ContainerShip/Program.cs b/ContainerShip/ContainerShip/Program.cs
index 6a9b875..799031f 100644
--- a/ContainerShip/ContainerShip/Program.cs
+++ b/ContainerShip/ContainerShip/Program.cs
@@ -1,4 +1,4 @@
-namespace ContainerShip
+namespace ProjectContainerShip
{
internal static class Program
{
@@ -11,7 +11,7 @@ namespace ContainerShip
// 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 OutputForm());
}
}
}
\ No newline at end of file
diff --git a/ContainerShip/ContainerShip/Properties/Resources.Designer.cs b/ContainerShip/ContainerShip/Properties/Resources.Designer.cs
new file mode 100644
index 0000000..a214a76
--- /dev/null
+++ b/ContainerShip/ContainerShip/Properties/Resources.Designer.cs
@@ -0,0 +1,103 @@
+//------------------------------------------------------------------------------
+//
+// Этот код создан программой.
+// Исполняемая версия:4.0.30319.42000
+//
+// Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
+// повторной генерации кода.
+//
+//------------------------------------------------------------------------------
+
+namespace ContainerShip.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("ContainerShip.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 angle_arrow_down_icon_icons_com_73683 {
+ get {
+ object obj = ResourceManager.GetObject("angle-arrow-down_icon-icons.com_73683", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Поиск локализованного ресурса типа System.Drawing.Bitmap.
+ ///
+ internal static System.Drawing.Bitmap keyboard_left_arrow_button_icon_icons_com_72692 {
+ get {
+ object obj = ResourceManager.GetObject("keyboard-left-arrow-button_icon-icons.com_72692", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Поиск локализованного ресурса типа System.Drawing.Bitmap.
+ ///
+ internal static System.Drawing.Bitmap keyboard_right_arrow_button_1_icon_icons_com_72690 {
+ get {
+ object obj = ResourceManager.GetObject("keyboard-right-arrow-button-1_icon-icons.com_72690", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Поиск локализованного ресурса типа System.Drawing.Bitmap.
+ ///
+ internal static System.Drawing.Bitmap up_arrow_icon_icons_com_73351 {
+ get {
+ object obj = ResourceManager.GetObject("up-arrow_icon-icons.com_73351", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+ }
+}
diff --git a/ContainerShip/ContainerShip/Properties/Resources.resx b/ContainerShip/ContainerShip/Properties/Resources.resx
new file mode 100644
index 0000000..68d93dd
--- /dev/null
+++ b/ContainerShip/ContainerShip/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\up-arrow_icon-icons.com_73351.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\angle-arrow-down_icon-icons.com_73683.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\keyboard-left-arrow-button_icon-icons.com_72692.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\keyboard-right-arrow-button-1_icon-icons.com_72690.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
\ No newline at end of file
diff --git a/ContainerShip/ContainerShip/Resources/angle-arrow-down_icon-icons.com_73683.png b/ContainerShip/ContainerShip/Resources/angle-arrow-down_icon-icons.com_73683.png
new file mode 100644
index 0000000..eeb9509
Binary files /dev/null and b/ContainerShip/ContainerShip/Resources/angle-arrow-down_icon-icons.com_73683.png differ
diff --git a/ContainerShip/ContainerShip/Resources/keyboard-left-arrow-button_icon-icons.com_72692.png b/ContainerShip/ContainerShip/Resources/keyboard-left-arrow-button_icon-icons.com_72692.png
new file mode 100644
index 0000000..3a3b899
Binary files /dev/null and b/ContainerShip/ContainerShip/Resources/keyboard-left-arrow-button_icon-icons.com_72692.png differ
diff --git a/ContainerShip/ContainerShip/Resources/keyboard-right-arrow-button-1_icon-icons.com_72690.png b/ContainerShip/ContainerShip/Resources/keyboard-right-arrow-button-1_icon-icons.com_72690.png
new file mode 100644
index 0000000..8e155de
Binary files /dev/null and b/ContainerShip/ContainerShip/Resources/keyboard-right-arrow-button-1_icon-icons.com_72690.png differ
diff --git a/ContainerShip/ContainerShip/Resources/up-arrow_icon-icons.com_73351.png b/ContainerShip/ContainerShip/Resources/up-arrow_icon-icons.com_73351.png
new file mode 100644
index 0000000..071031c
Binary files /dev/null and b/ContainerShip/ContainerShip/Resources/up-arrow_icon-icons.com_73351.png differ