Merge branch 'LabWork_07' into LabWork_08_1

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();

base/Catamaran/Catamaran/FormCatamaranConfig.cs

@@ -122,7 +122,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;
             }
@@ -168,6 +168,7 @@ namespace Catamaran
             EventAddCatamaran?.Invoke(_catamaran);
             Close();
         }
+    };
+};
+
 
-    }
-}