Artem_Kudinov/ISE-11_Kudinov_A._A._Simple
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Поправки

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ProjectSportCar/ProjectSportCar/CollectionGenericObjects/AbstractCompany.cs
View File

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

2
ProjectSportCar/ProjectSportCar/CollectionGenericObjects/ICollectionGenericObjects.cs
View File

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

19
ProjectSportCar/ProjectSportCar/CollectionGenericObjects/LocomotiveSharingService.cs
View File

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

1
ProjectSportCar/ProjectSportCar/FormLocomotiveCollection.Designer.cs generated
View File

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

21
ProjectSportCar/ProjectSportCar/FormLocomotiveCollection.cs
View File

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