Kristina/ISEbd-22_Musatkina_K._Y._Speedboat_Base
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

зафиксировать

Browse Source
This commit is contained in:
Учебный 2023-11-26 17:32:02 +04:00
parent a59a70a69b
commit e90db55dcc
5 changed files with 29 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ProjectBoat_base/ProjectBoat_bae/DrawningObjects/DrawningBoat.cs
View File

@ -33,10 +33,10 @@ namespace ProjectBoat_bae.DrawningObjects
protected int _startPosY; protected int _startPosY;
// Ширина прорисовки // Ширина прорисовки
protected readonly int _boatWidth = 80; protected readonly int _boatWidth = 70;
// Высота прорисовки // Высота прорисовки
protected readonly int _boatHeight = 50; protected readonly int _boatHeight = 40;
public int GetPosX => _startPosX; public int GetPosX => _startPosX;
public int GetPosY => _startPosY; public int GetPosY => _startPosY;
@ -88,18 +88,17 @@ namespace ProjectBoat_bae.DrawningObjects
Pen pen = new(Color.Black); Pen pen = new(Color.Black);
//корпус //корпус
Brush br = new SolidBrush(EntityBoat.BodyColor); Brush br = new SolidBrush(EntityBoat.BodyColor);
g.FillRectangle(br, _startPosX + 20, _startPosY + 5, 100, 50); g.FillRectangle(br, _startPosX + 20, _startPosY + 65, 80, 50);
//мотор //мотор
Brush brRed = new SolidBrush(EntityBoat.BodyColor); Brush brRed = new SolidBrush(EntityBoat.BodyColor);
g.FillEllipse(brRed, _startPosX + 7, _startPosY + 12, 35, 35); g.FillEllipse(brRed, _startPosX + 7, _startPosY + 72, 35, 35);
//стекла //стекла
Brush brBlue = new SolidBrush(Color.LightBlue); Brush brBlue = new SolidBrush(Color.LightBlue);
g.FillRectangle(brBlue, _startPosX + 115, _startPosY + 10, 5, g.FillRectangle(brBlue, _startPosX + 95, _startPosY + 67, 5, 45);
40); g.FillRectangle(brBlue, _startPosX + 45, _startPosY + 67, 55, 2);
g.FillRectangle(brBlue, _startPosX + 65, _startPosY + 8, 55, 2); g.FillRectangle(brBlue, _startPosX + 45, _startPosY + 111, 55, 2);
g.FillRectangle(brBlue, _startPosX + 65, _startPosY + 51, 55, 2);
} }
// Проверка, что объект может переместится по указанному направлению // Проверка, что объект может переместится по указанному направлению

25
ProjectBoat_base/ProjectBoat_bae/DrawningObjects/DrawningMotorBoat.cs
View File

@ -32,6 +32,7 @@ namespace ProjectBoat_bae.DrawningObjects
{ {
return; return;
} }
Point[] points;
Pen pen = new(Color.Black); Pen pen = new(Color.Black);
Brush additionalBrush = new SolidBrush(Boat.AdditionalColor); Brush additionalBrush = new SolidBrush(Boat.AdditionalColor);
Brush brr = new SolidBrush(EntityBoat.BodyColor); Brush brr = new SolidBrush(EntityBoat.BodyColor);
@ -39,26 +40,18 @@ namespace ProjectBoat_bae.DrawningObjects
if (Boat.Wing) if (Boat.Wing)
{ {
//вёсла //вёсла
g.FillRectangle(additionalBrush, _startPosX + 35, _startPosY - 5, 5, 65); g.FillRectangle(additionalBrush, _startPosX + 35, _startPosY + 40, 5, 100);
g.FillRectangle(additionalBrush, _startPosX + 28, _startPosY + 60, 12, 8); g.FillRectangle(additionalBrush, _startPosX + 28, _startPosY + 40, 12, 8);
g.FillRectangle(additionalBrush, _startPosX + 28, _startPosY - 5, 12, 8); g.FillRectangle(additionalBrush, _startPosX + 28, _startPosY + 135, 12, 8);
} }
//флажок base.DrawTransport(g);
Point[] points;
//кресла
if (Boat.Body) if (Boat.Body)
{ {
points = new Point[] g.FillRectangle(additionalBrush, _startPosX + 58, _startPosY + 70, 25, 40);
{ }
new Point(Convert.ToInt32(_startPosX+70),Convert.ToInt32(_startPosY-20)),
new Point(Convert.ToInt32(_startPosX+70),Convert.ToInt32(_startPosY+10)),
new Point(Convert.ToInt32(_startPosX+90),Convert.ToInt32(_startPosY)),
new Point(Convert.ToInt32(_startPosX+90),Convert.ToInt32(_startPosY-20)),
};
g.FillPolygon(additionalBrush, points);
g.DrawPolygon(pen, points);
}
base.DrawTransport(g);
} }
} }
} }

2
ProjectBoat_base/ProjectBoat_bae/ExtentionBoat.cs
View File

@ -16,7 +16,7 @@ namespace ProjectBoat_bae
private static readonly char _separatorForObject = ':'; private static readonly char _separatorForObject = ':';
// Создание объекта из строки // Создание объекта из строки
public static Drawningboat CreateDrawningBoat(this string info, char _separatorForObject, int _pictureWidth) public static Drawningboat CreateDrawningBoat(this string info, char _separatorForObject, int _pictureWidth, int _pictureHeight)
{ {
string[] strs = info.Split(_separatorForObject); string[] strs = info.Split(_separatorForObject);
if (strs.Length == 3) if (strs.Length == 3)

12
ProjectBoat_base/ProjectBoat_bae/FormBoatConfig.Designer.cs generated
View File

@ -64,9 +64,9 @@
// //
// pictureBoxObject // pictureBoxObject
// //
pictureBoxObject.Location = new Point(38, 76); pictureBoxObject.Location = new Point(38, 30);
pictureBoxObject.Name = "pictureBoxObject"; pictureBoxObject.Name = "pictureBoxObject";
pictureBoxObject.Size = new Size(388, 282); pictureBoxObject.Size = new Size(388, 328);
pictureBoxObject.TabIndex = 0; pictureBoxObject.TabIndex = 0;
pictureBoxObject.TabStop = false; pictureBoxObject.TabStop = false;
// //
@ -237,9 +237,9 @@
checkBoxBoat.AutoSize = true; checkBoxBoat.AutoSize = true;
checkBoxBoat.Location = new Point(21, 176); checkBoxBoat.Location = new Point(21, 176);
checkBoxBoat.Name = "checkBoxBoat"; checkBoxBoat.Name = "checkBoxBoat";
checkBoxBoat.Size = new Size(246, 29); checkBoxBoat.Size = new Size(240, 29);
checkBoxBoat.TabIndex = 6; checkBoxBoat.TabIndex = 6;
checkBoxBoat.Text = "Признак наличия флажка"; checkBoxBoat.Text = "Признак наличия кресел";
checkBoxBoat.UseVisualStyleBackColor = true; checkBoxBoat.UseVisualStyleBackColor = true;
// //
// Weight // Weight
@ -279,7 +279,7 @@
LabelAdditionalColor.AllowDrop = true; LabelAdditionalColor.AllowDrop = true;
LabelAdditionalColor.AutoSize = true; LabelAdditionalColor.AutoSize = true;
LabelAdditionalColor.BorderStyle = BorderStyle.FixedSingle; LabelAdditionalColor.BorderStyle = BorderStyle.FixedSingle;
LabelAdditionalColor.Location = new Point(333, 38); LabelAdditionalColor.Location = new Point(333, 0);
LabelAdditionalColor.Name = "LabelAdditionalColor"; LabelAdditionalColor.Name = "LabelAdditionalColor";
LabelAdditionalColor.Size = new Size(93, 27); LabelAdditionalColor.Size = new Size(93, 27);
LabelAdditionalColor.TabIndex = 1; LabelAdditionalColor.TabIndex = 1;
@ -292,7 +292,7 @@
LabelColor.AllowDrop = true; LabelColor.AllowDrop = true;
LabelColor.AutoSize = true; LabelColor.AutoSize = true;
LabelColor.BorderStyle = BorderStyle.FixedSingle; LabelColor.BorderStyle = BorderStyle.FixedSingle;
LabelColor.Location = new Point(38, 38); LabelColor.Location = new Point(38, 0);
LabelColor.Name = "LabelColor"; LabelColor.Name = "LabelColor";
LabelColor.Size = new Size(53, 27); LabelColor.Size = new Size(53, 27);
LabelColor.TabIndex = 0; LabelColor.TabIndex = 0;

6
ProjectBoat_base/ProjectBoat_bae/Generics/BoatsGenericCollection.cs
View File

@ -20,10 +20,10 @@ namespace ProjectBoat_bae.Generics
/// <summary> /// <summary>
/// Размер занимаемого объектом места (ширина) /// Размер занимаемого объектом места (ширина)
/// </summary> /// </summary>
private readonly int _placeSizeWidth = 100; private readonly int _placeSizeWidth = 150;
// Размер занимаемого объектом места (высота) // Размер занимаемого объектом места (высота)
private readonly int _placeSizeHeight = 70; private readonly int _placeSizeHeight = 150;
// Набор объектов // Набор объектов
private readonly SetGeneric<T> _collection; private readonly SetGeneric<T> _collection;
@ -110,6 +110,6 @@ namespace ProjectBoat_bae.Generics
} }
// Получение объектов коллекции // Получение объектов коллекции
public IEnumerable<T?> GetCars => _collection.GetBoats(); public IEnumerable<T?> GetBoats => _collection.GetBoats();
} }
} }