Поправки

This commit is contained in:
artemkudinov14 2024-04-12 12:51:03 +04:00
parent fd59798ec8
commit f34fdd5a68
5 changed files with 23 additions and 26 deletions

View File

@ -16,7 +16,7 @@ public abstract class AbstractCompany
/// <summary> /// <summary>
/// Размер места (ширина) /// Размер места (ширина)
/// </summary> /// </summary>
protected readonly int _placeSizeWidth = 210; protected readonly int _placeSizeWidth = 180;
/// <summary> /// <summary>
/// Размер места (высота) /// Размер места (высота)
@ -34,7 +34,7 @@ public abstract class AbstractCompany
protected readonly int _pictureHeight; protected readonly int _pictureHeight;
/// <summary> /// <summary>
/// Коллекция Локомотив /// Коллекция Локомотивов
/// </summary> /// </summary>
protected ICollectionGenericObjects<DrawningLocomotive>? _collection = null; protected ICollectionGenericObjects<DrawningLocomotive>? _collection = null;
@ -48,7 +48,7 @@ public abstract class AbstractCompany
/// </summary> /// </summary>
/// <param name="picWidth">Ширина окна</param> /// <param name="picWidth">Ширина окна</param>
/// <param name="picHeight">Высота окна</param> /// <param name="picHeight">Высота окна</param>
/// <param name="collection">Коллекция Локомотив</param> /// <param name="collection">Коллекция локомотивов</param>
public AbstractCompany(int picWidth, int picHeight, ICollectionGenericObjects<DrawningLocomotive> collection) public AbstractCompany(int picWidth, int picHeight, ICollectionGenericObjects<DrawningLocomotive> collection)
{ {
_pictureWidth = picWidth; _pictureWidth = picWidth;

View File

@ -47,4 +47,4 @@ public interface ICollectionGenericObjects<T>
/// <param name="position">Позиция</param> /// <param name="position">Позиция</param>
/// <returns>Объект</returns> /// <returns>Объект</returns>
T? Get(int position); T? Get(int position);
} }

View File

@ -41,22 +41,15 @@ public class LocomotiveSharingService : AbstractCompany
protected override void SetObjectsPosition() protected override void SetObjectsPosition()
{ {
int posX = 0; int count = 0;
int posY = _pictureHeight / _placeSizeHeight - 1; for (int y = 5; y + 50 < _pictureHeight; y += 83)
for (int i = 0; i < _collection?.Count; i++)
{ {
if (_collection.Get(i) != null) for (int x = 5; x + 200 < _pictureWidth; x += _placeSizeHeight + 100)
{ {
_collection?.Get(i)?.SetPictureSize(_pictureWidth, _pictureHeight); _collection?.Get(count)?.SetPictureSize(_pictureWidth, _pictureHeight);
_collection?.Get(i)?.SetPosition(posX * _placeSizeWidth + 3, posY * _placeSizeHeight + 3); _collection?.Get(count)?.SetPosition(x, y);
count++;
} }
posY--;
if (posY < 0)
{
posY = _pictureHeight / _placeSizeHeight - 1;
posX++;
}
if (posX >= _pictureWidth / _placeSizeWidth) { return; }
} }
} }

View File

@ -132,6 +132,7 @@
comboBoxSelectorCompany.Name = "comboBoxSelectorCompany"; comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
comboBoxSelectorCompany.Size = new Size(219, 28); comboBoxSelectorCompany.Size = new Size(219, 28);
comboBoxSelectorCompany.TabIndex = 0; comboBoxSelectorCompany.TabIndex = 0;
comboBoxSelectorCompany.SelectedIndexChanged += comboBoxSelectorCompany_SelectedIndexChanged;
// //
// pictureBox // pictureBox
// //

View File

@ -12,15 +12,13 @@ using System.Windows.Forms;
namespace Diesellocomotive; namespace Diesellocomotive;
/// <summary>
///
/// </summary>
public partial class FormLocomotiveCollection : Form public partial class FormLocomotiveCollection : Form
{ {
/// <summary> /// <summary>
/// /// Компания
/// </summary> /// </summary>
private AbstractCompany? _company = null; private AbstractCompany? _company = null;
/// <summary> /// <summary>
/// Конструктор /// Конструктор
/// </summary> /// </summary>
@ -30,11 +28,11 @@ public partial class FormLocomotiveCollection : Form
} }
/// <summary> /// <summary>
/// /// Выбор компании
/// </summary> /// </summary>
/// <param name="sender"></param> /// <param name="sender"></param>
/// <param name="e"></param> /// <param name="e"></param>
private void ComboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e) private void comboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e)
{ {
switch (comboBoxSelectorCompany.Text) switch (comboBoxSelectorCompany.Text)
{ {
@ -44,7 +42,7 @@ public partial class FormLocomotiveCollection : Form
} }
} }
// <summary> /// <summary>
/// Добавление Локомотива /// Добавление Локомотива
/// </summary> /// </summary>
/// <param name="sender"></param> /// <param name="sender"></param>
@ -52,7 +50,7 @@ public partial class FormLocomotiveCollection : Form
private void buttonAddLocomotive_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningLocomotive)); private void buttonAddLocomotive_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningLocomotive));
/// <summary> /// <summary>
/// Добавление Монорельса /// Добавление Теплохода
/// </summary> /// </summary>
/// <param name="sender"></param> /// <param name="sender"></param>
/// <param name="e"></param> /// <param name="e"></param>
@ -77,7 +75,6 @@ public partial class FormLocomotiveCollection : Form
drawningLocomotive = new DrawningLocomotive(random.Next(100, 300), random.Next(1000, 3000), GetColor(random)); drawningLocomotive = new DrawningLocomotive(random.Next(100, 300), random.Next(1000, 3000), GetColor(random));
break; break;
case nameof(DrawningDiesellocomotive): case nameof(DrawningDiesellocomotive):
// TODO выбор цветов
drawningLocomotive = new DrawningDiesellocomotive(random.Next(100, 300), random.Next(1000, 3000), drawningLocomotive = new DrawningDiesellocomotive(random.Next(100, 300), random.Next(1000, 3000),
GetColor(random), GetColor(random), GetColor(random), GetColor(random),
Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2))); Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
@ -96,6 +93,7 @@ public partial class FormLocomotiveCollection : Form
} }
} }
/// <summary> /// <summary>
/// Получение цвета /// Получение цвета
/// </summary> /// </summary>
@ -113,6 +111,10 @@ public partial class FormLocomotiveCollection : Form
return color; return color;
} }
/// <summary> /// <summary>
/// Удаление объекта /// Удаление объекта
/// </summary> /// </summary>
@ -144,6 +146,7 @@ public partial class FormLocomotiveCollection : Form
} }
/// <summary> /// <summary>
/// Передача объекта в другую форму /// Передача объекта в другую форму
/// </summary> /// </summary>