eegov/Group-10_LastName_F.P._Simple
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

слияние

Browse Source
This commit is contained in:
Evgeny Egov 2024-01-06 19:38:01 +04:00
commit 936eda3a52
Failed to extract signature
7 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ProjectSportCar/ProjectSportCar/CollectionGenericObjects/CarSharingService.cs
View File

@ -2,8 +2,17 @@
namespace ProjectSportCar.CollectionGenericObjects; namespace ProjectSportCar.CollectionGenericObjects;
/// <summary>
/// Реализация абстрактной компании - каршеринг
/// </summary>
public class CarSharingService : AbstractCompany public class CarSharingService : AbstractCompany
{ {
/// <summary>
/// Конструктор
/// </summary>
/// <param name="picWidth"></param>
/// <param name="picHeight"></param>
/// <param name="collection"></param>
public CarSharingService(int picWidth, int picHeight, ICollectionGenericObjects<DrawningCar> collection) : base(picWidth, picHeight, collection) public CarSharingService(int picWidth, int picHeight, ICollectionGenericObjects<DrawningCar> collection) : base(picWidth, picHeight, collection)
{ {
} }

2
ProjectSportCar/ProjectSportCar/Entities/EntityCar.cs
View File

@ -38,6 +38,8 @@ public class EntityCar
BodyColor = bodyColor; BodyColor = bodyColor;
} }
//TODO Прописать метод
/// <summary> /// <summary>
/// Получение строк со значениями свойств объекта класса-сущности /// Получение строк со значениями свойств объекта класса-сущности
/// </summary> /// </summary>

6
ProjectSportCar/ProjectSportCar/Entities/EntitySportCar.cs
View File

@ -26,7 +26,7 @@ public class EntitySportCar : EntityCar
public bool SportLine { get; private set; } public bool SportLine { get; private set; }
/// <summary> /// <summary>
/// Инициализация полей объекта-класса спортивного автомобиля /// Конструктор сущности
/// </summary> /// </summary>
/// <param name="speed">Скорость</param> /// <param name="speed">Скорость</param>
/// <param name="weight">Вес автомобиля</param> /// <param name="weight">Вес автомобиля</param>
@ -35,11 +35,13 @@ public class EntitySportCar : EntityCar
/// <param name="bodyKit">Признак наличия обвеса</param> /// <param name="bodyKit">Признак наличия обвеса</param>
/// <param name="wing">Признак наличия антикрыла</param> /// <param name="wing">Признак наличия антикрыла</param>
/// <param name="sportLine">Признак наличия гоночной полосы</param> /// <param name="sportLine">Признак наличия гоночной полосы</param>
public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool bodyKit, bool wing, bool sportLine) public EntitySportCar(int speed, double weight, Color bodyColor, Color additionalColor, bool bodyKit, bool wing, bool sportLine) : base(0, 0, Color.Black)
{ {
AdditionalColor = additionalColor; AdditionalColor = additionalColor;
BodyKit = bodyKit; BodyKit = bodyKit;
Wing = wing; Wing = wing;
SportLine = sportLine; SportLine = sportLine;
} }
//TODO Прописать метод
} }

2
ProjectSportCar/ProjectSportCar/FormCarCollection.cs
View File

@ -53,7 +53,7 @@ public partial class FormCarCollection : Form
/// Добавление автомобиля в коллекцию /// Добавление автомобиля в коллекцию
/// </summary> /// </summary>
/// <param name="car"></param> /// <param name="car"></param>
private void SetCar(DrawningCar car) private void SetCar(DrawningCar? car)
{ {
if (_company == null || car == null) if (_company == null || car == null)
{ {

18
ProjectSportCar/ProjectSportCar/FormCarConfig.Designer.cs generated
View File

@ -33,7 +33,7 @@
panelPurple = new Panel(); panelPurple = new Panel();
panelYellow = new Panel(); panelYellow = new Panel();
panelBlack = new Panel(); panelBlack = new Panel();
panelGrey = new Panel(); panelGray = new Panel();
panelBlue = new Panel(); panelBlue = new Panel();
panelWhite = new Panel(); panelWhite = new Panel();
panelGreen = new Panel(); panelGreen = new Panel();
@ -86,7 +86,7 @@
groupBoxColors.Controls.Add(panelPurple); groupBoxColors.Controls.Add(panelPurple);
groupBoxColors.Controls.Add(panelYellow); groupBoxColors.Controls.Add(panelYellow);
groupBoxColors.Controls.Add(panelBlack); groupBoxColors.Controls.Add(panelBlack);
groupBoxColors.Controls.Add(panelGrey); groupBoxColors.Controls.Add(panelGray);
groupBoxColors.Controls.Add(panelBlue); groupBoxColors.Controls.Add(panelBlue);
groupBoxColors.Controls.Add(panelWhite); groupBoxColors.Controls.Add(panelWhite);
groupBoxColors.Controls.Add(panelGreen); groupBoxColors.Controls.Add(panelGreen);
@ -122,13 +122,13 @@
panelBlack.Size = new Size(34, 34); panelBlack.Size = new Size(34, 34);
panelBlack.TabIndex = 4; panelBlack.TabIndex = 4;
// //
// panelGrey // panelGray
// //
panelGrey.BackColor = Color.Gray; panelGray.BackColor = Color.Gray;
panelGrey.Location = new Point(67, 66); panelGray.Location = new Point(67, 66);
panelGrey.Name = "panelGrey"; panelGray.Name = "panelGray";
panelGrey.Size = new Size(34, 34); panelGray.Size = new Size(34, 34);
panelGrey.TabIndex = 5; panelGray.TabIndex = 5;
// //
// panelBlue // panelBlue
// //
@ -349,7 +349,7 @@
private Panel panelPurple; private Panel panelPurple;
private Panel panelYellow; private Panel panelYellow;
private Panel panelBlack; private Panel panelBlack;
private Panel panelGrey; private Panel panelGray;
private Panel panelBlue; private Panel panelBlue;
private Panel panelWhite; private Panel panelWhite;
private Panel panelGreen; private Panel panelGreen;

4
ProjectSportCar/ProjectSportCar/FormCarConfig.cs
View File

@ -27,7 +27,7 @@ public partial class FormCarConfig : Form
panelBlue.MouseDown += Panel_MouseDown; panelBlue.MouseDown += Panel_MouseDown;
panelYellow.MouseDown += Panel_MouseDown; panelYellow.MouseDown += Panel_MouseDown;
panelWhite.MouseDown += Panel_MouseDown; panelWhite.MouseDown += Panel_MouseDown;
panelGrey.MouseDown += Panel_MouseDown; panelGray.MouseDown += Panel_MouseDown;
panelBlack.MouseDown += Panel_MouseDown; panelBlack.MouseDown += Panel_MouseDown;
panelPurple.MouseDown += Panel_MouseDown; panelPurple.MouseDown += Panel_MouseDown;
@ -52,7 +52,7 @@ public partial class FormCarConfig : Form
Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height); Bitmap bmp = new(pictureBoxObject.Width, pictureBoxObject.Height);
Graphics gr = Graphics.FromImage(bmp); Graphics gr = Graphics.FromImage(bmp);
_car?.SetPictureSize(pictureBoxObject.Width, pictureBoxObject.Height); _car?.SetPictureSize(pictureBoxObject.Width, pictureBoxObject.Height);
_car?.SetPosition(5, 5); _car?.SetPosition(15, 15);
_car?.DrawTransport(gr); _car?.DrawTransport(gr);
pictureBoxObject.Image = bmp; pictureBoxObject.Image = bmp;
} }

2
ProjectSportCar/ProjectSportCar/FormSportCar.cs
View File

@ -59,7 +59,7 @@ public partial class FormSportCar : Form
} }
/// <summary> /// <summary>
/// Перемешение объекта по форме (нажатие кнопок навигации) /// Перемещение объекта по форме (нажатие кнопок навигации)
/// </summary> /// </summary>
/// <param name="sender"></param> /// <param name="sender"></param>
/// <param name="e"></param> /// <param name="e"></param>