safiulova.k/PIbd-22_Safiulova_K.N._Catamaran._BASE
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

лаба 2 точно точно готовая

Browse Source
This commit is contained in:
Камилия Сафиулова 2023-10-23 21:05:23 +04:00
parent 4ccd1c4123
commit b19ff39870
3 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
base/Catamaran/Catamaran/AbstractStrategy.cs
View File

@ -5,7 +5,6 @@ using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using Catamaran.MovementStrategy; using Catamaran.MovementStrategy;
//using Catamaran.DrawningObjects;
namespace Catamaran.MovementStrategy namespace Catamaran.MovementStrategy
{ {

2
base/Catamaran/Catamaran/DrawningCatamaran.cs
View File

@ -80,7 +80,6 @@ namespace Catamaran.DrawningObjects
return; return;
} }
} }
/// <summary> /// <summary>
/// Конструктор /// Конструктор
/// </summary> /// </summary>
@ -91,7 +90,6 @@ namespace Catamaran.DrawningObjects
/// <param name="height">Высота картинки</param> /// <param name="height">Высота картинки</param>
/// <param name="catamaranWidth">Ширина прорисовки катамарана</param> /// <param name="catamaranWidth">Ширина прорисовки катамарана</param>
/// <param name="catamaranHeight">Высота прорисовки катамарана</param> /// <param name="catamaranHeight">Высота прорисовки катамарана</param>
/// <returns>true - объект создан, false - проверка не пройдена, нельзя создать объект в этих размерах</returns> /// <returns>true - объект создан, false - проверка не пройдена, нельзя создать объект в этих размерах</returns>
protected DrawningCatamaran(int speed, double weight, Color bodyColor, int width, int height, int catamaranWidth, int catamaranHeight) protected DrawningCatamaran(int speed, double weight, Color bodyColor, int width, int height, int catamaranWidth, int catamaranHeight)
{ {

4
base/Catamaran/Catamaran/DrawningSailCatamaran.cs
View File

@ -23,7 +23,6 @@ namespace Catamaran.DrawningObjects
/// <param name="floatDetail">Признак наличия поплавков</param> /// <param name="floatDetail">Признак наличия поплавков</param>
/// <param name="width">Ширина картинки</param> /// <param name="width">Ширина картинки</param>
/// <param name="height">Высота картинки</param> /// <param name="height">Высота картинки</param>
public DrawningSailCatamaran(int speed, double weight, Color bodyColor, Color public DrawningSailCatamaran(int speed, double weight, Color bodyColor, Color
additionalColor, bool sail, bool floatDetail, int width, int height) : additionalColor, bool sail, bool floatDetail, int width, int height) :
base(speed, weight, bodyColor, width, height, 190, 120) base(speed, weight, bodyColor, width, height, 190, 120)
@ -44,7 +43,6 @@ namespace Catamaran.DrawningObjects
Brush additionalBrush = new Brush additionalBrush = new
SolidBrush(sailCatamaran.AdditionalColor); SolidBrush(sailCatamaran.AdditionalColor);
//поплавки //поплавки
if (sailCatamaran.FloatDetail) if (sailCatamaran.FloatDetail)
{ {
@ -70,6 +68,7 @@ namespace Catamaran.DrawningObjects
g.DrawPolygon(pen, floatDetail2); g.DrawPolygon(pen, floatDetail2);
} }
base.DrawTransport(g); base.DrawTransport(g);
//парус //парус
if (sailCatamaran.Sail) if (sailCatamaran.Sail)
{ {
@ -78,7 +77,6 @@ namespace Catamaran.DrawningObjects
new Point(_startPosX + 30, _startPosY + 80), new Point(_startPosX + 30, _startPosY + 80),
new Point(_startPosX + 70, _startPosY+10), new Point(_startPosX + 70, _startPosY+10),
new Point(_startPosX + 145, _startPosY + 80), new Point(_startPosX + 145, _startPosY + 80),
}; };
g.DrawPolygon(pen, sail); g.DrawPolygon(pen, sail);
g.FillPolygon(additionalBrush, sail); g.FillPolygon(additionalBrush, sail);