Merge pull request 'PIbd-22 Chubykina P.P. LabWork_01' (#1) from LabWork_01 into main

Reviewed-on: http://student.git.athene.tech/chubykina_polina/PIbd-22_Chubykina_P.P._Sailboat_Base/pulls/1

Sailboat/Sailboat/Direction.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Sailboat
+{
+    public enum DirectionType
+    {
+        /// <summary>
+        /// Вверх
+        /// </summary>
+        Up = 1,
+        /// <summary>
+        /// Вниз
+        /// </summary>
+        Down = 2,
+        /// <summary>
+        /// Влево
+        /// </summary>
+        Left = 3,
+        /// <summary>
+        /// Вправо
+        /// </summary>
+        Right = 4
+
+    }
+}

Sailboat/Sailboat/DrawingSailboat.cs

@@ -0,0 +1,142 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Sailboat
+{
+    public class DrawingSailboat
+    {
+        public EntitySailboat? EntitySailboat { get; private set; }
+        private int _pictureWidth;
+        private int _pictureHeight;
+        private int _startPosX;
+        private int _startPosY;
+        private readonly int _boatWidth = 160;
+        private readonly int _boatHeight = 160;
+        public bool Init(int speed, double weight, Color bodyColor, Color additionalColor, bool hull, bool sail, int width, int height)
+        {
+            if (width < _boatWidth || height < _boatHeight)
+            {
+                return false;
+            }
+            _pictureWidth = width;
+            _pictureHeight = height;
+            EntitySailboat = new EntitySailboat();
+            EntitySailboat.Init(speed, weight, bodyColor, additionalColor, hull, sail);
+            return true;
+        }
+        public void SetPosition(int x, int y)
+        {
+            if (x < 0 || x + _boatWidth > _pictureWidth)
+            {
+                x = 0;
+            }
+            if (y < 0 || y + _boatHeight > _pictureHeight)
+            {
+                y = 0;
+            }
+            _startPosX = x;
+            _startPosY = y;
+        }
+        public void MoveTransport(DirectionType direction)
+        {
+            if (EntitySailboat == null)
+            {
+                return;
+            }
+            switch (direction)
+            {
+                case DirectionType.Left:
+                    if (_startPosX - EntitySailboat.Step > 0)
+                    {
+                        _startPosX -= (int)EntitySailboat.Step;
+                    }
+                    break;
+                case DirectionType.Up:
+                    if (_startPosY - EntitySailboat.Step > 0)
+                    {
+                        _startPosY -= (int)EntitySailboat.Step;
+                    }
+                    break;
+                case DirectionType.Right:
+                    if (_startPosX + EntitySailboat.Step + _boatWidth < _pictureWidth)
+                    {
+                        _startPosX += (int)EntitySailboat.Step;
+                    }
+                    break;
+                case DirectionType.Down:
+                    if (_startPosY + EntitySailboat.Step + _boatHeight < _pictureHeight)
+                    {
+                        _startPosY += (int)EntitySailboat.Step;
+                    }
+                    break;
+            }
+        }
+        public void DrawTransport(Graphics g)
+        {
+            if (EntitySailboat == null)
+            {
+                return;
+            }
+            Pen pen = new(Color.Black, 4);
+            Brush additionalBrush = new
+            SolidBrush(EntitySailboat.AdditionalColor);
+         
+            //усиленный корпус парусника
+            if (EntitySailboat.Hull)
+            {
+                Point[] hullCooler = new Point[]
+                {
+                    new Point(_startPosX, _startPosY + 80),
+                    new Point(_startPosX + 120, _startPosY + 80),
+                    new Point(_startPosX + 160, _startPosY + 120),
+                    new Point(_startPosX + 120, _startPosY + 160),
+                    new Point(_startPosX, _startPosY + 160)
+                };
+                g.FillPolygon(additionalBrush, hullCooler);
+                g.DrawPolygon(pen, hullCooler);
+            }
+            
+
+            //основной корпус парусника 
+            Brush Brush = new
+            SolidBrush(EntitySailboat.BodyColor);
+
+            Point[] hull = new Point[]
+            {
+                new Point(_startPosX + 10, _startPosY + 90),
+                new Point(_startPosX + 110, _startPosY + 90),
+                new Point(_startPosX + 140, _startPosY + 120),
+                new Point(_startPosX + 110, _startPosY + 150),
+                new Point(_startPosX + 10, _startPosY + 150)
+            };
+            g.FillPolygon(Brush, hull);
+            g.DrawPolygon(pen, hull);
+
+            Brush addBrush = new
+            SolidBrush(Color.Green);
+
+            g.FillEllipse(addBrush, _startPosX + 20, _startPosY + 100, 90, 40);
+            g.DrawEllipse(pen, _startPosX + 20, _startPosY + 100, 90, 40);
+
+            //парус
+            if (EntitySailboat.Sail)
+            {
+                Brush sailBrush = new
+                SolidBrush(EntitySailboat.AdditionalColor);
+
+                Point[] sail = new Point[]
+                {
+                    new Point(_startPosX + 65, _startPosY),
+                    new Point(_startPosX + 130, _startPosY + 120),
+                    new Point(_startPosX + 15, _startPosY + 120)
+                };
+                g.FillPolygon(sailBrush, sail);
+                g.DrawPolygon(pen, sail);
+                g.DrawLine(pen, new Point(_startPosX + 65, _startPosY + 120), new Point(_startPosX + 65, _startPosY));
+            }
+        }
+    }
+}

Sailboat/Sailboat/EntitySailboat.cs

@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Sailboat
+{
+    public class EntitySailboat
+    {
+        /// <summary>
+        /// Скорость
+        /// </summary>
+        public int Speed { get; private set; }
+        /// <summary>
+        /// Вес
+        /// </summary>
+        public double Weight { get; private set; }
+        /// <summary>
+        /// Основной цвет
+        /// </summary>
+        public Color BodyColor { get; private set; }
+        /// <summary>
+        /// Дополнительный цвет (для опциональных элементов)
+        /// </summary>
+        public Color AdditionalColor { get; private set; }
+        /// <summary>
+        /// Признак (опция) наличия усиленного корпуса
+        /// </summary>
+        public bool Hull { get; private set; }
+        /// <summary>
+        /// Признак (опция) наличия паруса
+        /// </summary>
+        public bool Sail { get; private set; }
+        /// <summary>
+        /// Шаг перемещения автомобиля
+        /// </summary>
+        public double Step => (double)Speed * 100 / Weight;
+        /// <summary>
+        /// Инициализация полей объекта-класса спортивного автомобиля
+        /// </summary>
+        /// <param name="speed">Скорость</param>
+        /// <param name="weight">Вес автомобиля</param>
+        /// <param name="bodyColor">Основной цвет</param>
+        /// <param name="additionalColor">Дополнительный цвет</param>
+        /// <param name="hull">Признак наличия усиленного корпуса</param>
+        /// <param name="sail">Признак наличия паруса</param>
+        public void Init(int speed, double weight, Color bodyColor, Color
+        additionalColor, bool hull, bool sail)
+        {
+            Speed = speed;
+            Weight = weight;
+            BodyColor = bodyColor;
+            AdditionalColor = additionalColor;
+            Hull = hull;
+            Sail = sail;
+        }
+    }
+}

Sailboat/Sailboat/Form1.Designer.cs

@@ -1,39 +0,0 @@
-namespace Sailboat
-{
-    partial class Form1
-    {
-        /// <summary>
-        ///  Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        ///  Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        ///  Required method for Designer support - do not modify
-        ///  the contents of this method with the code editor.
-        /// </summary>
-        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
-    }
-}

Sailboat/Sailboat/Form1.cs

@@ -1,10 +0,0 @@
-namespace Sailboat
-{
-    public partial class Form1 : Form
-    {
-        public Form1()
-        {
-            InitializeComponent();
-        }
-    }
-}

Sailboat/Sailboat/FormSailboat.Designer.cs

@@ -0,0 +1,139 @@
+namespace Sailboat
+{
+    partial class FormSailboat
+    {
+        /// <summary>
+        ///  Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        ///  Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        ///  Required method for Designer support - do not modify
+        ///  the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormSailboat));
+            this.pictureBoxSailboat = new System.Windows.Forms.PictureBox();
+            this.buttonCreate = new System.Windows.Forms.Button();
+            this.buttonLeft = new System.Windows.Forms.Button();
+            this.buttonUp = new System.Windows.Forms.Button();
+            this.buttonRight = new System.Windows.Forms.Button();
+            this.buttonDown = new System.Windows.Forms.Button();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxSailboat)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // pictureBoxSailboat
+            // 
+            this.pictureBoxSailboat.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pictureBoxSailboat.Location = new System.Drawing.Point(0, 0);
+            this.pictureBoxSailboat.Name = "pictureBoxSailboat";
+            this.pictureBoxSailboat.Size = new System.Drawing.Size(882, 453);
+            this.pictureBoxSailboat.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
+            this.pictureBoxSailboat.TabIndex = 0;
+            this.pictureBoxSailboat.TabStop = false;
+            // 
+            // buttonCreate
+            // 
+            this.buttonCreate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.buttonCreate.Location = new System.Drawing.Point(12, 395);
+            this.buttonCreate.Name = "buttonCreate";
+            this.buttonCreate.Size = new System.Drawing.Size(127, 46);
+            this.buttonCreate.TabIndex = 1;
+            this.buttonCreate.Text = "Создать";
+            this.buttonCreate.UseVisualStyleBackColor = true;
+            this.buttonCreate.Click += new System.EventHandler(this.buttonCreate_Click);
+            // 
+            // buttonLeft
+            // 
+            this.buttonLeft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonLeft.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("buttonLeft.BackgroundImage")));
+            this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
+            this.buttonLeft.Location = new System.Drawing.Point(710, 403);
+            this.buttonLeft.Name = "buttonLeft";
+            this.buttonLeft.Size = new System.Drawing.Size(30, 30);
+            this.buttonLeft.TabIndex = 2;
+            this.buttonLeft.UseVisualStyleBackColor = true;
+            this.buttonLeft.Click += new System.EventHandler(this.buttonMove_Click);
+            // 
+            // buttonUp
+            // 
+            this.buttonUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonUp.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("buttonUp.BackgroundImage")));
+            this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
+            this.buttonUp.Location = new System.Drawing.Point(759, 358);
+            this.buttonUp.Name = "buttonUp";
+            this.buttonUp.Size = new System.Drawing.Size(30, 30);
+            this.buttonUp.TabIndex = 3;
+            this.buttonUp.UseVisualStyleBackColor = true;
+            this.buttonUp.Click += new System.EventHandler(this.buttonMove_Click);
+            // 
+            // buttonRight
+            // 
+            this.buttonRight.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonRight.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("buttonRight.BackgroundImage")));
+            this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
+            this.buttonRight.Location = new System.Drawing.Point(809, 403);
+            this.buttonRight.Name = "buttonRight";
+            this.buttonRight.Size = new System.Drawing.Size(30, 30);
+            this.buttonRight.TabIndex = 4;
+            this.buttonRight.UseVisualStyleBackColor = true;
+            this.buttonRight.Click += new System.EventHandler(this.buttonMove_Click);
+            // 
+            // buttonDown
+            // 
+            this.buttonDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.buttonDown.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("buttonDown.BackgroundImage")));
+            this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
+            this.buttonDown.Location = new System.Drawing.Point(759, 403);
+            this.buttonDown.Name = "buttonDown";
+            this.buttonDown.Size = new System.Drawing.Size(30, 30);
+            this.buttonDown.TabIndex = 5;
+            this.buttonDown.UseVisualStyleBackColor = true;
+            this.buttonDown.Click += new System.EventHandler(this.buttonMove_Click);
+            // 
+            // FormSailboat
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(882, 453);
+            this.Controls.Add(this.buttonDown);
+            this.Controls.Add(this.buttonRight);
+            this.Controls.Add(this.buttonUp);
+            this.Controls.Add(this.buttonLeft);
+            this.Controls.Add(this.buttonCreate);
+            this.Controls.Add(this.pictureBoxSailboat);
+            this.Name = "FormSailboat";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            this.Text = "Парусник";
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxSailboat)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private PictureBox pictureBoxSailboat;
+        private Button buttonCreate;
+        private Button buttonLeft;
+        private Button buttonUp;
+        private Button buttonRight;
+        private Button buttonDown;
+    }
+}

Sailboat/Sailboat/FormSailboat.cs

@@ -0,0 +1,58 @@
+namespace Sailboat
+{
+    public partial class FormSailboat : Form
+    {
+        private DrawingSailboat? _drawingSailboat;
+        public FormSailboat()
+        {
+            InitializeComponent();
+        }
+        private void Draw()
+        {
+            if (_drawingSailboat == null)
+            {
+                return;
+            }
+            Bitmap bmp = new(pictureBoxSailboat.Width,
+            pictureBoxSailboat.Height);
+            Graphics gr = Graphics.FromImage(bmp);
+            _drawingSailboat.DrawTransport(gr);
+            pictureBoxSailboat.Image = bmp;
+        }
+        private void buttonCreate_Click(object sender, EventArgs e)
+        {
+            Random random = new();
+            _drawingSailboat = new DrawingSailboat();
+            _drawingSailboat.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)), pictureBoxSailboat.Width, pictureBoxSailboat.Height);
+            _drawingSailboat.SetPosition(random.Next(10, 100), random.Next(10, 100));
+            Draw();
+        }
+        private void buttonMove_Click(object sender, EventArgs e)
+        {
+            if (_drawingSailboat == null)
+            {
+                return;
+            }
+            string name = ((Button)sender)?.Name ?? string.Empty;
+            switch (name)
+            {
+                case "buttonUp":
+                    _drawingSailboat.MoveTransport(DirectionType.Up);
+                    break;
+                case "buttonDown":
+                    _drawingSailboat.MoveTransport(DirectionType.Down);
+                    break;
+                case "buttonLeft":
+                    _drawingSailboat.MoveTransport(DirectionType.Left);
+                    break;
+                case "buttonRight":
+                    _drawingSailboat.MoveTransport(DirectionType.Right);
+                    break;
+            }
+            Draw();
+
+        }
+    }
+} 

Sailboat/Sailboat/Program.cs

@@ -11,7 +11,7 @@ namespace Sailboat
             // 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 FormSailboat());
         }
     }
 }

Sailboat/Sailboat/Properties/Resources.Designer.cs

@@ -0,0 +1,63 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     Этот код создан программой.
+//     Исполняемая версия:4.0.30319.42000
+//
+//     Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае
+//     повторной генерации кода.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Sailboat.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   Класс ресурса со строгой типизацией для поиска локализованных строк и т.д.
+    /// </summary>
+    // Этот класс создан автоматически классом 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() {
+        }
+        
+        /// <summary>
+        ///   Возвращает кэшированный экземпляр ResourceManager, использованный этим классом.
+        /// </summary>
+        [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("Sailboat.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Перезаписывает свойство CurrentUICulture текущего потока для всех
+        ///   обращений к ресурсу с помощью этого класса ресурса со строгой типизацией.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+    }
+}

Sailboat/Sailboat/Sailboat.csproj

@@ -8,4 +8,19 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
 </Project>