Serxionaft/PIbd-21_KozyrevSS_GasolineTanker_Base
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Laba6 KozyrevSS PIbd-21 GasolineTanker Base #7

Closed
Serxionaft wants to merge 4 commits from Laba6 into Laba5
pull from: Laba6
merge into: Serxionaft:Laba5
Conversation 1 Commits 4 Files Changed 8 +5 -5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 123978bbf8 - Show all commits

10
Lab/ExtentionDrawingTanker.cs
View File

@ -16,14 +16,14 @@ namespace Lab
if (strs.Length == 3)
{
return new DrawTanker(Convert.ToInt32(strs[0]),
Convert.ToInt32(strs[1]), Color.FromName(strs[2].Replace("Color [", "").Replace("]", "")), width, height);
Convert.ToInt32(strs[1]), Color.FromName(strs[2]), width, height);
}
if (strs.Length == 7)
{
return new DrawGasolineTanker(Convert.ToInt32(strs[0]),
Convert.ToInt32(strs[1]),
Color.FromName(strs[2].Replace("Color [", "").Replace("]","")),
Color.FromName(strs[3].Replace("Color [", "").Replace("]","")),
Color.FromName(strs[2]),
Color.FromName(strs[3]),
Convert.ToBoolean(strs[4]),
Convert.ToBoolean(strs[5]),
Convert.ToBoolean(strs[6]), width, height);
@ -38,12 +38,12 @@ namespace Lab
{
return string.Empty;
}
var str = $"{Tanker.Speed}{separatorForObject}{Tanker.Weight}{separatorForObject}{Tanker.BodyColor}";
var str = $"{Tanker.Speed}{separatorForObject}{Tanker.Weight}{separatorForObject}{Tanker.BodyColor.Name}";
if (Tanker is not GasolineTanker gasTanker)
{
return str;
}
return $"{str}{separatorForObject}{gasTanker.AdditionalColor}{separatorForObject}{gasTanker.BodyKit}{separatorForObject}{gasTanker.Wing}{separatorForObject}{gasTanker.SportLine}";
return $"{str}{separatorForObject}{gasTanker.AdditionalColor.Name}{separatorForObject}{gasTanker.BodyKit}{separatorForObject}{gasTanker.Wing}{separatorForObject}{gasTanker.SportLine}";
}
}