From 2289df20f305b3593ced81589aa50011dae5adf3 Mon Sep 17 00:00:00 2001 From: avpon Date: Mon, 5 Dec 2022 17:37:21 +0300 Subject: [PATCH] =?UTF-8?q?=D1=80=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?= =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AcadToSMath/AcadToSMath.cs | 48 +++++++++++++++++++++++++++++++------- 1 file changed, 40 insertions(+), 8 deletions(-) diff --git a/AcadToSMath/AcadToSMath.cs b/AcadToSMath/AcadToSMath.cs index b61a576..1fb2813 100644 --- a/AcadToSMath/AcadToSMath.cs +++ b/AcadToSMath/AcadToSMath.cs @@ -142,7 +142,11 @@ namespace AcadToSMath string lay = "#"; double scale = 1; int isClose = 0; - if (TermsConverter.DecodeText(value.Items[0].Text).Trim('"') != "#") lay = TermsConverter.DecodeText(value.Items[0].Text).Trim('"'); + if (TermsConverter.DecodeText(value.Items[0].Text).Trim('"') != "#") + { + Entry arg = Computation.Preprocessing(value.Items[0], context); + lay = TermsConverter.DecodeText(arg.Text).Trim('"'); + } if (TermsConverter.DecodeText(value.Items[1].Text).Trim('"') != "#") scale = Utilites.Entry2Double(value.Items[1], context); if (TermsConverter.DecodeText(value.Items[2].Text).Trim('"') != "#") isClose = Utilites.Entry2Int(value.Items[2], context); @@ -246,7 +250,11 @@ namespace AcadToSMath string lay = "#"; double scale = 1; - if (TermsConverter.DecodeText(value.Items[0].Text).Trim('"') != "#") lay = TermsConverter.DecodeText(value.Items[0].Text).Trim('"'); + if (TermsConverter.DecodeText(value.Items[0].Text).Trim('"') != "#") + { + Entry arg = Computation.Preprocessing(value.Items[0], context); + lay = TermsConverter.DecodeText(arg.Text).Trim('"'); + } if (TermsConverter.DecodeText(value.Items[1].Text).Trim('"') != "#") scale = Utilites.Entry2Double(value.Items[1], context); @@ -331,7 +339,11 @@ namespace AcadToSMath string lay = "#"; double scale = 1; - if (TermsConverter.DecodeText(value.Items[0].Text).Trim('"') != "#") lay = TermsConverter.DecodeText(value.Items[0].Text).Trim('"'); + if (TermsConverter.DecodeText(value.Items[0].Text).Trim('"') != "#") + { + Entry arg = Computation.Preprocessing(value.Items[0], context); + lay = TermsConverter.DecodeText(arg.Text).Trim('"'); + } if (TermsConverter.DecodeText(value.Items[1].Text).Trim('"') != "#") scale = Utilites.Entry2Double(value.Items[1], context); @@ -415,7 +427,11 @@ namespace AcadToSMath string lay = "#"; double scale = 1; - if (TermsConverter.DecodeText(value.Items[0].Text).Trim('"') != "#") lay = TermsConverter.DecodeText(value.Items[0].Text).Trim('"'); + if (TermsConverter.DecodeText(value.Items[0].Text).Trim('"') != "#") + { + Entry arg = Computation.Preprocessing(value.Items[0], context); + lay = TermsConverter.DecodeText(arg.Text).Trim('"'); + } if (TermsConverter.DecodeText(value.Items[1].Text).Trim('"') != "#") scale = Utilites.Entry2Double(value.Items[1], context); @@ -499,7 +515,11 @@ namespace AcadToSMath string lay = "#"; double scale = 1; - if (TermsConverter.DecodeText(value.Items[0].Text).Trim('"') != "#") lay = TermsConverter.DecodeText(value.Items[0].Text).Trim('"'); + if (TermsConverter.DecodeText(value.Items[0].Text).Trim('"') != "#") + { + Entry arg = Computation.Preprocessing(value.Items[0], context); + lay = TermsConverter.DecodeText(arg.Text).Trim('"'); + } if (TermsConverter.DecodeText(value.Items[1].Text).Trim('"') != "#") scale = Utilites.Entry2Double(value.Items[1], context); @@ -593,7 +613,11 @@ namespace AcadToSMath string lay = "#"; double scale = 1; - if (TermsConverter.DecodeText(value.Items[1].Text).Trim('"') != "#") lay = TermsConverter.DecodeText(value.Items[1].Text).Trim('"'); + if (TermsConverter.DecodeText(value.Items[1].Text).Trim('"') != "#") + { + Entry arg = Computation.Preprocessing(value.Items[1], context); + lay = TermsConverter.DecodeText(arg.Text).Trim('"'); + } if (TermsConverter.DecodeText(value.Items[2].Text).Trim('"') != "#") scale = Utilites.Entry2Double(value.Items[2], context); if (dxf.Lines.Count() == 0) @@ -650,7 +674,11 @@ namespace AcadToSMath string lay = "#"; double scale = 1; - if (TermsConverter.DecodeText(value.Items[1].Text).Trim('"') != "#") lay = TermsConverter.DecodeText(value.Items[1].Text).Trim('"'); + if (TermsConverter.DecodeText(value.Items[1].Text).Trim('"') != "#") + { + Entry arg = Computation.Preprocessing(value.Items[1], context); + lay = TermsConverter.DecodeText(arg.Text).Trim('"'); + } if (TermsConverter.DecodeText(value.Items[2].Text).Trim('"') != "#") scale = Utilites.Entry2Double(value.Items[2], context); if (dxf.Lines.Count() == 0) @@ -704,7 +732,11 @@ namespace AcadToSMath string lay = "#"; double scale = 1; - if (TermsConverter.DecodeText(value.Items[1].Text).Trim('"') != "#") lay = TermsConverter.DecodeText(value.Items[1].Text).Trim('"'); + if (TermsConverter.DecodeText(value.Items[1].Text).Trim('"') != "#") + { + Entry arg = Computation.Preprocessing(value.Items[1], context); + lay = TermsConverter.DecodeText(arg.Text).Trim('"'); + } if (TermsConverter.DecodeText(value.Items[2].Text).Trim('"') != "#") scale = Utilites.Entry2Double(value.Items[2], context); if (dxf.Lines.Count() == 0)