diff --git a/WarmlyShip/WarmlyShip/CollectionGenericObjects/AbstractCompany.cs b/WarmlyShip/WarmlyShip/CollectionGenericObjects/AbstractCompany.cs index 7030b16..44ad219 100644 --- a/WarmlyShip/WarmlyShip/CollectionGenericObjects/AbstractCompany.cs +++ b/WarmlyShip/WarmlyShip/CollectionGenericObjects/AbstractCompany.cs @@ -21,7 +21,7 @@ public abstract class AbstractCompany protected ICollectionGenericObjects _collection = null; - private int GetMaxCount => _pictureWidth * _pictureHeight / ((_placeSizeWidth + _placeSizeWidth /2) * _placeSizeHeight) - 1; + private int GetMaxCount => _pictureWidth * _pictureHeight / ((_placeSizeWidth + _placeSizeWidth /2) * _placeSizeHeight) - 2; public AbstractCompany(int picWidth, int picHeight, ICollectionGenericObjects collection) diff --git a/WarmlyShip/WarmlyShip/Entities/EntityWarmlyShip.cs b/WarmlyShip/WarmlyShip/Entities/EntityWarmlyShip.cs index 546a2cd..6f49cfc 100644 --- a/WarmlyShip/WarmlyShip/Entities/EntityWarmlyShip.cs +++ b/WarmlyShip/WarmlyShip/Entities/EntityWarmlyShip.cs @@ -48,7 +48,7 @@ public class EntityWarmlyShip : EntityShip Pipes = pipes; } - public virtual string[] GetStringRepresentation() + public override string[] GetStringRepresentation() { return new[] { nameof(EntityShip), Speed.ToString(), Weight.ToString(), BodyColor.Name, SeckondColor.Name, FuelHole.ToString(), Pipes.ToString() }; diff --git a/WarmlyShip/WarmlyShip/FormShipCollection.Designer.cs b/WarmlyShip/WarmlyShip/FormShipCollection.Designer.cs index a2e8501..3ca428c 100644 --- a/WarmlyShip/WarmlyShip/FormShipCollection.Designer.cs +++ b/WarmlyShip/WarmlyShip/FormShipCollection.Designer.cs @@ -68,7 +68,7 @@ groupBoxTools.Dock = DockStyle.Right; groupBoxTools.Location = new Point(961, 24); groupBoxTools.Name = "groupBoxTools"; - groupBoxTools.Size = new Size(187, 497); + groupBoxTools.Size = new Size(187, 532); groupBoxTools.TabIndex = 0; groupBoxTools.TabStop = false; groupBoxTools.Text = "Инструменты"; @@ -245,7 +245,7 @@ pictureBox.Dock = DockStyle.Fill; pictureBox.Location = new Point(0, 24); pictureBox.Name = "pictureBox"; - pictureBox.Size = new Size(961, 497); + pictureBox.Size = new Size(961, 532); pictureBox.TabIndex = 3; pictureBox.TabStop = false; // @@ -294,7 +294,7 @@ // AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(1148, 521); + ClientSize = new Size(1148, 556); Controls.Add(pictureBox); Controls.Add(groupBoxTools); Controls.Add(menuStrip);