From 6252645c1e3a3e55d7f1d8cf9239f9aab1e5af3e Mon Sep 17 00:00:00 2001
From: SAliulov <146759803+SAliulov@users.noreply.github.com>
Date: Thu, 18 Apr 2024 00:17:12 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9A=D0=BE=D0=BC=D0=BF=D0=B0=D0=BD=D0=B8?=
=?UTF-8?q?=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../AbstractCompany.cs | 2 +-
.../BomberHungarService.cs | 52 +++++++++++++------
.../FormAirBomber.Designer.cs | 12 ++---
.../ProjectAirBomber/FormAirBomber.cs | 2 +-
.../FormBomberCollection.Designer.cs | 8 +--
5 files changed, 47 insertions(+), 29 deletions(-)
diff --git a/ProjectAirBomber/ProjectAirBomber/CollectionGenericObjects/AbstractCompany.cs b/ProjectAirBomber/ProjectAirBomber/CollectionGenericObjects/AbstractCompany.cs
index 1b07dec..a6f7a71 100644
--- a/ProjectAirBomber/ProjectAirBomber/CollectionGenericObjects/AbstractCompany.cs
+++ b/ProjectAirBomber/ProjectAirBomber/CollectionGenericObjects/AbstractCompany.cs
@@ -55,7 +55,7 @@ public abstract class AbstractCompany
/// Перегрузка оператора сложения для класса
///
/// Компания
- /// Добавляемый объект
+ /// Добавляемый объект
///
public static int operator +(AbstractCompany company, DrawningBomber bomber)
{
diff --git a/ProjectAirBomber/ProjectAirBomber/CollectionGenericObjects/BomberHungarService.cs b/ProjectAirBomber/ProjectAirBomber/CollectionGenericObjects/BomberHungarService.cs
index c813d04..710cdb7 100644
--- a/ProjectAirBomber/ProjectAirBomber/CollectionGenericObjects/BomberHungarService.cs
+++ b/ProjectAirBomber/ProjectAirBomber/CollectionGenericObjects/BomberHungarService.cs
@@ -35,21 +35,39 @@ public class BomberHungarService : AbstractCompany
}
- protected override void SetObjectsPosition()
- {
- int n = 0;
- for (int i = 0; i < _pictureWidth / _placeSizeWidth; i++)
- {
- for (int j = 0; j < _pictureHeight / _placeSizeHeight; j++)
- {
- DrawningBomber? drawingTrans = _collection?.Get(n);
- n++;
- if (drawingTrans != null)
- {
- drawingTrans.SetPictureSize(_pictureWidth, _pictureHeight);
- drawingTrans.SetPosition(i * _placeSizeWidth + 5, j * _placeSizeHeight + 5);
- }
- }
- }
- }
+ //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()
+ {
+ int n = 0;
+ for (int i = _pictureWidth / _placeSizeWidth; i > 0; 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);
+ }
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/ProjectAirBomber/ProjectAirBomber/FormAirBomber.Designer.cs b/ProjectAirBomber/ProjectAirBomber/FormAirBomber.Designer.cs
index d2e5bd5..3f82e9d 100644
--- a/ProjectAirBomber/ProjectAirBomber/FormAirBomber.Designer.cs
+++ b/ProjectAirBomber/ProjectAirBomber/FormAirBomber.Designer.cs
@@ -47,7 +47,7 @@ namespace ProjectAirBomber
pictureBoxAirBomber.Dock = DockStyle.Fill;
pictureBoxAirBomber.Location = new Point(0, 0);
pictureBoxAirBomber.Name = "pictureBoxAirBomber";
- pictureBoxAirBomber.Size = new Size(923, 597);
+ pictureBoxAirBomber.Size = new Size(920, 597);
pictureBoxAirBomber.TabIndex = 0;
pictureBoxAirBomber.TabStop = false;
//
@@ -56,7 +56,7 @@ namespace ProjectAirBomber
buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
buttonLeft.BackgroundImage = Properties.Resources.arrowLeft;
buttonLeft.BackgroundImageLayout = ImageLayout.Stretch;
- buttonLeft.Location = new Point(787, 550);
+ buttonLeft.Location = new Point(784, 550);
buttonLeft.Name = "buttonLeft";
buttonLeft.Size = new Size(35, 35);
buttonLeft.TabIndex = 2;
@@ -68,7 +68,7 @@ namespace ProjectAirBomber
buttonUp.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
buttonUp.BackgroundImage = Properties.Resources.arrowUp;
buttonUp.BackgroundImageLayout = ImageLayout.Stretch;
- buttonUp.Location = new Point(828, 509);
+ buttonUp.Location = new Point(825, 509);
buttonUp.Name = "buttonUp";
buttonUp.Size = new Size(35, 35);
buttonUp.TabIndex = 3;
@@ -80,7 +80,7 @@ namespace ProjectAirBomber
buttonDown.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
buttonDown.BackgroundImage = Properties.Resources.arrowDown;
buttonDown.BackgroundImageLayout = ImageLayout.Stretch;
- buttonDown.Location = new Point(828, 550);
+ buttonDown.Location = new Point(825, 550);
buttonDown.Name = "buttonDown";
buttonDown.Size = new Size(35, 35);
buttonDown.TabIndex = 4;
@@ -92,7 +92,7 @@ namespace ProjectAirBomber
buttonRight.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
buttonRight.BackgroundImage = Properties.Resources.arrowRight;
buttonRight.BackgroundImageLayout = ImageLayout.Stretch;
- buttonRight.Location = new Point(869, 550);
+ buttonRight.Location = new Point(866, 550);
buttonRight.Name = "buttonRight";
buttonRight.Size = new Size(35, 35);
buttonRight.TabIndex = 5;
@@ -123,7 +123,7 @@ namespace ProjectAirBomber
//
AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleMode = AutoScaleMode.Font;
- ClientSize = new Size(923, 597);
+ ClientSize = new Size(920, 597);
Controls.Add(buttonStrategyStep);
Controls.Add(comboBoxStrategy);
Controls.Add(buttonRight);
diff --git a/ProjectAirBomber/ProjectAirBomber/FormAirBomber.cs b/ProjectAirBomber/ProjectAirBomber/FormAirBomber.cs
index 0bb923b..794387c 100644
--- a/ProjectAirBomber/ProjectAirBomber/FormAirBomber.cs
+++ b/ProjectAirBomber/ProjectAirBomber/FormAirBomber.cs
@@ -17,7 +17,7 @@ public partial class FormAirBomber : Form
///
private AbstractStrategy? _strategy;
-
+
///
/// Получение объекта
///
diff --git a/ProjectAirBomber/ProjectAirBomber/FormBomberCollection.Designer.cs b/ProjectAirBomber/ProjectAirBomber/FormBomberCollection.Designer.cs
index 8b07e99..9a248d7 100644
--- a/ProjectAirBomber/ProjectAirBomber/FormBomberCollection.Designer.cs
+++ b/ProjectAirBomber/ProjectAirBomber/FormBomberCollection.Designer.cs
@@ -51,9 +51,9 @@
groupBoxTools.Controls.Add(buttonAddBomber);
groupBoxTools.Controls.Add(comboBoxSelectorCompany);
groupBoxTools.Dock = DockStyle.Right;
- groupBoxTools.Location = new Point(773, 0);
+ groupBoxTools.Location = new Point(840, 0);
groupBoxTools.Name = "groupBoxTools";
- groupBoxTools.Size = new Size(268, 666);
+ groupBoxTools.Size = new Size(268, 835);
groupBoxTools.TabIndex = 0;
groupBoxTools.TabStop = false;
groupBoxTools.Text = "Инструменты";
@@ -139,7 +139,7 @@
pictureBox.Dock = DockStyle.Fill;
pictureBox.Location = new Point(0, 0);
pictureBox.Name = "pictureBox";
- pictureBox.Size = new Size(773, 666);
+ pictureBox.Size = new Size(840, 835);
pictureBox.TabIndex = 1;
pictureBox.TabStop = false;
//
@@ -147,7 +147,7 @@
//
AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleMode = AutoScaleMode.Font;
- ClientSize = new Size(1041, 666);
+ ClientSize = new Size(1108, 835);
Controls.Add(pictureBox);
Controls.Add(groupBoxTools);
Name = "FormBomberCollection";