From 737d77ac68c172ed146b712432c429f870a2b7a2 Mon Sep 17 00:00:00 2001
From: "safiulova.k" <safiulovak@gmail.com>
Date: Wed, 22 Nov 2023 10:19:45 +0400
Subject: [PATCH 1/3] =?UTF-8?q?=D0=93=D0=BE=D1=82=D0=BE=D0=B2=D0=B0=D1=8F?=
 =?UTF-8?q?=205=20=D0=BB=D0=B0=D0=B1=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 base/Catamaran/Catamaran/CatamaransGenericCollection.cs | 2 ++
 base/Catamaran/Catamaran/DrawningCatamaran.cs           | 4 ++--
 base/Catamaran/Catamaran/FormCatamaranConfig.cs         | 7 ++++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/base/Catamaran/Catamaran/CatamaransGenericCollection.cs b/base/Catamaran/Catamaran/CatamaransGenericCollection.cs
index f421270..450908e 100644
--- a/base/Catamaran/Catamaran/CatamaransGenericCollection.cs
+++ b/base/Catamaran/Catamaran/CatamaransGenericCollection.cs
@@ -146,6 +146,8 @@ namespace Catamaran.Generics
                     }
                     if (catamaran != null)
                     {
+                        catamaran._pictureWidth = _pictureWidth;
+                        catamaran._pictureHeight = _pictureHeight;
                         catamaran.SetPosition(i % width * _placeSizeWidth + _placeSizeWidth / 40,
                             (height - diff) * _placeSizeHeight + _placeSizeHeight / 15);
                         catamaran.DrawTransport(g);
diff --git a/base/Catamaran/Catamaran/DrawningCatamaran.cs b/base/Catamaran/Catamaran/DrawningCatamaran.cs
index b765652..535425d 100644
--- a/base/Catamaran/Catamaran/DrawningCatamaran.cs
+++ b/base/Catamaran/Catamaran/DrawningCatamaran.cs
@@ -20,11 +20,11 @@ namespace Catamaran.DrawningObjects
         /// <summary>
         /// Ширина окна
         /// </summary>
-        private int _pictureWidth;
+        public int _pictureWidth;
         /// <summary>
         /// Высота окна
         /// </summary>
-        private int _pictureHeight;
+        public int _pictureHeight;
         /// <summary>
         /// Левая координата прорисовки катамарана
         /// </summary>
diff --git a/base/Catamaran/Catamaran/FormCatamaranConfig.cs b/base/Catamaran/Catamaran/FormCatamaranConfig.cs
index 416461d..4d43862 100644
--- a/base/Catamaran/Catamaran/FormCatamaranConfig.cs
+++ b/base/Catamaran/Catamaran/FormCatamaranConfig.cs
@@ -118,7 +118,7 @@ namespace Catamaran
                 case "labelModifiedObject":
                     _catamaran = new DrawningSailCatamaran((int)numericUpDownSpeed.Value,
                    (int)numericUpDownWeight.Value, Color.White, Color.Black, checkBoxSail.Checked,
-                   checkBoxFloatDetails.Checked,  pictureBoxObject.Width,
+                   checkBoxFloatDetails.Checked, pictureBoxObject.Width,
                    pictureBoxObject.Height);
                     break;
             }
@@ -164,6 +164,7 @@ namespace Catamaran
             EventAddCatamaran?.Invoke(_catamaran);
             Close();
         }
+    };
+};
+
 
-    }
-}

From c266418c75b1a3285e990e70f3f8a88a1258a5d9 Mon Sep 17 00:00:00 2001
From: "safiulova.k" <safiulovak@gmail.com>
Date: Tue, 5 Dec 2023 01:23:55 +0400
Subject: [PATCH 2/3] =?UTF-8?q?=D1=87=D1=82=D0=BE=20=D1=82=D0=BE=20=D0=B4?=
 =?UTF-8?q?=D0=BE=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=D0=B0=20=D0=B2=205=20?=
 =?UTF-8?q?=D0=BB=D0=B0=D0=B1=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 base/Catamaran/Catamaran/EntityCatamaran.cs     | 4 ++++
 base/Catamaran/Catamaran/EntitySailCatamaran.cs | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/base/Catamaran/Catamaran/EntityCatamaran.cs b/base/Catamaran/Catamaran/EntityCatamaran.cs
index 1dbfabb..2d00394 100644
--- a/base/Catamaran/Catamaran/EntityCatamaran.cs
+++ b/base/Catamaran/Catamaran/EntityCatamaran.cs
@@ -39,6 +39,10 @@ namespace Catamaran.Entities
             Weight = weight;
             BodyColor = bodyColor;
         }
+        public void setBodyColor(Color color)
+        {
+            BodyColor = color;
+        }
     }
 }
 
diff --git a/base/Catamaran/Catamaran/EntitySailCatamaran.cs b/base/Catamaran/Catamaran/EntitySailCatamaran.cs
index d790525..82f9361 100644
--- a/base/Catamaran/Catamaran/EntitySailCatamaran.cs
+++ b/base/Catamaran/Catamaran/EntitySailCatamaran.cs
@@ -39,5 +39,9 @@ namespace Catamaran.Entities
             Sail = sail;
             FloatDetail = floatDetail;
         }
+        public void setAdditionalColor(Color color)
+        {
+            AdditionalColor = color;
+        }
     }
 }

From d1356fb01ef108271eca816f4046d3ddf94316db Mon Sep 17 00:00:00 2001
From: "safiulova.k" <safiulovak@gmail.com>
Date: Tue, 5 Dec 2023 01:31:21 +0400
Subject: [PATCH 3/3] =?UTF-8?q?=D1=82=D0=BE=D1=87=D0=BD=D0=BE=20=D0=B4?=
 =?UTF-8?q?=D0=BE=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=D0=B0=205=20=D0=BB=D0=B0?=
 =?UTF-8?q?=D0=B1=D1=83(?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 base/Catamaran/Catamaran/Catamaran.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/base/Catamaran/Catamaran/Catamaran.cs b/base/Catamaran/Catamaran/Catamaran.cs
index b2c4c73..6eaeb63 100644
--- a/base/Catamaran/Catamaran/Catamaran.cs
+++ b/base/Catamaran/Catamaran/Catamaran.cs
@@ -57,7 +57,7 @@ namespace Catamaran
         private void buttonCreateSailCatamaran_Click(object sender, EventArgs e)
         {
             Random random = new();
-            //� TODO ����� ��������� �����
+            //TODO ����� ��������� �����
             Color color = Color.FromArgb(random.Next(0, 256),
             random.Next(0, 256), random.Next(0, 256));
             ColorDialog dialogColor = new();