chubykina_polina/PIbd-22_Chubykina_P.P._Sailboat_Base
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PIbd-22 Chubykina P.P. LabWork_05 #8

Closed
chubykina_polina wants to merge 9 commits from LabWork_05 into LabWork_04
pull from: LabWork_05
merge into: chubykina_polina:LabWork_04
Conversation 1 Commits 9 Files Changed 8 +7 -23
5 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7451b27628 - Show all commits

14
Sailboat/Sailboat/DrawingBoat.cs
View File

@ -144,20 +144,6 @@ namespace Sailboat.DrawingObjects
g.DrawEllipse(pen, _startPosX + 20, _startPosY + 100, 90, 40);
}
public void SetColor(Color color)
{
if (EntityBoat == null)
{
return;
}
EntityBoat.BodyColor = color;
}
public void ChangePictureBoxSize(int pictureBoxWidth, int pictureBoxHeight)
{
_pictureWidth = pictureBoxWidth;
_pictureHeight = pictureBoxHeight;
}
}
}

5
Sailboat/Sailboat/DrawingSailboat.cs
View File

@ -64,10 +64,5 @@ namespace Sailboat.DrawingObjects
g.DrawLine(pen, new Point(_startPosX + 65, _startPosY + 120), new Point(_startPosX + 65, _startPosY));
}
}
public void SetAddColor(Color color)
{
((EntitySailboat)EntityBoat).AdditionalColor = color;
}
}
}

3
Sailboat/Sailboat/EntityBoat.cs
View File

@ -10,7 +10,8 @@ namespace Sailboat.Entities
{
public int Speed { get; private set; }
public double Weight { get; private set; }
public Color BodyColor { get; set; }
public Color BodyColor { get; private set; }
public void setBodyColor(Color color) { BodyColor = color; }
public double Step => (double)Speed * 100 / Weight;
public EntityBoat(int speed, double weight, Color bodyColor)
{

3
Sailboat/Sailboat/EntitySailboat.cs
View File

@ -8,7 +8,8 @@ namespace Sailboat.Entities
{
public class EntitySailboat : EntityBoat
{
public Color AdditionalColor { get; set; }
public Color AdditionalColor { get; private set; }
public void setAdditionalColor(Color color) { AdditionalColor = color; }
public bool Hull { get; private set; }
public bool Sail { get; private set; }
public EntitySailboat(int speed, double weight, Color bodyColor, Color

5
Sailboat/Sailboat/FormBoatConfig.cs
View File

@ -11,6 +11,7 @@ using System.Windows.Forms;
using Sailboat.DrawingObjects;
using Sailboat.Generics;
using Sailboat.MovementStrategy;
using Sailboat.Entities;
namespace Sailboat
{
@ -100,12 +101,12 @@ namespace Sailboat
switch (((Label)sender).Name)
{
case "labelColor":
_boat.SetColor((Color)e.Data.GetData(typeof(Color)));
_boat.EntityBoat.setBodyColor((Color)e.Data.GetData(typeof(Color)));
break;
case "labelAddColor":
if (!(_boat is DrawingSailboat))
return;
(_boat as DrawingSailboat).SetAddColor((Color)e.Data.GetData(typeof(Color)));
(_boat.EntityBoat as EntitySailboat).setAdditionalColor((Color)e.Data.GetData(typeof(Color)));
break;
}
DrawBoat();