From aa6f5724925ac59776cfe2899edb728fe39cab10 Mon Sep 17 00:00:00 2001 From: Nikita Date: Tue, 11 Feb 2025 21:06:48 +0400 Subject: [PATCH 1/3] =?UTF-8?q?=D0=BB=D0=B0=D0=B1=20=D1=80=D0=B0=D0=B1?= =?UTF-8?q?=D0=BE=D1=82=D0=B0=201?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectCatamaran/DirectionType.cs | 27 +++ .../ProjectCatamaran/DrawningCatamaran.cs | 180 ++++++++++++++++++ .../ProjectCatamaran/EntityCatamaran.cs | 53 ++++++ .../ProjectCatamaran/Form1.Designer.cs | 39 ---- ProjectCatamaran/ProjectCatamaran/Form1.cs | 10 - .../FormCatamaran.Designer.cs | 134 +++++++++++++ .../ProjectCatamaran/FormCatamaran.cs | 77 ++++++++ .../ProjectCatamaran/FormCatamaran.resx | 120 ++++++++++++ ProjectCatamaran/ProjectCatamaran/Program.cs | 2 +- .../ProjectCatamaran/ProjectCatamaran.csproj | 15 ++ .../Properties/Resources.Designer.cs | 103 ++++++++++ .../Properties/Resources.resx | 133 +++++++++++++ .../ProjectCatamaran/Resources/down.jpg | Bin 0 -> 11981 bytes .../fdcc84704da3ed14a83779fbf91e00fb.jpg | Bin 0 -> 5679 bytes .../ProjectCatamaran/Resources/left.jpg | Bin 0 -> 11842 bytes .../ProjectCatamaran/Resources/right.jpg | Bin 0 -> 11815 bytes 16 files changed, 843 insertions(+), 50 deletions(-) create mode 100644 ProjectCatamaran/ProjectCatamaran/DirectionType.cs create mode 100644 ProjectCatamaran/ProjectCatamaran/DrawningCatamaran.cs create mode 100644 ProjectCatamaran/ProjectCatamaran/EntityCatamaran.cs delete mode 100644 ProjectCatamaran/ProjectCatamaran/Form1.Designer.cs delete mode 100644 ProjectCatamaran/ProjectCatamaran/Form1.cs create mode 100644 ProjectCatamaran/ProjectCatamaran/FormCatamaran.Designer.cs create mode 100644 ProjectCatamaran/ProjectCatamaran/FormCatamaran.cs create mode 100644 ProjectCatamaran/ProjectCatamaran/FormCatamaran.resx create mode 100644 ProjectCatamaran/ProjectCatamaran/Properties/Resources.Designer.cs create mode 100644 ProjectCatamaran/ProjectCatamaran/Properties/Resources.resx create mode 100644 ProjectCatamaran/ProjectCatamaran/Resources/down.jpg create mode 100644 ProjectCatamaran/ProjectCatamaran/Resources/fdcc84704da3ed14a83779fbf91e00fb.jpg create mode 100644 ProjectCatamaran/ProjectCatamaran/Resources/left.jpg create mode 100644 ProjectCatamaran/ProjectCatamaran/Resources/right.jpg diff --git a/ProjectCatamaran/ProjectCatamaran/DirectionType.cs b/ProjectCatamaran/ProjectCatamaran/DirectionType.cs new file mode 100644 index 0000000..18ae55c --- /dev/null +++ b/ProjectCatamaran/ProjectCatamaran/DirectionType.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectCatamaran; + +public enum DirectionType +{ + /// + /// Вверх + /// + Up = 1, + /// + /// Вниз + /// + Down = 2, + /// + /// Влево + /// + Left = 3, + /// + /// Вправо + /// + Right = 4 +} \ No newline at end of file diff --git a/ProjectCatamaran/ProjectCatamaran/DrawningCatamaran.cs b/ProjectCatamaran/ProjectCatamaran/DrawningCatamaran.cs new file mode 100644 index 0000000..6266ca6 --- /dev/null +++ b/ProjectCatamaran/ProjectCatamaran/DrawningCatamaran.cs @@ -0,0 +1,180 @@ +using ProjectCatamaran; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectCatamaran; +/// +/// класс отвечающиай за перемещение и отрисовку +/// +public class DrawningCatamaran +{ + /// + /// класс-сущность + /// + public EntityCatamaran? EntityCatamaran { get; private set; } + /// + /// ширина окна + /// + private int? _pictureWidth; + /// + /// высота окна + /// + private int? _pictureHeight; + /// + /// Левая координата прорисовки автопоезда + /// + private int? _startPosX; + /// + /// Верхняя координата прорисовки автопоезда + /// + private int? _startPosY; + /// + /// Ширина прорисовки катамарана + /// + private readonly int _drawningCatamaranWidth = 65; + /// + /// Высота прорисовки катамарана + /// + private readonly int _drawningCatamaranHeight = 40; + /// + /// Инициализация полей обьекта-класса спортивного автомобиля + /// + /// Скорость + /// Вес катера + /// Основной цвет + /// Дополнительный цвет(для опциональных элементов) + /// Признак (опция) наличие плавников + /// Признак (опция) наличие парус + public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool floats, bool brush) + { + EntityCatamaran = new EntityCatamaran(); + EntityCatamaran.Init(speed, weight, bodyColor, additionalColor, floats, brush); + + _pictureWidth = null; + _pictureHeight = null; + _startPosX = null; + _startPosY = null; + } + /// + /// установка границ поля + /// + /// ширина + /// высота + /// + public bool SetPictureSize(int width, int height) + { + if (_drawningCatamaranHeight < height && _drawningCatamaranWidth < width) + { + _pictureHeight = height; + _pictureWidth = width; + return true; + } + return false; + } + /// + /// установка позиции + /// + /// координата x + /// координата y + public void SetPosition(int x, int y) + { + if (!_pictureHeight.HasValue || !_pictureWidth.HasValue) + { + return; + } + if (x > _pictureWidth - _drawningCatamaranWidth || x < 0) + _startPosX = x < 0 ? 0 : _pictureWidth - _drawningCatamaranWidth; + else + _startPosX = x; + if (y > _pictureHeight - _drawningCatamaranHeight || y < 0) + _startPosY = y < 0 ? 0 : _pictureHeight - _drawningCatamaranHeight; + else + _startPosY = y; + } + /// + /// изменение направления перемещения + /// + /// направление + /// true - перемещение выполнено , false - перемещение невозможно + public bool MoveTransport(DirectionType direction) + { + if (EntityCatamaran == null || !_startPosX.HasValue || !_startPosY.HasValue) + { + return false; + } + switch (direction) + { + case DirectionType.Left: + if (_startPosX.Value - EntityCatamaran.Step > 0) + { + _startPosX -= (int)EntityCatamaran.Step; + } + return true; + case DirectionType.Up: + if (_startPosY.Value - EntityCatamaran.Step > 0) + { + _startPosY -= (int)EntityCatamaran.Step; + } + return true; + case DirectionType.Right: + if (_startPosX.Value + (int)EntityCatamaran.Step + _drawningCatamaranWidth <= _pictureWidth) + { + _startPosX += (int)EntityCatamaran.Step; + } + return true; + case DirectionType.Down: + if (_startPosY.Value + (int)EntityCatamaran.Step + _drawningCatamaranHeight <= _pictureHeight) + { + _startPosY += (int)EntityCatamaran.Step; + } + return true; + default: + return false; + } + } + /// + /// отрисовка + /// + /// + public void DrawTransport(Graphics g) + { + if (EntityCatamaran == null || !_startPosX.HasValue || !_startPosY.HasValue) + { + return; + } + Brush brBody = new SolidBrush(EntityCatamaran.BodyColor); + Brush brFloatsAndSail = new SolidBrush(EntityCatamaran.AdditionalColor); + g.FillRectangle(brBody, _startPosX.Value + 5, _startPosY.Value + 15, 40, 20); + Point[] triangle = + { + new Point(_startPosX.Value + 45,_startPosY.Value + 15), + new Point(_startPosX.Value + 65,_startPosY.Value + 25), + new Point(_startPosX.Value + 45,_startPosY.Value + 35), + }; + g.FillPolygon(brBody, triangle); + g.FillEllipse(new SolidBrush(Color.Black), _startPosX.Value + 12, _startPosY.Value + 19, 23, 10); + //плавники + if (EntityCatamaran.Floats) + { + g.FillRectangle(brFloatsAndSail, _startPosX.Value, _startPosY.Value + 10, 45, 5); + g.FillRectangle(brFloatsAndSail, _startPosX.Value, _startPosY.Value + 35, 45, 5); + } + // парус + if (EntityCatamaran.Sail) + { + Point[] sailFigure = + { + new Point(_startPosX.Value + 25,_startPosY.Value + 25), + new Point(_startPosX.Value + 35 ,_startPosY.Value + 25), + new Point(_startPosX.Value + 25,_startPosY.Value), + }; + g.FillPolygon(brFloatsAndSail, sailFigure); + } + } + + + +} \ No newline at end of file diff --git a/ProjectCatamaran/ProjectCatamaran/EntityCatamaran.cs b/ProjectCatamaran/ProjectCatamaran/EntityCatamaran.cs new file mode 100644 index 0000000..afceb4b --- /dev/null +++ b/ProjectCatamaran/ProjectCatamaran/EntityCatamaran.cs @@ -0,0 +1,53 @@ +namespace ProjectCatamaran; +/// +/// Класс-сущность "Авто поезд" +/// +public class EntityCatamaran +{ + /// + /// Скорость + /// + public int Speed { get; set; } + /// + /// Вес авто + /// + public double Weight { get; set; } + /// + /// Основной цвет + /// + public Color BodyColor { get; private set; } + /// + /// Дополнительный цвет(для опциональных элементов) + /// + public Color AdditionalColor { get; private set; } + /// + /// Признак (опция) наличие поплавков + /// + public bool Floats { get; private set; } + /// + /// Признак (опция) наличие паруса + /// + public bool Sail { get; private set; } + /// + /// Шаг перемещения + /// + public double Step => Speed * 100 / Weight; + /// + /// Инициализация полей обьекта-класса спортивного автомобиля + /// + /// Скорость + /// Вес авто + /// Основной цвет + /// Дополнительный цвет(для опциональных элементов) + /// Признак (опция) наличие плавников + /// Признак (опция) наличие паруса + public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool floats, bool sail) + { + Speed = speed; + Weight = weight; + BodyColor = bodyColor; + AdditionalColor = additionalColor; + Floats = floats; + Sail = sail; + } +} \ No newline at end of file diff --git a/ProjectCatamaran/ProjectCatamaran/Form1.Designer.cs b/ProjectCatamaran/ProjectCatamaran/Form1.Designer.cs deleted file mode 100644 index 9fdac50..0000000 --- a/ProjectCatamaran/ProjectCatamaran/Form1.Designer.cs +++ /dev/null @@ -1,39 +0,0 @@ -namespace ProjectCatamaran -{ - 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/ProjectCatamaran/ProjectCatamaran/Form1.cs b/ProjectCatamaran/ProjectCatamaran/Form1.cs deleted file mode 100644 index 944ba25..0000000 --- a/ProjectCatamaran/ProjectCatamaran/Form1.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace ProjectCatamaran -{ - public partial class Form1 : Form - { - public Form1() - { - InitializeComponent(); - } - } -} diff --git a/ProjectCatamaran/ProjectCatamaran/FormCatamaran.Designer.cs b/ProjectCatamaran/ProjectCatamaran/FormCatamaran.Designer.cs new file mode 100644 index 0000000..12e51bf --- /dev/null +++ b/ProjectCatamaran/ProjectCatamaran/FormCatamaran.Designer.cs @@ -0,0 +1,134 @@ +namespace ProjectCatamaran +{ + partial class FormCatamaran + { + /// + /// 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() + { + pictureBoxCatamaran = new PictureBox(); + buttonCreateCatamaran = new Button(); + buttonUp = new Button(); + buttonRight = new Button(); + buttonLeft = new Button(); + buttonDown = new Button(); + ((System.ComponentModel.ISupportInitialize)pictureBoxCatamaran).BeginInit(); + SuspendLayout(); + // + // pictureBoxCatamaran + // + pictureBoxCatamaran.Dock = DockStyle.Fill; + pictureBoxCatamaran.Location = new Point(0, 0); + pictureBoxCatamaran.Name = "pictureBoxCatamaran"; + pictureBoxCatamaran.Size = new Size(800, 450); + pictureBoxCatamaran.TabIndex = 0; + pictureBoxCatamaran.TabStop = false; + // + // buttonCreateCatamaran + // + buttonCreateCatamaran.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + buttonCreateCatamaran.Location = new Point(12, 406); + buttonCreateCatamaran.Name = "buttonCreateCatamaran"; + buttonCreateCatamaran.Size = new Size(75, 23); + buttonCreateCatamaran.TabIndex = 1; + buttonCreateCatamaran.Text = "Создать"; + buttonCreateCatamaran.UseVisualStyleBackColor = true; + buttonCreateCatamaran.Click += ButtonCreateCatamaran_Click; + // + // buttonUp + // + buttonUp.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + buttonUp.BackgroundImage = Properties.Resources.fdcc84704da3ed14a83779fbf91e00fb; + buttonUp.BackgroundImageLayout = ImageLayout.Stretch; + buttonUp.Location = new Point(709, 359); + buttonUp.Name = "buttonUp"; + buttonUp.Size = new Size(35, 35); + buttonUp.TabIndex = 2; + buttonUp.UseVisualStyleBackColor = true; + buttonUp.Click += ButtonMove_Click; + // + // buttonRight + // + buttonRight.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + buttonRight.BackgroundImage = Properties.Resources.right; + buttonRight.BackgroundImageLayout = ImageLayout.Stretch; + buttonRight.Location = new Point(750, 400); + buttonRight.Name = "buttonRight"; + buttonRight.Size = new Size(35, 35); + buttonRight.TabIndex = 3; + buttonRight.UseVisualStyleBackColor = true; + buttonRight.Click += ButtonMove_Click; + // + // buttonLeft + // + buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + buttonLeft.BackgroundImage = Properties.Resources.left; + buttonLeft.BackgroundImageLayout = ImageLayout.Stretch; + buttonLeft.Location = new Point(668, 400); + buttonLeft.Name = "buttonLeft"; + buttonLeft.Size = new Size(35, 35); + buttonLeft.TabIndex = 4; + buttonLeft.UseVisualStyleBackColor = true; + buttonLeft.Click += ButtonMove_Click; + // + // buttonDown + // + buttonDown.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; + buttonDown.BackgroundImage = Properties.Resources.down; + buttonDown.BackgroundImageLayout = ImageLayout.Stretch; + buttonDown.Location = new Point(709, 400); + buttonDown.Name = "buttonDown"; + buttonDown.Size = new Size(35, 35); + buttonDown.TabIndex = 5; + buttonDown.UseVisualStyleBackColor = true; + buttonDown.Click += ButtonMove_Click; + // + // FormCatamaran + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(800, 450); + Controls.Add(buttonDown); + Controls.Add(buttonLeft); + Controls.Add(buttonRight); + Controls.Add(buttonUp); + Controls.Add(buttonCreateCatamaran); + Controls.Add(pictureBoxCatamaran); + Name = "FormCatamaran"; + Text = "Катамаран"; + ((System.ComponentModel.ISupportInitialize)pictureBoxCatamaran).EndInit(); + ResumeLayout(false); + } + + #endregion + + private PictureBox pictureBoxCatamaran; + private Button buttonCreateCatamaran; + private Button buttonUp; + private Button buttonRight; + private Button buttonLeft; + private Button buttonDown; + } +} \ No newline at end of file diff --git a/ProjectCatamaran/ProjectCatamaran/FormCatamaran.cs b/ProjectCatamaran/ProjectCatamaran/FormCatamaran.cs new file mode 100644 index 0000000..1560145 --- /dev/null +++ b/ProjectCatamaran/ProjectCatamaran/FormCatamaran.cs @@ -0,0 +1,77 @@ +using ProjectCatamaran; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace ProjectCatamaran +{ + public partial class FormCatamaran : Form + { + private DrawningCatamaran? _drawningCatamaran; + public FormCatamaran() + { + InitializeComponent(); + } + + private void Draw() + { + if (_drawningCatamaran == null) + { + return; + } + Bitmap bmp = new(pictureBoxCatamaran.Width, pictureBoxCatamaran.Height); + Graphics gr = Graphics.FromImage(bmp); + _drawningCatamaran.DrawTransport(gr); + pictureBoxCatamaran.Image = bmp; + } + + private void ButtonMove_Click(object sender, EventArgs e) + { + if (_drawningCatamaran == null) + { + return; + } + string name = ((Button)sender)?.Name ?? string.Empty; + bool result = false; + switch (name) + { + case "buttonUp": + result = _drawningCatamaran.MoveTransport(DirectionType.Up); + break; + case "buttonDown": + result = _drawningCatamaran.MoveTransport(DirectionType.Down); + break; + case "buttonLeft": + result = _drawningCatamaran.MoveTransport(DirectionType.Left); + break; + case "buttonRight": + result = _drawningCatamaran.MoveTransport(DirectionType.Right); + break; + } + if (result) + { + Draw(); + } + } + + private void ButtonCreateCatamaran_Click(object sender, EventArgs e) + { + Random random = new Random(); + _drawningCatamaran = new DrawningCatamaran(); + _drawningCatamaran.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))); + + _drawningCatamaran.SetPictureSize(pictureBoxCatamaran.Width, pictureBoxCatamaran.Height); + _drawningCatamaran.SetPosition(random.Next(10, 100), random.Next(10, 100)); + Draw(); + } + } +} \ No newline at end of file diff --git a/ProjectCatamaran/ProjectCatamaran/FormCatamaran.resx b/ProjectCatamaran/ProjectCatamaran/FormCatamaran.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/ProjectCatamaran/ProjectCatamaran/FormCatamaran.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/ProjectCatamaran/ProjectCatamaran/Program.cs b/ProjectCatamaran/ProjectCatamaran/Program.cs index 9fbc3e7..4d620b5 100644 --- a/ProjectCatamaran/ProjectCatamaran/Program.cs +++ b/ProjectCatamaran/ProjectCatamaran/Program.cs @@ -11,7 +11,7 @@ namespace ProjectCatamaran // 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 FormCatamaran()); } } } \ No newline at end of file diff --git a/ProjectCatamaran/ProjectCatamaran/ProjectCatamaran.csproj b/ProjectCatamaran/ProjectCatamaran/ProjectCatamaran.csproj index 663fdb8..af03d74 100644 --- a/ProjectCatamaran/ProjectCatamaran/ProjectCatamaran.csproj +++ b/ProjectCatamaran/ProjectCatamaran/ProjectCatamaran.csproj @@ -8,4 +8,19 @@ enable + + + True + True + Resources.resx + + + + + + ResXFileCodeGenerator + Resources.Designer.cs + + + \ No newline at end of file diff --git a/ProjectCatamaran/ProjectCatamaran/Properties/Resources.Designer.cs b/ProjectCatamaran/ProjectCatamaran/Properties/Resources.Designer.cs new file mode 100644 index 0000000..77ae0a2 --- /dev/null +++ b/ProjectCatamaran/ProjectCatamaran/Properties/Resources.Designer.cs @@ -0,0 +1,103 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace ProjectCatamaran.Properties { + using System; + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [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() { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [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("ProjectCatamaran.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap down { + get { + object obj = ResourceManager.GetObject("down", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap fdcc84704da3ed14a83779fbf91e00fb { + get { + object obj = ResourceManager.GetObject("fdcc84704da3ed14a83779fbf91e00fb", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap left { + get { + object obj = ResourceManager.GetObject("left", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap right { + get { + object obj = ResourceManager.GetObject("right", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + } +} diff --git a/ProjectCatamaran/ProjectCatamaran/Properties/Resources.resx b/ProjectCatamaran/ProjectCatamaran/Properties/Resources.resx new file mode 100644 index 0000000..4c773c4 --- /dev/null +++ b/ProjectCatamaran/ProjectCatamaran/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\down.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\fdcc84704da3ed14a83779fbf91e00fb.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\left.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\right.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + \ No newline at end of file diff --git a/ProjectCatamaran/ProjectCatamaran/Resources/down.jpg b/ProjectCatamaran/ProjectCatamaran/Resources/down.jpg new file mode 100644 index 0000000000000000000000000000000000000000..1d4311b70b94c53e85e15e557432c3b013e5ae63 GIT binary patch literal 11981 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 literal 0 HcmV?d00001 diff --git a/ProjectCatamaran/ProjectCatamaran/Resources/fdcc84704da3ed14a83779fbf91e00fb.jpg b/ProjectCatamaran/ProjectCatamaran/Resources/fdcc84704da3ed14a83779fbf91e00fb.jpg new file mode 100644 index 0000000000000000000000000000000000000000..b3ff47b10e5acbbaca458f076033297ba90de7b5 GIT binary patch literal 5679 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 Gt$zmyP6dkq literal 0 HcmV?d00001 diff --git a/ProjectCatamaran/ProjectCatamaran/Resources/right.jpg b/ProjectCatamaran/ProjectCatamaran/Resources/right.jpg new file mode 100644 index 0000000000000000000000000000000000000000..5d61aca9beb6e298f70818bc2a98d877f8a93bc2 GIT binary patch literal 11815 zcmeHM3se)=y52EF6x7IDp^zhjqLESswOS=w3MiCDL_p#rRpb?fT&+Bm$5^YPP^6%s zU^OBN2uS1+Q67mBzyine1_3n?0eLe4Oa_w7oT2C5p0;_?AdGo z-+cRje1pBfy1-%wyPbA`Kp=n}_zz&6zy=WK%$YgyLj^xc^GGBW6_T2&>fCt?)D|pI zS5sGCxJYyH!bKX3)YTX3F4oY}*3r>fK-OELtGz^1TSt3l5&{u_Mujw=M4GR?P<^5H zdmq>npfPXG={cu~1YbtY& z&PQFi7@ctWN@CL0Yso3M)9&0&&&a%&m0wWEdsy`7adEk@qO$7QPt`SzP0cN>Z7sHhNCRA>Am%n8AbsG&ky zwsx-Oc4yT?$Fz*seLGM4^Z3-fr}LLv?uK;^A8%08HL>b8mCU&Ii)Vk%u`~ZI&wh36 zAAWU!1w;b=@`xIM29%%Pjy40cHjBY52WB}i%Yj)A%yQuUIl$eD6iI4@Op-TT5}L)% z^DCC7DU*$ELCyRA>V6{9N2ZfqpZ$h{P~D@ThZs2W+0auAd~)M()dU8N639yKHj1~6 zRmkFJCda9E!sGe;ckI#prtER56ky=YMVb(L5WX2n&a~odvtJH$v{z`KrXjVbsly$uA@vjyAhB=R>qoRVe~vKw%=v!$74v#BcDk zn}SAS)^OyeVegJ%U}>R-So9sbxxO9hF->K9K%&}Urt;=#TFPoAP@cv>SE?R!ZeJd} zvBIFL3|^~jxiO&__gjg>>B=PJCwecGC8gaW50dH4=Ib4oSgaW}E-85Yy(6h2kiREB z{}+6CEPpH}Y^!ABk38WfY;}=AUYNCyD#%k|w%z~OWD-#=d*6~LC42w^6`P3$jNwU4>u9yv(-n6l3-#Q7^oaNpP4eyj68)6pBEi;PEu3nMdWl#+@9t}~neh>AQ>d5`N1O~pM z#ii7ABu3bAWph$Iv?QrxP;bh^2?RRZYJ(5V2#6mBNY1cGN*TE*-uFX^mP=k9pCaq^ zq)n5;!zRKc89hmKt>cDHBZ zdm&FWk|?IP(<|j~G>42d`4E!qdl!`{t>WYfYRVeKMY2!G)Ze0&fpE)D-C^8}IkhgI z`#M$-y-5#Q8g>^1H9Ok^?GMNzeKGLVzmW1-xk&9@qWp&gq7FPx(!6T7+Pb6Li$@AMvW{BANa{a!BlGjf8XAuqP4l8GRacq|3azN+dM*uK(5w9x zvM8AeV`?-SpjXg^3SYSB8CS&v2WNA_AY(rUPC_lU?3EJx)fgbEjb=~vD6a}wbX~Lt z{WOkI?onUAi4x9`P<;9617s+VM@a zrH26~9n5Z@R{KEA+8<9Tv7r#E$$rr(wjvyFeJGV>W8i46F-tL*J3x`f!y<*LpkS;b zc4eTn7#5xfq_S*QRvB^c=BxdCuq}aZDnRD$*8P*pjG62mef3Xk||5F)KR)O^b=q7 z-;M@m?`4lg7jCY$Cc&x~Ns;zD0UPw5ci-GE0Wqu&xx=<%ehCI{JF_wHT{;Hd z>>*5ZW+$7)?4ObvnZry2*>y7Sd#mBiugsij+BpUL;fFUC^qg)RIp3R4*ykhyGA0MWj+T>o`_M`JQO1*6OzI<<}yEGHt zJeaa2CS#~IEBjvmxZrtUFC;;fMrC|Kis&o`^tL#`_EkyNtKmx-D{f>nIQ)#>c<7>G z*gftmN;_Fv4!4aQ=#r+?)i#!T9Og*Y)psycXw!Za*&7y^p8GzfbtwjMNJ(~GmQS5!A-tWg#^ALZDK?P-=!Yd;*O{jmR z*qe7)-hFce2A+9@-5aG|!lQR24l=XTMkwNKJm)soKZ5d1cNKa)4afec1}Jj#w1XhI zj(|)skN|P)#tObcvv(u!zO`$TdM4AKO76>e#O>t1NRx`|G2r)V?pBLEz9%4~_Kaz_ z6zh==4Al9W5eHNLY;MF0{0?<=2d#oG*BcW|e#z_Cd5eKUJ;e{u1&-801obET5~uS2 zuY1_s@5-$|Y2BhKrW%F`r(>%UbN22qeOStiNU$q^JZ(ml*+_MjrB+bKKD!v9k#Uka zRcxL^DUCrr23K28HbBGG%!6$cdbf}mXE;62C#zp}*{}HSk7xY-Yu(#TKBist@RveT zvXWmo)}iH81V_c(iLMo!Xuy#@r}DXyl}f8yWS;MzU=9_pGJP$k{(=Dw+Ax!kfrfQ$ zx7;~sJ#&0JY7D&)MBu5*3vU=|-iO@(BV(z|9gSn_M;to8Y6|c!D=Usae7?1PX>W3E zcve;!0cTI?`PSAIkBV*&8hUc8Npfwb(=!9P_& ze4q$YQ{lL?L2*W*3Bv95C#HA@Ja=8O3GfNL-V+}Sws(ujg9pu91FUWsl}FIs%6_m7 z@L_#F{$($JFsp6&?Jz}791s=saoA#!p1p3WL^Bj+zKL;g!N8g~7)Wm^lanLMPq`1j zN)w9d8baNB63s!%>z(7p16j}+wdua!*M$GoX6{2xLfz)6bfevNe1m+`6bX+Cu6S2gI>AZn`Tp<^dR!Db!w>Jaw{ORDRzGr z?96;D%BKuRbaUI?pYokJSMMSD(zVKrTcwu{~njtD^8Gf#1noYR9G=Cc z(H~W&j^AdNeXqiXjsxkWvYdK)mB|Vzu7k+XnXCb*uA6W zo36U20yPB*HoST++%!EmIlVLP247L+649Dqhi+hvzW+Cx|J|P8XpXU+cR;kja+m5v zyZoEb?{Imoqf>lt%=N%wM=uOKbjZW$+V!q2d{-N%lBrpG;C|lQ-7UFe2585Zc=b}y zwj2)t?kxg*7(F+#8C`K{yx-{#qFXf+>L?Q}g12WWBfI9(hC}2A$Yp7^BzW1nepDlm zja(bDwH{Mi#>vO^XVhMpi+_hw;A*c+`Kc3(;LG0Eopr4J43Okbq=&_W$GXR&P;G?f z1lOInLJDK`=y6AM8&)djCkyz`Uk%;)V7C3QU#=e0Vi+(iC>QAa9~FIkJ?-GZB4xoj zTx>g%n_o(ij!0A$%W3&~l~nGd#{R~=TxC%w1+CjgsS8iolKWSY<=U65)zo1OyzrE& zH{hY%1H*~Z^(X1i>e@x0 zD{rU5{ABUPyH|zNU)@>nFZT3_1J%_Z7n|9 Date: Thu, 13 Feb 2025 19:47:39 +0400 Subject: [PATCH 2/3] =?UTF-8?q?=D0=BF=D0=BE=D0=BC=D0=B5=D0=BD=D1=8F=20?= =?UTF-8?q?=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=B0?= =?UTF-8?q?=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ProjectCatamaran/ProjectCatamaran/DrawningCatamaran.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ProjectCatamaran/ProjectCatamaran/DrawningCatamaran.cs b/ProjectCatamaran/ProjectCatamaran/DrawningCatamaran.cs index 6266ca6..1762aa1 100644 --- a/ProjectCatamaran/ProjectCatamaran/DrawningCatamaran.cs +++ b/ProjectCatamaran/ProjectCatamaran/DrawningCatamaran.cs @@ -47,11 +47,11 @@ public class DrawningCatamaran /// Основной цвет /// Дополнительный цвет(для опциональных элементов) /// Признак (опция) наличие плавников - /// Признак (опция) наличие парус - public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool floats, bool brush) + /// Признак (опция) наличие парус + public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool floats, bool sail) { EntityCatamaran = new EntityCatamaran(); - EntityCatamaran.Init(speed, weight, bodyColor, additionalColor, floats, brush); + EntityCatamaran.Init(speed, weight, bodyColor, additionalColor, floats, sail); _pictureWidth = null; _pictureHeight = null; -- 2.25.1 From 4a835f6a164b2c6e282f64e976a03d7ccda93811 Mon Sep 17 00:00:00 2001 From: Nikita Date: Fri, 14 Feb 2025 23:09:02 +0400 Subject: [PATCH 3/3] =?UTF-8?q?=D0=BF=D0=BE=D0=BC=D0=B5=D0=BD=D1=8F=D0=BB?= =?UTF-8?q?=20=D0=BA=D0=BE=D0=BC=D0=BC=D0=BD=D1=82=D0=B0=D1=80=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ProjectCatamaran/ProjectCatamaran/EntityCatamaran.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProjectCatamaran/ProjectCatamaran/EntityCatamaran.cs b/ProjectCatamaran/ProjectCatamaran/EntityCatamaran.cs index afceb4b..61d027e 100644 --- a/ProjectCatamaran/ProjectCatamaran/EntityCatamaran.cs +++ b/ProjectCatamaran/ProjectCatamaran/EntityCatamaran.cs @@ -1,6 +1,6 @@ namespace ProjectCatamaran; /// -/// Класс-сущность "Авто поезд" +/// Класс-сущность "Катамаран" /// public class EntityCatamaran { -- 2.25.1