diff --git a/ProjectSeaplane/ProjectSeaplane/DirectionType.cs b/ProjectSeaplane/ProjectSeaplane/DirectionType.cs new file mode 100644 index 0000000..7b8b3db --- /dev/null +++ b/ProjectSeaplane/ProjectSeaplane/DirectionType.cs @@ -0,0 +1,23 @@ +namespace ProjectSeaplane; +/// +/// Направление перемещения +/// +public enum DirectionType +{ + /// + /// Вверх + /// + Up = 1, + /// + /// Вниз + /// + Down = 2, + /// + /// Влево + /// + Left = 3, + /// + /// Вправо + /// + Right = 4, +} diff --git a/ProjectSeaplane/ProjectSeaplane/DrawingSeaplane.cs b/ProjectSeaplane/ProjectSeaplane/DrawingSeaplane.cs new file mode 100644 index 0000000..a1d6f4c --- /dev/null +++ b/ProjectSeaplane/ProjectSeaplane/DrawingSeaplane.cs @@ -0,0 +1,251 @@ +namespace ProjectSeaplane; +/// +/// Отрисовка и перемещение +/// +public class DrawingSeaplane +{ + /// + /// Класс-сущность + /// + public EntitySeaplane? EntitySeaplane { get; private set; } + public DrawingWindows Windows; + /// + /// Ширина окна + /// + private int? _pictureWidth; + + /// + /// Высота окна + /// + private int? _pictureHeight; + + /// + /// Левая координата прорисовки автомобиля + /// + private int? _startPosX; + + /// + /// Верхняя кооридната прорисовки автомобиля + /// + private int? _startPosY; + + /// + /// Ширина прорисовки автомобиля + /// + private readonly int _drawningSeaplaneWidth = 160; + + /// + /// Высота прорисовки автомобиля + /// + private readonly int _drawningSeaplaneHeight = 70; + + /// + /// Инициализация свойств + /// + /// Скорость + /// Вес + /// Основной цвет + /// Дополнительный цвет + /// Тип "шасси" (0 - поплавки, 1 - лодочный тип) + /// Признак наличия радара + public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool landingGear, bool radar) + { + EntitySeaplane = new EntitySeaplane(); + EntitySeaplane.Init(speed, weight, bodyColor, additionalColor, landingGear, radar); + _pictureWidth = null; + _pictureHeight = null; + _startPosX = null; + _startPosY = null; + Windows = new DrawingWindows(); + Windows.WinNum = 0; + } + + /// + /// Установка границ поля + /// + /// Ширина поля + /// Высота поля + /// true - границы заданы, false - проверка не пройдена, нельзя разместить объект в этих размерах + public bool SetPictureSize(int width, int height) + { + // TODO проверка, что объект "влезает" в размеры поля + // если влезает, сохраняем границы и корректируем позицию объекта, если она была уже установлена + + if (_drawningSeaplaneWidth < width && _drawningSeaplaneHeight < height) + { + _pictureWidth = width; + _pictureHeight = height; + if (_startPosX != null && _startPosY != null) + { + if (_startPosX + _drawningSeaplaneWidth > width) + { + _startPosX = width - (_drawningSeaplaneWidth + 1); + + } + if (_startPosY + _drawningSeaplaneWidth > height) + { + _startPosY = height - (_drawningSeaplaneHeight + 1); + } + } + return true; + } + return false; + } + /// + /// Установка позиции + /// + /// Координата X + /// Координата Y + public void SetPosition(int x, int y) + { + if (!_pictureHeight.HasValue || !_pictureWidth.HasValue) + { + return; + } + // TODO если при установке объекта в эти координаты, он будет "выходить" за границы формы + // то надо изменить координаты, чтобы он оставался в этих границах + _startPosX = x; + _startPosY = y; + + if (_startPosX < 0) + { + _startPosX = 0; + } + if (_startPosY < 0) + { + _startPosY = 0; + } + if (_startPosX + _drawningSeaplaneWidth > _pictureWidth) + { + _startPosX = _pictureWidth - _drawningSeaplaneWidth; + } + if (_startPosY - _drawningSeaplaneHeight > _pictureHeight) + { + _startPosY = _pictureHeight - _drawningSeaplaneHeight; + } + } + /// + /// Изменение направления перемещения + /// + /// Направление + /// true - перемещене выполнено, false - перемещение невозможно + public bool MoveTransport(DirectionType direction) + { + if (EntitySeaplane == null || !_startPosX.HasValue || !_startPosY.HasValue) + { + return false; + } + switch (direction) + { + //влево + case DirectionType.Left: + if (_startPosX.Value - EntitySeaplane.Step > 1) + { + _startPosX -= (int)EntitySeaplane.Step; + } + return true; + //вверх + case DirectionType.Up: + if (_startPosY.Value - EntitySeaplane.Step > 0) + { + _startPosY -= (int)EntitySeaplane.Step; + } + return true; + //вправо + case DirectionType.Right: + + if (_startPosX + (int)EntitySeaplane.Step < _pictureWidth - _drawningSeaplaneWidth) + { + _startPosX += (int)EntitySeaplane.Step; + } + return true; + //вниз + case DirectionType.Down: + + if (_startPosY + (int)EntitySeaplane.Step < _pictureHeight - _drawningSeaplaneHeight) + { + _startPosY += (int)EntitySeaplane.Step; + } + return true; + default: + return false; + } + } + /// + /// Прорисовка объекта + /// + /// + public void DrawTransport(Graphics g) + { + if (EntitySeaplane == null || !_startPosX.HasValue || !_startPosY.HasValue) + { + + return; + } + Pen penKraya = new(Color.Black, 2); + Brush additionalBrush = new SolidBrush(EntitySeaplane.AdditionalColor); + Pen pen = new(Color.Black); + //Начинаем рисовать + //Полигон для хвоста + Point point1 = new Point(_startPosX.Value, _startPosY.Value); + Point point2 = new Point(_startPosX.Value + 35, _startPosY.Value + 35); + Point point3 = new Point(_startPosX.Value, _startPosY.Value + 35); + Point point4 = new Point(_startPosX.Value, _startPosY.Value); + Point[] Hvost = + { + point1, point2 , point3 , point4 + }; + Point point5 = new Point(_startPosX.Value + 50, _startPosY.Value + 22); + Point point6 = new Point(_startPosX.Value + 45, _startPosY.Value + 30); + Point point7 = new Point(_startPosX.Value + 55, _startPosY.Value + 30); + Point point8 = new Point(_startPosX.Value + 50, _startPosY.Value + 22); + Point[] Radar = + { + point5, point6 , point7 , point8 + }; + //Кисти для основного цвета и дополнительного + Brush brBody = new SolidBrush(EntitySeaplane.BodyColor); + Brush brAdditional = new SolidBrush(EntitySeaplane.AdditionalColor); + Brush brWhity = new SolidBrush(Color.GhostWhite); + //Хвост + g.FillPolygon(brBody, Hvost); + //Тело + g.FillRectangle(brBody, _startPosX.Value + 30, _startPosY.Value + 30, 85, 25); + g.FillEllipse(brBody, _startPosX.Value + 45, _startPosY.Value + 30, 110, 24); + g.FillEllipse(brBody, _startPosX.Value - 5, _startPosY.Value + 30, 100, 24); + g.DrawEllipse(penKraya, _startPosX.Value, _startPosY.Value + 27, 17, 6); + g.FillEllipse(brAdditional, _startPosX.Value, _startPosY.Value + 27, 17, 6); + + //Крыло + g.FillEllipse(brAdditional, _startPosX.Value + 45, _startPosY.Value + 43, 50, 7); + //Поплавки + + if (EntitySeaplane.LandingGear) + { + g.FillEllipse(brAdditional, _startPosX.Value + 60, _startPosY.Value + 50, 20, 7); + g.DrawLine(penKraya, _startPosX.Value + 70, _startPosY.Value + 48, _startPosX.Value + 70, _startPosY.Value + 52); + } + else + { + g.FillEllipse(brAdditional, _startPosX.Value + 60, _startPosY.Value + 60, 70, 10); + g.FillEllipse(brAdditional, _startPosX.Value + 10, _startPosY.Value + 60, 20, 10); + g.DrawLine(penKraya, _startPosX.Value + 20, _startPosY.Value + 53, _startPosX.Value + 20, _startPosY.Value + 63); + g.DrawLine(penKraya, _startPosX.Value + 110, _startPosY.Value + 53, _startPosX.Value + 90, _startPosY.Value + 63); + g.DrawLine(penKraya, _startPosX.Value + 70, _startPosY.Value + 53, _startPosX.Value + 90, _startPosY.Value + 63); + } + + if (EntitySeaplane.Radar) + { + g.FillEllipse(brAdditional, _startPosX.Value + 30, _startPosY.Value + 12, 40, 15); + g.FillPolygon(brAdditional, Radar); + } + else + { + + } + //Пилоты + g.FillEllipse(brWhity, _startPosX.Value + 115, _startPosY.Value + 34, 20, 8); + Windows.DrawWindows(g, _startPosX.Value + 5, _startPosY.Value + 5); + } +} + diff --git a/ProjectSeaplane/ProjectSeaplane/DrawingWindows.cs b/ProjectSeaplane/ProjectSeaplane/DrawingWindows.cs new file mode 100644 index 0000000..8db9758 --- /dev/null +++ b/ProjectSeaplane/ProjectSeaplane/DrawingWindows.cs @@ -0,0 +1,77 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectSeaplane; + +public class DrawingWindows +{ + /// + /// Класс-сущность + /// + public EntitySeaplane? EntitySeaplane { get; private set; } + /// + /// Количество иллюминаторов + /// + private NumberOfWindows numberOfWindows; + public int WinNum + { + set + { + if (value == 10 || value < 15) + { + numberOfWindows = NumberOfWindows.TenWindows; + } + else if (value == 20 || (value >= 15 && value < 25)) + { + numberOfWindows = NumberOfWindows.TwentyWindows; + } + else if (value == 30 || (value >= 25 && value < 31)) + { + numberOfWindows = NumberOfWindows.ThirtyWindows; + } + } + } + /// + /// Прорисовка доп класса + /// + /// + public void DrawWindows(Graphics g, int _startPosX, int _startPosY) + { + + Brush brWhity = new SolidBrush(Color.GhostWhite); + + + switch (numberOfWindows) + { + case NumberOfWindows.TenWindows: + for (int i = 0; i < 60; i += 6) + { + g.FillEllipse(brWhity, _startPosX + 30 + i, _startPosY + 26, 4, 4); + } + break; + case NumberOfWindows.TwentyWindows: + for (int j = 0; j < 5; j += 4) + { + for (int i = 0; i < 60; i += 6) + { + g.FillEllipse(brWhity, _startPosX + 30 + i, _startPosY + 26 + j, 4, 4); + } + } + break; + case NumberOfWindows.ThirtyWindows: + for (int j = 0; j < 9; j += 4) + { + for (int i = 0; i < 60; i += 6) + { + g.FillEllipse(brWhity, _startPosX + 30 + i, _startPosY + 26 + j, 4, 4); + } + } + break; + + } + + } +} diff --git a/ProjectSeaplane/ProjectSeaplane/EntitySeaplane.cs b/ProjectSeaplane/ProjectSeaplane/EntitySeaplane.cs new file mode 100644 index 0000000..295d834 --- /dev/null +++ b/ProjectSeaplane/ProjectSeaplane/EntitySeaplane.cs @@ -0,0 +1,55 @@ +using static System.Windows.Forms.LinkLabel; + +namespace ProjectSeaplane; +/// +/// Класс-сущность Гидросамолета +/// +public class EntitySeaplane +{ + /// + /// Скорость + /// + public int Speed { get; private set; } + /// + /// Вес + /// + public double Weight { get; private set; } + /// + /// Основной цвет + /// + public Color BodyColor { get; private set; } + /// + /// Дополнительный (для опциональных частей) + /// + public Color AdditionalColor { get; private set; } + /// + /// Тип "шасси" (0 - лодочный, 1 - поплавковый) + /// + public bool LandingGear { get; private set; } + /// + /// Признак наличия радара + /// + public bool Radar { get; private set; } + /// + /// Расстояние шага передвижения + /// + public double Step => Speed * 100 / Weight; + /// + /// + /// + /// Скорость + /// Вес + /// Основной цвет + /// Дополнительный цвет + /// Тип "шасси" + /// При + public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool landingGear, bool radar) + { + Speed = speed; + Weight = weight; + BodyColor = bodyColor; + AdditionalColor = additionalColor; + LandingGear = landingGear; + Radar = radar; + } +} \ No newline at end of file diff --git a/ProjectSeaplane/ProjectSeaplane/Form1.Designer.cs b/ProjectSeaplane/ProjectSeaplane/Form1.Designer.cs deleted file mode 100644 index 0f93923..0000000 --- a/ProjectSeaplane/ProjectSeaplane/Form1.Designer.cs +++ /dev/null @@ -1,39 +0,0 @@ -namespace ProjectSeaplane -{ - 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 - } -} diff --git a/ProjectSeaplane/ProjectSeaplane/Form1.cs b/ProjectSeaplane/ProjectSeaplane/Form1.cs deleted file mode 100644 index c3840a1..0000000 --- a/ProjectSeaplane/ProjectSeaplane/Form1.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace ProjectSeaplane -{ - public partial class Form1 : Form - { - public Form1() - { - InitializeComponent(); - } - } -} diff --git a/ProjectSeaplane/ProjectSeaplane/FormSeaplane.Designer.cs b/ProjectSeaplane/ProjectSeaplane/FormSeaplane.Designer.cs new file mode 100644 index 0000000..cb3e1bc --- /dev/null +++ b/ProjectSeaplane/ProjectSeaplane/FormSeaplane.Designer.cs @@ -0,0 +1,154 @@ +namespace ProjectSeaplane +{ + partial class FormSeaplane + { + /// + /// 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() + { + pictureBoxSeaplane = new PictureBox(); + buttonCreate = new Button(); + buttonLeft = new Button(); + buttonDown = new Button(); + buttonUp = new Button(); + buttonRight = new Button(); + numericUpDownNumberOfWindows = new NumericUpDown(); + ((System.ComponentModel.ISupportInitialize)pictureBoxSeaplane).BeginInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDownNumberOfWindows).BeginInit(); + SuspendLayout(); + // + // pictureBoxSeaplane + // + pictureBoxSeaplane.Dock = DockStyle.Fill; + pictureBoxSeaplane.Location = new Point(0, 0); + pictureBoxSeaplane.Name = "pictureBoxSeaplane"; + pictureBoxSeaplane.Size = new Size(590, 379); + pictureBoxSeaplane.TabIndex = 0; + pictureBoxSeaplane.TabStop = false; + // + // buttonCreate + // + buttonCreate.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; + buttonCreate.Location = new Point(12, 349); + buttonCreate.Name = "buttonCreate"; + buttonCreate.Size = new Size(75, 23); + buttonCreate.TabIndex = 1; + buttonCreate.Text = "Создать"; + buttonCreate.UseVisualStyleBackColor = true; + buttonCreate.Click += ButtonCreate_Click; + // + // buttonLeft + // + buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + buttonLeft.BackColor = Color.Snow; + buttonLeft.BackgroundImage = Properties.Resources.arrow11; + buttonLeft.BackgroundImageLayout = ImageLayout.Stretch; + buttonLeft.Location = new Point(465, 337); + buttonLeft.Name = "buttonLeft"; + buttonLeft.Size = new Size(35, 35); + buttonLeft.TabIndex = 2; + buttonLeft.UseVisualStyleBackColor = false; + buttonLeft.Click += ButtonMove_Click; + // + // buttonDown + // + buttonDown.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + buttonDown.BackColor = Color.Snow; + buttonDown.BackgroundImage = Properties.Resources.arrow4__1_; + buttonDown.BackgroundImageLayout = ImageLayout.Stretch; + buttonDown.Location = new Point(506, 337); + buttonDown.Name = "buttonDown"; + buttonDown.Size = new Size(35, 35); + buttonDown.TabIndex = 4; + buttonDown.UseVisualStyleBackColor = false; + buttonDown.Click += ButtonMove_Click; + // + // buttonUp + // + buttonUp.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + buttonUp.BackColor = Color.Snow; + buttonUp.BackgroundImage = Properties.Resources.arrow2__1_; + buttonUp.BackgroundImageLayout = ImageLayout.Stretch; + buttonUp.Location = new Point(506, 297); + buttonUp.Name = "buttonUp"; + buttonUp.Size = new Size(35, 35); + buttonUp.TabIndex = 5; + buttonUp.UseVisualStyleBackColor = false; + buttonUp.Click += ButtonMove_Click; + // + // buttonRight + // + buttonRight.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + buttonRight.BackColor = Color.Snow; + buttonRight.BackgroundImage = Properties.Resources.arrow3__1_; + buttonRight.BackgroundImageLayout = ImageLayout.Stretch; + buttonRight.Location = new Point(547, 337); + buttonRight.Name = "buttonRight"; + buttonRight.Size = new Size(35, 35); + buttonRight.TabIndex = 7; + buttonRight.UseVisualStyleBackColor = false; + buttonRight.Click += ButtonMove_Click; + // + // numericUpDownNumberOfWindows + // + numericUpDownNumberOfWindows.Increment = new decimal(new int[] { 10, 0, 0, 0 }); + numericUpDownNumberOfWindows.Location = new Point(93, 349); + numericUpDownNumberOfWindows.Maximum = new decimal(new int[] { 30, 0, 0, 0 }); + numericUpDownNumberOfWindows.Minimum = new decimal(new int[] { 10, 0, 0, 0 }); + numericUpDownNumberOfWindows.Name = "numericUpDownNumberOfWindows"; + numericUpDownNumberOfWindows.Size = new Size(47, 23); + numericUpDownNumberOfWindows.TabIndex = 8; + numericUpDownNumberOfWindows.Value = new decimal(new int[] { 10, 0, 0, 0 }); + // + // FormSeaplane + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(590, 379); + Controls.Add(numericUpDownNumberOfWindows); + Controls.Add(buttonRight); + Controls.Add(buttonUp); + Controls.Add(buttonDown); + Controls.Add(buttonLeft); + Controls.Add(buttonCreate); + Controls.Add(pictureBoxSeaplane); + Name = "FormSeaplane"; + Text = "Гидросамолет"; + ((System.ComponentModel.ISupportInitialize)pictureBoxSeaplane).EndInit(); + ((System.ComponentModel.ISupportInitialize)numericUpDownNumberOfWindows).EndInit(); + ResumeLayout(false); + } + + #endregion + + private PictureBox pictureBoxSeaplane; + private Button buttonCreate; + private Button buttonLeft; + private Button buttonDown; + private Button buttonUp; + private Button buttonRight; + private NumericUpDown numericUpDownNumberOfWindows; + } +} \ No newline at end of file diff --git a/ProjectSeaplane/ProjectSeaplane/FormSeaplane.cs b/ProjectSeaplane/ProjectSeaplane/FormSeaplane.cs new file mode 100644 index 0000000..f26d10c --- /dev/null +++ b/ProjectSeaplane/ProjectSeaplane/FormSeaplane.cs @@ -0,0 +1,88 @@ +namespace ProjectSeaplane +/// +/// Форма работы с объектом "Гидросамолет" +/// +{ + public partial class FormSeaplane : Form + { + /// + /// Конструктор формы + /// + public FormSeaplane() + { + InitializeComponent(); + } + /// + /// Поле-объект для прорисовки объекта + /// + private DrawingSeaplane? _drawingSeaplane; + /// + /// Метод прорисовки самолета + /// + private void Draw() + { + if (_drawingSeaplane == null) + { + return; + } + + Bitmap bmp = new(pictureBoxSeaplane.Width, pictureBoxSeaplane.Height); + Graphics gr = Graphics.FromImage(bmp); + _drawingSeaplane.DrawTransport(gr); + pictureBoxSeaplane.Image = bmp; + } + /// + /// Обработка нажатия кнопки "Создать" + /// + /// + /// + private void ButtonCreate_Click(object sender, EventArgs e) + { + Random random = new(); + _drawingSeaplane = new DrawingSeaplane(); + _drawingSeaplane.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))); + _drawingSeaplane.SetPictureSize(pictureBoxSeaplane.Width, pictureBoxSeaplane.Height); + _drawingSeaplane.SetPosition(random.Next(10, 100), random.Next(10, 100)); + _drawingSeaplane.Windows.WinNum = (int)numericUpDownNumberOfWindows.Value; + Draw(); + } + /// + /// Перемещение объекта по форме (нажатие кнопок навигации) + /// + /// + /// + private void ButtonMove_Click(object sender, EventArgs e) + { + if (_drawingSeaplane == null) + { + return; + } + + string name = ((Button)sender)?.Name ?? string.Empty; + bool result = false; + switch (name) + { + case "buttonUp": + result = _drawingSeaplane.MoveTransport(DirectionType.Up); + break; + case "buttonDown": + result = _drawingSeaplane.MoveTransport(DirectionType.Down); + break; + case "buttonLeft": + result = _drawingSeaplane.MoveTransport(DirectionType.Left); + break; + case "buttonRight": + result = _drawingSeaplane.MoveTransport(DirectionType.Right); + break; + } + + if (result) + { + Draw(); + } + } + } +} \ No newline at end of file diff --git a/ProjectSeaplane/ProjectSeaplane/FormSeaplane.resx b/ProjectSeaplane/ProjectSeaplane/FormSeaplane.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/ProjectSeaplane/ProjectSeaplane/FormSeaplane.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + \ No newline at end of file diff --git a/ProjectSeaplane/ProjectSeaplane/NumberOfWindows.cs b/ProjectSeaplane/ProjectSeaplane/NumberOfWindows.cs new file mode 100644 index 0000000..d6bb463 --- /dev/null +++ b/ProjectSeaplane/ProjectSeaplane/NumberOfWindows.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectSeaplane; +/// +/// Количество иллюминаторов +/// +public enum NumberOfWindows +{ + /// + /// 10 иллюминаторов + /// + TenWindows, + /// + /// 20 иллюминаторов + /// + TwentyWindows, + /// + /// 30 иллюминаторов + /// + ThirtyWindows +} diff --git a/ProjectSeaplane/ProjectSeaplane/Program.cs b/ProjectSeaplane/ProjectSeaplane/Program.cs index bcf84b2..4e58da8 100644 --- a/ProjectSeaplane/ProjectSeaplane/Program.cs +++ b/ProjectSeaplane/ProjectSeaplane/Program.cs @@ -11,7 +11,7 @@ namespace ProjectSeaplane // 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 FormSeaplane()); } } } \ No newline at end of file diff --git a/ProjectSeaplane/ProjectSeaplane/ProjectSeaplane.csproj b/ProjectSeaplane/ProjectSeaplane/ProjectSeaplane.csproj index 663fdb8..8bf3ed6 100644 --- a/ProjectSeaplane/ProjectSeaplane/ProjectSeaplane.csproj +++ b/ProjectSeaplane/ProjectSeaplane/ProjectSeaplane.csproj @@ -2,10 +2,25 @@ WinExe - net8.0-windows + net7.0-windows7.0 enable true enable + + + True + True + Resources.resx + + + + + + ResXFileCodeGenerator + Resources.Designer.cs + + + \ No newline at end of file diff --git a/ProjectSeaplane/ProjectSeaplane/Properties/Resources.Designer.cs b/ProjectSeaplane/ProjectSeaplane/Properties/Resources.Designer.cs new file mode 100644 index 0000000..cac7f14 --- /dev/null +++ b/ProjectSeaplane/ProjectSeaplane/Properties/Resources.Designer.cs @@ -0,0 +1,103 @@ +//------------------------------------------------------------------------------ +// +// Этот код создан программой. +// Исполняемая версия:4.0.30319.42000 +// +// Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае +// повторной генерации кода. +// +//------------------------------------------------------------------------------ + +namespace ProjectSeaplane.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("ProjectSeaplane.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 arrow11 { + get { + object obj = ResourceManager.GetObject("arrow11", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap arrow2__1_ { + get { + object obj = ResourceManager.GetObject("arrow2 (1)", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap arrow3__1_ { + get { + object obj = ResourceManager.GetObject("arrow3 (1)", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap arrow4__1_ { + get { + object obj = ResourceManager.GetObject("arrow4 (1)", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + } +} diff --git a/ProjectSeaplane/ProjectSeaplane/Properties/Resources.resx b/ProjectSeaplane/ProjectSeaplane/Properties/Resources.resx new file mode 100644 index 0000000..b76225a --- /dev/null +++ b/ProjectSeaplane/ProjectSeaplane/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\arrow2 (1).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\arrow3 (1).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\arrow4 (1).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\arrow11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + \ No newline at end of file diff --git a/ProjectSeaplane/ProjectSeaplane/Resources/arrow11.png b/ProjectSeaplane/ProjectSeaplane/Resources/arrow11.png new file mode 100644 index 0000000..b1c0c23 Binary files /dev/null and b/ProjectSeaplane/ProjectSeaplane/Resources/arrow11.png differ diff --git a/ProjectSeaplane/ProjectSeaplane/Resources/arrow2 (1).png b/ProjectSeaplane/ProjectSeaplane/Resources/arrow2 (1).png new file mode 100644 index 0000000..5c3f23e Binary files /dev/null and b/ProjectSeaplane/ProjectSeaplane/Resources/arrow2 (1).png differ diff --git a/ProjectSeaplane/ProjectSeaplane/Resources/arrow3 (1).png b/ProjectSeaplane/ProjectSeaplane/Resources/arrow3 (1).png new file mode 100644 index 0000000..a70576b Binary files /dev/null and b/ProjectSeaplane/ProjectSeaplane/Resources/arrow3 (1).png differ diff --git a/ProjectSeaplane/ProjectSeaplane/Resources/arrow4 (1).png b/ProjectSeaplane/ProjectSeaplane/Resources/arrow4 (1).png new file mode 100644 index 0000000..85239e0 Binary files /dev/null and b/ProjectSeaplane/ProjectSeaplane/Resources/arrow4 (1).png differ