diff --git a/ProjectBoat_base/ProjectBoat_bae/ExtentionBoat.cs b/ProjectBoat_base/ProjectBoat_bae/ExtentionBoat.cs
index f089938..91c162f 100644
--- a/ProjectBoat_base/ProjectBoat_bae/ExtentionBoat.cs
+++ b/ProjectBoat_base/ProjectBoat_bae/ExtentionBoat.cs
@@ -16,13 +16,13 @@ namespace ProjectBoat_bae
private static readonly char _separatorForObject = ':';
// Создание объекта из строки
- public static Drawningboat CreateDrawningBoat(this string info, char _separatorForObject, int _pictureWidth, int _pictureHeight)
+ public static Drawningboat? CreateDrawningBoat(this string info, char _separatorForObject, int _pictureWidth, int _pictureHeight)
{
string[] strs = info.Split(_separatorForObject);
if (strs.Length == 3)
{
return new Drawningboat(Convert.ToInt32(strs[0]),
- Convert.ToInt32(strs[1]), Color.FromName(strs[2]), Convert.ToInt32(strs[3]), Convert.ToInt32(strs[4]));
+ Convert.ToInt32(strs[1]), Color.FromName(strs[2]), _pictureWidth, _pictureHeight);
}
if (strs.Length == 7)
{
diff --git a/ProjectBoat_base/ProjectBoat_bae/FormBoatCollection.cs b/ProjectBoat_base/ProjectBoat_bae/FormBoatCollection.cs
index 044d57b..fb7f02e 100644
--- a/ProjectBoat_base/ProjectBoat_bae/FormBoatCollection.cs
+++ b/ProjectBoat_base/ProjectBoat_bae/FormBoatCollection.cs
@@ -183,31 +183,6 @@ namespace ProjectBoat_bae
//загрузка
private void LoadToolStripMenu_Click(object sender, EventArgs args)
{
- //if (openFileDialog.ShowDialog() == DialogResult.OK)
- //{
- // if (_storage.LoadData(openFileDialog.FileName))
- // MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
- // else
- // MessageBox.Show("Не загрузилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
- //}
-
- //ReloadObjects();
-
- //if (openFileDialog.ShowDialog() == DialogResult.OK)
- //{
- // if (_storage.LoadData(openFileDialog.FileName))
- // {
- // MessageBox.Show("Загрузка прошла успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information);
- // foreach (var collection in _storage.Keys)
- // {
- // listBoxStorages.Items.Add(collection);
- // }
- // }
- // else
- // {
- // MessageBox.Show("Не загрузилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error);
- // }
- //}
if (openFileDialog.ShowDialog() == DialogResult.OK)
{
diff --git a/ProjectBoat_base/ProjectBoat_bae/FormBoatCollection.resx b/ProjectBoat_base/ProjectBoat_bae/FormBoatCollection.resx
index 586ac7d..e7b799e 100644
--- a/ProjectBoat_base/ProjectBoat_bae/FormBoatCollection.resx
+++ b/ProjectBoat_base/ProjectBoat_bae/FormBoatCollection.resx
@@ -127,6 +127,6 @@
363, 21
- 38
+ 91
\ No newline at end of file