From 0292ccd76feae96696db826422b7e96475687762 Mon Sep 17 00:00:00 2001 From: LarsBrubaker Date: Sat, 26 Nov 2022 15:28:01 -0800 Subject: [PATCH] fixing component and sheet interactions --- .../DesignTools/Sheets/SheetData.cs | 84 ++++++++++++------- .../DesignTools/Sheets/SheetObject3D.cs | 26 +++--- .../PartPreviewWindow/SelectedObjectPanel.cs | 23 ++--- 3 files changed, 72 insertions(+), 61 deletions(-) diff --git a/MatterControlLib/DesignTools/Sheets/SheetData.cs b/MatterControlLib/DesignTools/Sheets/SheetData.cs index 772c09b47..9383c7f9c 100644 --- a/MatterControlLib/DesignTools/Sheets/SheetData.cs +++ b/MatterControlLib/DesignTools/Sheets/SheetData.cs @@ -59,38 +59,18 @@ namespace MatterHackers.MatterControl.DesignTools { lock (locker) { - if (!tabelCalculated) - { - BuildTableConstants(); - } - var cell = this[cellId]; if (cell != null) - { - var expression = cell.Expression; + { + return GetCellValue(cell); + } - if (expression.StartsWith("=")) - { - expression = expression.Substring(1); - var evaluator = new Expression(expression.ToLower()); - AddConstants(evaluator); - var value = evaluator.calculate(); - - return value.ToString(); - } - else - { - // return the expression without evaluation - return expression; - } - } - - return "0"; + return "0"; } } - public string EvaluateExpression(string expression) + public string GetCellValue(TableCell cell) { lock (locker) { @@ -99,11 +79,42 @@ namespace MatterHackers.MatterControl.DesignTools BuildTableConstants(); } - if(expression.StartsWith("=")) + var expression = cell.Expression; + + if (expression.StartsWith("=")) { + expression = expression.Substring(1); + var evaluator = new Expression(expression.ToLower()); + AddConstants(evaluator); + var value = evaluator.calculate(); + + return value.ToString(); + } + else + { + // return the expression without evaluation + return expression; + } + } + } + + public string EvaluateExpression(string inExpression) + { + lock (locker) + { + if (!tabelCalculated) + { + BuildTableConstants(); + } + + var expression = inExpression; + + if (expression.StartsWith("=")) + { + // to handle string values we first check if the expression is a cell reference expression = expression.Substring(1).Trim(); - // if it is a direct cell reference than return that cells value + // if it might be a direct cell reference check for column row data if (expression.Length == 2) { var column = (uint)expression.Substring(0, 1).ToUpper()[0] - 'A'; @@ -113,9 +124,24 @@ namespace MatterHackers.MatterControl.DesignTools return GetCellValue(CellId((int)column, (int)row)); } } - } - var evaluator = new Expression(expression.ToLower()); + // check if it is the exact name of a cell + foreach (var row in Rows) + { + foreach (var cell in row.Cells) + { + if (expression.Equals(cell.Name, StringComparison.OrdinalIgnoreCase)) + { + return GetCellValue(cell); + } + } + } + + + // fall through to evaluate the expression + } + + var evaluator = new Expression(expression.ToLower()); AddConstants(evaluator); var value = evaluator.calculate(); diff --git a/MatterControlLib/DesignTools/Sheets/SheetObject3D.cs b/MatterControlLib/DesignTools/Sheets/SheetObject3D.cs index 19f458194..7152e332c 100644 --- a/MatterControlLib/DesignTools/Sheets/SheetObject3D.cs +++ b/MatterControlLib/DesignTools/Sheets/SheetObject3D.cs @@ -507,26 +507,20 @@ namespace MatterHackers.MatterControl.DesignTools return (T)(object)inputExpression; } - if (double.TryParse(inputExpression, out var result)) + double.TryParse(inputExpression, out var result); + + if (typeof(T) == typeof(double)) { - if (typeof(T) == typeof(double)) - { - return (T)(object)result; - } - if (typeof(T) == typeof(int)) - { - return (T)(object)(int)Math.Round(result); - } + return (T)(object)result; + } + if (typeof(T) == typeof(int)) + { + return (T)(object)(int)Math.Round(result); } - if (typeof(T) == typeof(double)) - { - return (T)(object)0; - } - return (T)(object)(int)0; - } - } + } + } /// /// Find the sheet that the given item will reference diff --git a/MatterControlLib/PartPreviewWindow/SelectedObjectPanel.cs b/MatterControlLib/PartPreviewWindow/SelectedObjectPanel.cs index 5edd51bf9..fb639bd90 100644 --- a/MatterControlLib/PartPreviewWindow/SelectedObjectPanel.cs +++ b/MatterControlLib/PartPreviewWindow/SelectedObjectPanel.cs @@ -595,23 +595,14 @@ namespace MatterHackers.MatterControl.PartPreviewWindow if (cell != null) { // create an expresion editor - var field = new ExpressionField(theme) + var field = new TextField(theme) { - Name = cellId + " Field" + Name = cellId + " Field", }; field.Initialize(0); - if (cellData.Contains("=")) - { - field.SetValue(cellData, false); - } - else // make sure it is formatted - { - double.TryParse(cellData, out double value); - var format = "0." + new string('#', 5); - field.SetValue(value.ToString(format), false); - } - - field.ClearUndoHistory(); + field.SetValue(cellData, false); + field.ClearUndoHistory(); + field.Content.HAnchor = HAnchor.Stretch; var doOrUndoing = false; field.ValueChanged += (s, e) => @@ -624,7 +615,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow { doOrUndoing = true; editorList[editorIndex] = "!" + cellId + "," + oldValue; - var expression = new DoubleOrExpression(oldValue); + var expression = new StringOrExpression(oldValue); cell.Expression = expression.Value(componentObject).ToString(); componentObject.Invalidate(InvalidateType.SheetUpdated); doOrUndoing = false; @@ -633,7 +624,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow { doOrUndoing = true; editorList[editorIndex] = "!" + cellId + "," + newValue; - var expression = new DoubleOrExpression(newValue); + var expression = new StringOrExpression(newValue); cell.Expression = expression.Value(componentObject).ToString(); componentObject.Invalidate(InvalidateType.SheetUpdated); doOrUndoing = false;