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

Working on new auto support feature

Browse source
This commit is contained in:
Lars Brubaker 2018-12-31 09:12:49 -08:00
parent 5ba0544b84
commit 5cc271e508
4 changed files with 72 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

15
MatterControlLib/ApplicationView/ApplicationController.cs
View file

@ -661,21 +661,6 @@ namespace MatterHackers.MatterControl
IsEnabled = (scene) => scene.SelectedItem != null,
Icon = AggContext.StaticData.LoadIcon("lay_flat.png", 16, 16).SetPreMultiply(),
},
new SceneSelectionOperation()
{
TitleResolver = () => "Toggle Support".Localize(),
Action = (sceneContext) =>
{
var scene = sceneContext.Scene;
var selectedItem = scene.SelectedItem;
if (selectedItem != null)
{
scene.UndoBuffer.AddAndDo(new ToggleSupport(selectedItem));
}
},
Icon = AggContext.StaticData.LoadIcon("support.png").SetPreMultiply(),
IsEnabled = (scene) => scene.SelectedItem != null,
},
new SceneSelectionSeparator(),
new SceneSelectionOperation()
{

4
MatterControlLib/Library/Providers/MatterControl/PrimitivesContainer.cs
View file

@ -145,10 +145,6 @@ namespace MatterHackers.MatterControl.Library
};
})
{ DateCreated = new System.DateTime(index++) },
new GeneratorItem(
() => "Supports".Localize(),
() => SupportControls.Create())
{ DateCreated = new System.DateTime(index++) },
};
string title = "Primitive Shapes".Localize();

83
MatterControlLib/DesignTools/Primitives/SupportControls.cs → MatterControlLib/PartPreviewWindow/GenerateSupportPannel.cs
View file

@ -27,84 +27,39 @@ of the authors and should not be interpreted as representing official policies,
either expressed or implied, of the FreeBSD Project.
*/
using MatterHackers.Agg;
using System;
using System.Linq;
using MatterHackers.Agg.UI;
using MatterHackers.DataConverters3D;
using MatterHackers.Localizations;
using MatterHackers.MatterControl.Library;
using MatterHackers.PolygonMesh;
using MatterHackers.VectorMath;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
using System;
using System.ComponentModel;
using System.Linq;
namespace MatterHackers.MatterControl.DesignTools
namespace MatterHackers.MatterControl.PartPreviewWindow
{
[ShowUpdateButton]
public class SupportControls : Object3D
public class GenerateSupportPannel : GuiWidget
{
public SupportControls()
private ThemeConfig theme;
private InteractiveScene scene;
public GenerateSupportPannel(ThemeConfig theme, InteractiveScene scene)
{
Name = "Support Controls".Localize();
Color = Color.Yellow;
this.theme = theme;
this.scene = scene;
}
public SupportControls(double width, double depth, double height)
: this()
public double MaxOverHangAngle { get; private set; }
private void Rebuild()
{
Rebuild(null);
}
//[JsonConverter(typeof(StringEnumConverter))]
//public enum SupportTypes { Solid, Pillars, Tree }
//[Description("Sets the type of support will be added to the scene and output by the slicing engine.")]
//public SupportTypes SupportType { get; set; } = SupportTypes.Solid;
[Description("The angle of the faces that need to be supported.")]
public double MaxOverHangAngle { get; set; } = 45;
// Clear All Supports // Remove all the supports that are currently in the scene
// Group All Supports // Make supports into a sigle grouped object
// Generate Supports // anywhere we need support and there is not currently support there, add support
public static SupportControls Create()
{
var item = new SupportControls();
item.Mesh = PlatonicSolids.CreateCube(20, 20, 20);
PlatingHelper.PlaceMeshAtHeight(item, 0);
return item;
}
public override void OnInvalidate(InvalidateArgs invalidateType)
{
if (invalidateType.InvalidateType == InvalidateType.Properties
&& invalidateType.Source == this)
{
Rebuild(null);
}
else
{
base.OnInvalidate(invalidateType);
}
}
private void Rebuild(UndoBuffer undoBuffer)
{
var parent = this.Parent;
// Find all the other objects of our parent
var peers = parent.Children.Where(i => i != this).ToArray();
var peers = scene.Children.Where(i => i != this).ToArray();
// eventually we will not remove any support that is already in the scene
// but for now, remove all the stuff that is there first
var existingSupports = peers.Where(i => i.OutputType == PrintOutputTypes.Support);
parent.Children.Modify((list) =>
scene.Children.Modify((list) =>
{
foreach (var item in existingSupports)
{
@ -120,10 +75,10 @@ namespace MatterHackers.MatterControl.DesignTools
// find all the faces that are candidates for support
var verts = new Vector3List();
var faces = new FaceList();
foreach(var item in supportCandidates)
foreach (var item in supportCandidates)
{
var matrix = item.WorldMatrix(parent);
foreach(var face in item.Mesh.Faces)
var matrix = item.WorldMatrix(scene);
foreach (var face in item.Mesh.Faces)
{
var face0Normal = Vector3.TransformVector(face.Normal, matrix).GetNormal();
var angle = MathHelper.RadiansToDegrees(Math.Acos(Vector3.Dot(Vector3.UnitZ, face0Normal)));

53
MatterControlLib/PartPreviewWindow/ViewControls3D.cs
View file

@ -41,6 +41,7 @@ using MatterHackers.DataConverters3D;
using MatterHackers.Localizations;
using MatterHackers.MatterControl.CustomWidgets;
using MatterHackers.MatterControl.DataStorage;
using MatterHackers.MatterControl.DesignTools.Operations;
using MatterHackers.MatterControl.Library;
using MatterHackers.MatterControl.PrintLibrary;
using MatterHackers.VectorMath;
@ -439,6 +440,12 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
if (namedAction.Icon != null)
{
// add the create support before the align
if (namedAction.OperationType == typeof(AlignObject3D))
{
this.AddChild(CreateSupportButton(theme));
}
button = new IconButton(namedAction.Icon, theme)
{
Name = namedAction.Title + " Button",
@ -644,6 +651,52 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
return libraryPopup;
}
private GuiWidget CreateSupportButton(ThemeConfig theme)
{
PopupMenuButton toggleSupportButton = null;
var iconButton = new IconButton(
AggContext.StaticData.LoadIcon("support.png", 16, 16, theme.InvertIcons),
theme)
{
ToolTipText = "Toggle Support".Localize(),
};
iconButton.Click += (s, e) =>
{
var scene = sceneContext.Scene;
var selectedItem = scene.SelectedItem;
if (selectedItem != null)
{
scene.UndoBuffer.AddAndDo(new ToggleSupport(selectedItem));
}
};
sceneContext.Scene.SelectionChanged += (s, e) =>
{
iconButton.Enabled = sceneContext.Scene.SelectedItem != null;
};
// Remove right Padding for drop style
iconButton.Padding = iconButton.Padding.Clone(right: 0);
toggleSupportButton = new PopupMenuButton(iconButton, theme)
{
Name = "Support SplitButton",
ToolTipText = "Generate Support".Localize(),
PopupContent = new GenerateSupportPannel(theme, sceneContext.Scene),
BackgroundColor = theme.ToolbarButtonBackground,
HoverColor = theme.ToolbarButtonHover,
MouseDownColor = theme.ToolbarButtonDown,
DrawArrow = true,
Margin = theme.ButtonSpacing,
};
iconButton.Selectable = true;
return toggleSupportButton;
}
private GuiWidget CreateSaveButton(ThemeConfig theme)
{
PopupMenuButton saveButton = null;