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

Merge pull request #2878 from larsbrubaker/design_tools

Browse source 
Made update button work better on subtract
This commit is contained in:
Lars Brubaker 2018-01-12 09:54:29 -08:00 • committed by GitHub
commit d145789d31
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ApplicationView/ApplicationController.cs
View file

@ -358,7 +358,6 @@ namespace MatterHackers.MatterControl
Icon = AggContext.StaticData.LoadIcon("intersect.png"),
IsEnabled = (scene) => scene.SelectedItem is SelectionGroup,
},
#if DEBUG // keep this work in progress to the editor for now
new SceneSelectionOperation()
{
TitleResolver = () => "Subtract & Replace".Localize(),
@ -366,6 +365,7 @@ namespace MatterHackers.MatterControl
Icon = AggContext.StaticData.LoadIcon("paint.png").SetPreMultiply(),
IsEnabled = (scene) => scene.SelectedItem is SelectionGroup,
},
#if DEBUG // keep this work in progress to the editor for now
new SceneSelectionOperation()
{
TitleResolver = () => "Make Support".Localize(),

19
PartPreviewWindow/View3D/Actions/SubtractAndReplace.cs
View file

@ -40,7 +40,6 @@ using MatterHackers.PolygonMesh;
namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
{
#if DEBUG // keep this work in progress to the editor for now
public class SubtractAndReplace : IObject3DEditor
{
private MeshWrapperOperation group;
@ -108,10 +107,10 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
{
// make sure the mesh on the group is not visible
group.ResetMeshWrappers();
updateButton.Enabled = false;
ProcessBooleans(group);
};
int checkedCount = 0;
List<GuiWidget> radioSiblings = new List<GuiWidget>();
for (int i = 0; i < children.Count; i++)
{
@ -161,10 +160,17 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
};
tabContainer.AddChild(rowContainer);
checkedCount += checkBox.Checked ? 1 : 0;
}
if(checkedCount == 0) // no items selected
bool opperationApplied = group.Descendants()
.Where((obj) => obj.OwnerID == group.ID)
.Where((objId) => objId.Mesh != objId.Children.First().Mesh).Count() > 0;
bool selectionHasBeenMade = group.Descendants()
.Where((obj) => obj.OwnerID == group.ID)
.Where((objId) => objId.OutputType == PrintOutputTypes.Hole).Count() > 0;
if (!opperationApplied && !selectionHasBeenMade)
{
// select the last item
if (tabContainer.Decendants().Where((d) => d is ICheckbox).Last() is ICheckbox firstCheckBox)
@ -172,6 +178,10 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
firstCheckBox.Checked = true;
}
}
else
{
updateButton.Enabled = opperationApplied;
}
// add this last so it is at the bottom
tabContainer.AddChild(updateButton);
@ -248,5 +258,4 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
});
}
}
#endif
}

17
PartPreviewWindow/View3D/Actions/SubtractEditor.cs
View file

@ -88,10 +88,10 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
{
// make sure the mesh on the group is not visible
group.ResetMeshWrappers();
updateButton.Enabled = false;
ProcessBooleans(group);
};
int checkedCount = 0;
List<GuiWidget> radioSiblings = new List<GuiWidget>();
for (int i = 0; i < children.Count; i++)
{
@ -141,10 +141,17 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
};
tabContainer.AddChild(rowContainer);
checkedCount += checkBox.Checked ? 1 : 0;
}
if (checkedCount == 0) // no items selected
bool opperationApplied = group.Descendants()
.Where((obj) => obj.OwnerID == group.ID)
.Where((objId) => objId.Mesh != objId.Children.First().Mesh).Count() > 0;
bool selectionHasBeenMade = group.Descendants()
.Where((obj) => obj.OwnerID == group.ID)
.Where((objId) => objId.OutputType == PrintOutputTypes.Hole).Count() > 0;
if (!opperationApplied && !selectionHasBeenMade)
{
// select the last item
if (tabContainer.Decendants().Where((d) => d is ICheckbox).Last() is ICheckbox firstCheckBox)
@ -152,6 +159,10 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
firstCheckBox.Checked = true;
}
}
else
{
updateButton.Enabled = !opperationApplied;
}
// add this last so it is at the bottom
tabContainer.AddChild(updateButton);