From 48aedb2c3c8fa45f9866734af23f66671d0edc48 Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Mon, 28 Nov 2022 11:18:26 -0800 Subject: [PATCH 1/2] make check for name collision case insensitive --- .../PartPreviewWindow/View3D/Actions/SheetEditor.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/MatterControlLib/PartPreviewWindow/View3D/Actions/SheetEditor.cs b/MatterControlLib/PartPreviewWindow/View3D/Actions/SheetEditor.cs index ce1dd1a46..a952da42b 100644 --- a/MatterControlLib/PartPreviewWindow/View3D/Actions/SheetEditor.cs +++ b/MatterControlLib/PartPreviewWindow/View3D/Actions/SheetEditor.cs @@ -181,7 +181,10 @@ namespace MatterHackers.MatterControl.DesignTools // first replace spaces with '_' var name = editSelectedName.Text.Replace(' ', '_'); // next make sure we don't have the exact name already - name = agg_basics.GetNonCollidingName(name, existingNames, false); + name = agg_basics.GetNonCollidingName(name, (name) => + { + return !existingNames.Contains(name.ToLower()); + }, false); editSelectedName.Text = name; SheetData[selectedCell.x, selectedCell.y].Name = name; SheetData.Recalculate(); From 98f82d787b69db8cd2bf0da17a41708377e23b48 Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Mon, 28 Nov 2022 11:34:33 -0800 Subject: [PATCH 2/2] output to the right location --- .../MatterControl.PartSheet.csproj | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Plugins/MatterControl.PartSheet/MatterControl.PartSheet.csproj b/Plugins/MatterControl.PartSheet/MatterControl.PartSheet.csproj index 67a4575c3..88bc2f07a 100644 --- a/Plugins/MatterControl.PartSheet/MatterControl.PartSheet.csproj +++ b/Plugins/MatterControl.PartSheet/MatterControl.PartSheet.csproj @@ -4,7 +4,14 @@ net6.0-windows MatterHackers Inc. true - $(SolutionDir)bin + + + + ..\..\MatterControl\bin\Release\ + + + + ..\..\MatterControl\bin\Debug\