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

Merge pull request #5339 from larsbrubaker/main

Browse source 
Making holes apply correctly when parent is set to solid or hole
This commit is contained in:
Lars Brubaker 2022-05-26 16:19:43 -07:00 • committed by GitHub
commit ba83b7ff1a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
MatterControlLib/DesignTools/Operations/GroupObject3D.cs
View file

@ -93,7 +93,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
{
var selections = new SelectedChildren();
foreach(var child in SourceContainer.FirstWithMultipleChildrenDescendantsAndSelf().Children.Where(i => i.WorldOutputType(this) == PrintOutputTypes.Hole && !(i is OperationSourceObject3D) ))
foreach(var child in SourceContainer.FirstWithMultipleChildrenDescendantsAndSelf().Children.Where(i => i.OutputType == PrintOutputTypes.Hole && !(i is OperationSourceObject3D) ))
{
selections.Add(child.ID);
}

2
MatterControlLib/DesignTools/Primitives/OperationSourceContainerObject3D.cs
View file

@ -340,7 +340,7 @@ namespace MatterHackers.MatterControl.DesignTools.Operations
if (keepItems.Any())
{
// apply any holes before we return
var resultItems = SubtractObject3D_2.DoSubtract(null,
var resultItems = SubtractObject3D_2.DoSubtract(this,
keepItems,
removeItems,
reporter,

6
MatterControlLib/PartPreviewWindow/SelectedObjectPanel.cs
View file

@ -326,7 +326,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
var scaledButtonSize = 24 * GuiWidget.DeviceScale;
void SetButtonStates()
{
switch (selectedItem.WorldOutputType())
switch (selectedItem.OutputType)
{
case PrintOutputTypes.Hole:
holeContainer.BackgroundOutlineWidth = 1;
@ -381,7 +381,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
break;
}
var currentOutputType = selectedItem.WorldOutputType();
var currentOutputType = selectedItem.OutputType;
if (currentOutputType != PrintOutputTypes.Solid && currentOutputType != PrintOutputTypes.Default)
{
undoBuffer.AddAndDo(new ChangeColor(selectedItem, colorField.Color));
@ -453,7 +453,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
void SetToHole()
{
if (selectedItem.WorldOutputType() != PrintOutputTypes.Hole)
if (selectedItem.OutputType != PrintOutputTypes.Hole)
{
undoBuffer.AddAndDo(new MakeHole(selectedItem));
}

2
MatterControlLib/PartPreviewWindow/View3D/Actions/CombineObject3D_2.cs
View file

@ -162,7 +162,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
if (resultsMesh != null)
{
var resultItems = SubtractObject3D_2.DoSubtract(null,
var resultItems = SubtractObject3D_2.DoSubtract(this,
new List<IObject3D>() { resultsItem },
new List<IObject3D>() { holesItem },
null,

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 6d5ec9c6abe7234e0951a3a1b9fc36eadab2d987
Subproject commit 9bab0f3b95279a55dd575a126252e1ad7eb8562d