diff --git a/ProjectAirBomber/ProjectAirBomber/CollectionGenericObjects/AbstractCompany.cs b/ProjectAirBomber/ProjectAirBomber/CollectionGenericObjects/AbstractCompany.cs index a6f7a71..e93459c 100644 --- a/ProjectAirBomber/ProjectAirBomber/CollectionGenericObjects/AbstractCompany.cs +++ b/ProjectAirBomber/ProjectAirBomber/CollectionGenericObjects/AbstractCompany.cs @@ -10,12 +10,12 @@ public abstract class AbstractCompany /// /// Размер места (ширина) /// - protected readonly int _placeSizeWidth = 210; + protected readonly int _placeSizeWidth = 300; /// /// Размер места (высота) /// - protected readonly int _placeSizeHeight = 170; + protected readonly int _placeSizeHeight = 180; /// /// Ширина окна diff --git a/ProjectAirBomber/ProjectAirBomber/CollectionGenericObjects/BomberHungarService.cs b/ProjectAirBomber/ProjectAirBomber/CollectionGenericObjects/BomberHungarService.cs index 710cdb7..337add7 100644 --- a/ProjectAirBomber/ProjectAirBomber/CollectionGenericObjects/BomberHungarService.cs +++ b/ProjectAirBomber/ProjectAirBomber/CollectionGenericObjects/BomberHungarService.cs @@ -19,39 +19,27 @@ public class BomberHungarService : AbstractCompany { } - protected override void DrawBackgound(Graphics g) + /// + /// Вывод заднего фона + /// + /// + /// + protected override void DrawBackgound(Graphics g) { - Pen pen = new(Color.Black); - for (int i = 0; i < _pictureWidth / _placeSizeWidth; i++) + Pen pen = new(Color.Black, 2); + for (int i = 0; i < _pictureWidth / _placeSizeWidth + 1; i++) { for(int j = 0; j < _pictureHeight / _placeSizeHeight; j++) { - g.DrawLine(pen, new(_placeSizeWidth * i, _placeSizeHeight * j), new((int)(_placeSizeWidth * (i + 0.5f)), _placeSizeHeight * j)); + g.DrawLine(pen, new(_placeSizeWidth * i, _placeSizeHeight * j), new((int)(_placeSizeWidth * (i + 0.7f)), _placeSizeHeight * j)); g.DrawLine(pen, new(_placeSizeWidth * i, _placeSizeHeight * j), new(_placeSizeWidth * i, _placeSizeHeight * (j + 1))); } - g.DrawLine(pen, new(_placeSizeWidth * i, _placeSizeHeight * (_pictureHeight / _placeSizeHeight)), new((int)(_placeSizeWidth * (i + 0.5f)), _placeSizeHeight * (_pictureHeight / _placeSizeHeight))); + g.DrawLine(pen, new(_placeSizeWidth * i, _placeSizeHeight * (_pictureHeight / _placeSizeHeight)), new((int)(_placeSizeWidth * (i + 0.7f)), _placeSizeHeight * (_pictureHeight / _placeSizeHeight))); } } - //protected override void SetObjectsPosition() - //{ - // int n = 0; - // for (int i = 0; i < _pictureWidth / _placeSizeWidth; i++) - // { - // for (int j = 0; j < _pictureHeight / _placeSizeHeight; j++) - // { - // DrawningBomber? drawningBomber = _collection?.Get(n); - // n++; - // if (drawningBomber != null) - // { - // drawningBomber.SetPictureSize(_pictureWidth, _pictureHeight); - // drawningBomber.SetPosition(i * _placeSizeWidth + 5, j * _placeSizeHeight + 5); - // } - // } - // } - //} protected override void SetObjectsPosition() { diff --git a/ProjectAirBomber/ProjectAirBomber/CollectionGenericObjects/MassiveGenericObjects.cs b/ProjectAirBomber/ProjectAirBomber/CollectionGenericObjects/MassiveGenericObjects.cs index 52078d6..e94f886 100644 --- a/ProjectAirBomber/ProjectAirBomber/CollectionGenericObjects/MassiveGenericObjects.cs +++ b/ProjectAirBomber/ProjectAirBomber/CollectionGenericObjects/MassiveGenericObjects.cs @@ -9,6 +9,7 @@ namespace ProjectAirBomber.CollectionGenericObjects; /// Параметр: ограничение - ссылочный тип public class MassiveGenericObjects : ICollectionGenericObjects where T : class + { /// /// Массив объектов, которые храним diff --git a/ProjectAirBomber/ProjectAirBomber/FormBomberCollection.Designer.cs b/ProjectAirBomber/ProjectAirBomber/FormBomberCollection.Designer.cs index 9a248d7..f4cbbef 100644 --- a/ProjectAirBomber/ProjectAirBomber/FormBomberCollection.Designer.cs +++ b/ProjectAirBomber/ProjectAirBomber/FormBomberCollection.Designer.cs @@ -51,7 +51,7 @@ groupBoxTools.Controls.Add(buttonAddBomber); groupBoxTools.Controls.Add(comboBoxSelectorCompany); groupBoxTools.Dock = DockStyle.Right; - groupBoxTools.Location = new Point(840, 0); + groupBoxTools.Location = new Point(1136, 0); groupBoxTools.Name = "groupBoxTools"; groupBoxTools.Size = new Size(268, 835); groupBoxTools.TabIndex = 0; @@ -139,7 +139,7 @@ pictureBox.Dock = DockStyle.Fill; pictureBox.Location = new Point(0, 0); pictureBox.Name = "pictureBox"; - pictureBox.Size = new Size(840, 835); + pictureBox.Size = new Size(1136, 835); pictureBox.TabIndex = 1; pictureBox.TabStop = false; // @@ -147,7 +147,7 @@ // AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(1108, 835); + ClientSize = new Size(1404, 835); Controls.Add(pictureBox); Controls.Add(groupBoxTools); Name = "FormBomberCollection";