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 /// /// Ширина окна /// - private int _pictureWidth; + public int _pictureWidth; /// /// Высота окна /// - private int _pictureHeight; + public int _pictureHeight; /// /// Левая координата прорисовки катамарана /// 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(); } + }; +}; + - } -}