From 123978bbf80be4dd2124a953d033558ea61d60de Mon Sep 17 00:00:00 2001 From: Sergey Kozyrev Date: Fri, 17 Nov 2023 19:29:08 +0400 Subject: [PATCH] NameUpdate --- Lab/ExtentionDrawingTanker.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Lab/ExtentionDrawingTanker.cs b/Lab/ExtentionDrawingTanker.cs index 7c37740..05a42b5 100644 --- a/Lab/ExtentionDrawingTanker.cs +++ b/Lab/ExtentionDrawingTanker.cs @@ -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}"; } }