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

Merge pull request #5406 from larsbrubaker/main

Browse source 
main
This commit is contained in:
Lars Brubaker 2022-11-28 11:35:04 -08:00 • committed by GitHub
commit c44061d2ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
MatterControlLib/PartPreviewWindow/View3D/Actions/SheetEditor.cs
View file

@ -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();

9
Plugins/MatterControl.PartSheet/MatterControl.PartSheet.csproj
View file

@ -4,7 +4,14 @@
<TargetFramework>net6.0-windows</TargetFramework>
<Company>MatterHackers Inc.</Company>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<BaseOutputPath>$(SolutionDir)bin</BaseOutputPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<OutputPath>..\..\MatterControl\bin\Release\</OutputPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<OutputPath>..\..\MatterControl\bin\Debug\</OutputPath>
</PropertyGroup>
<ItemGroup>