nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5078 from larsbrubaker/main

Browse source 
Make sheets case insensitive
This commit is contained in:
Lars Brubaker 2021-06-10 13:28:49 -07:00 • committed by GitHub
commit 99fc92c2e8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
MatterControlLib/DesignTools/Sheets/SheetData.cs
View file

@ -63,7 +63,7 @@ namespace MatterHackers.MatterControl.DesignTools
{ {
expression = expression.Substring(1); expression = expression.Substring(1);
} }
var evaluator = new Expression(expression); var evaluator = new Expression(expression.ToLower());
AddConstants(evaluator); AddConstants(evaluator);
var value = evaluator.calculate(); var value = evaluator.calculate();
@ -256,7 +256,7 @@ namespace MatterHackers.MatterControl.DesignTools
{ {
expression = "0" + expression; expression = "0" + expression;
} }
var evaluator = new Expression(expression); var evaluator = new Expression(expression.ToLower());
AddConstants(evaluator); AddConstants(evaluator);
var value = evaluator.calculate(); var value = evaluator.calculate();
if (double.IsNaN(value) if (double.IsNaN(value)
@ -265,10 +265,10 @@ namespace MatterHackers.MatterControl.DesignTools
value = 0; value = 0;
} }
constants.Add(CellId(xyc.x, xyc.y), value); constants.Add(CellId(xyc.x, xyc.y).ToLower(), value);
if (!string.IsNullOrEmpty(xyc.cell.Name)) if (!string.IsNullOrEmpty(xyc.cell.Name?.ToLower()))
{ {
constants.Add(xyc.cell.Name, value); constants.Add(xyc.cell.Name.ToLower(), value);
} }
} }

9
MatterControlLib/DesignTools/Sheets/SheetObject3D.cs
View file

@ -67,7 +67,8 @@ namespace MatterHackers.MatterControl.DesignTools
{ {
get get
{ {
if (this.Children.Where(i => i.Mesh == null).Any()) if (this.Children.Count == 0
|| this.Children.Where(i => i.Mesh == null).Any())
{ {
this.Children.Modify((list) => this.Children.Modify((list) =>
{ {
@ -144,6 +145,10 @@ namespace MatterHackers.MatterControl.DesignTools
AddItemsToList(sibling, updateItems, 0); AddItemsToList(sibling, updateItems, 0);
} }
} }
if (updateItems.Count == 0)
{
return;
}
// sort them // sort them
updateItems.Sort((a, b) => a.depth.CompareTo(b.depth)); updateItems.Sort((a, b) => a.depth.CompareTo(b.depth));
@ -276,7 +281,7 @@ namespace MatterHackers.MatterControl.DesignTools
} }
// could not find a sheet, try to evaluate the expression directly // could not find a sheet, try to evaluate the expression directly
var evaluator = new Expression(inputExpression); var evaluator = new Expression(inputExpression.ToLower());
return CastResult<T>(evaluator.calculate().ToString(), inputExpression); return CastResult<T>(evaluator.calculate().ToString(), inputExpression);
} }

2
Submodules/MatterSlice

@ -1 +1 @@
Subproject commit 4f3afb00997203e206eebef6e1dfc5858b0a2fe1 Subproject commit d6c59b6bf47221b485e96a13d25c85cdbec4bef6

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 0b4c79769aa23a62df17f10ec771c0bb95cdb352 Subproject commit 7e34c611d8759b78e4336504b4eb7befcdab1bf0