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

Took out ActiveEditor property

Browse source
This commit is contained in:
Lars Brubaker 2018-03-15 10:03:48 -07:00
parent 230aeca9a5
commit 035c6a1922
30 changed files with 85 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

16
PartPreviewWindow/View3D/Actions/CombineEditor.cs
View file

@ -40,24 +40,32 @@ using MatterHackers.PolygonMesh;
namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
{
public class CombineObject3D : MeshWrapperObject3D
{
public CombineObject3D()
{
Name = "Combine";
}
}
public class CombineEditor : IObject3DEditor
{
private MeshWrapperOperation group;
private CombineObject3D group;
private View3DWidget view3DWidget;
public string Name => "Combine";
public bool Unlocked { get; } = true;
public IEnumerable<Type> SupportedTypes() => new Type[] { typeof(MeshWrapperOperation) };
public IEnumerable<Type> SupportedTypes() => new Type[] { typeof(CombineObject3D) };
public GuiWidget Create(IObject3D group, View3DWidget view3DWidget, ThemeConfig theme)
{
this.view3DWidget = view3DWidget;
this.group = group as MeshWrapperOperation;
this.group = group as CombineObject3D;
var mainContainer = new FlowLayoutWidget(FlowDirection.TopToBottom);
if (group is MeshWrapperOperation operationNode
if (group is CombineObject3D operationNode
&& operationNode.Descendants().Where((obj) => obj.OwnerID == group.ID).All(c => c.OutputType != PrintOutputTypes.Hole))
{
bool first = true;

16
PartPreviewWindow/View3D/Actions/IntersectionEditor.cs
View file

@ -40,24 +40,32 @@ using MatterHackers.PolygonMesh;
namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
{
public class IntersectionObject3D : MeshWrapperObject3D
{
public IntersectionObject3D()
{
Name = "Intersection";
}
}
public class IntersectionEditor : IObject3DEditor
{
private MeshWrapperOperation group;
private IntersectionObject3D group;
private View3DWidget view3DWidget;
public string Name => "Intersection";
public bool Unlocked { get; } = true;
public IEnumerable<Type> SupportedTypes() => new Type[] { typeof(MeshWrapperOperation) };
public IEnumerable<Type> SupportedTypes() => new Type[] { typeof(IntersectionObject3D) };
public GuiWidget Create(IObject3D group, View3DWidget view3DWidget, ThemeConfig theme)
{
this.view3DWidget = view3DWidget;
this.group = group as MeshWrapperOperation;
this.group = group as IntersectionObject3D;
var mainContainer = new FlowLayoutWidget(FlowDirection.TopToBottom);
if (group is MeshWrapperOperation operationNode
if (group is IntersectionObject3D operationNode
&& operationNode.Descendants().Where((obj) => obj.OwnerID == group.ID).All(c => c.OutputType != PrintOutputTypes.Hole))
{
bool first = true;

22
PartPreviewWindow/View3D/Actions/MeshWrapperOperation.cs → PartPreviewWindow/View3D/Actions/MeshWrapperObject3D.cs
View file

@ -35,9 +35,9 @@ using MatterHackers.PolygonMesh;
namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
{
public class MeshWrapperOperation : Object3D
public class MeshWrapperObject3D : Object3D
{
public MeshWrapperOperation()
public MeshWrapperObject3D()
{
}
@ -86,33 +86,31 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
base.Bake();
}
public static void WrapSelection(InteractiveScene scene, string classDescriptor, string editorName)
public static void WrapSelection(MeshWrapperObject3D meshWrapper, InteractiveScene scene)
{
if (scene.HasSelection && scene.SelectedItem.Children.Count() > 1)
{
var children = scene.SelectedItem.Children;
scene.SelectedItem = null;
var meshWrapperOperation = new MeshWrapperOperation(new List<IObject3D>(children.Select((i) => i.Clone())))
{
ActiveEditor = classDescriptor,
Name = editorName,
};
meshWrapper.WrapAndAddAsChildren(new List<IObject3D>(children.Select((i) => i.Clone())));
scene.UndoBuffer.AddAndDo(
new ReplaceCommand(
new List<IObject3D>(children),
new List<IObject3D> { meshWrapperOperation }));
new List<IObject3D> { meshWrapper }));
meshWrapperOperation.MakeNameNonColliding();
scene.SelectedItem = meshWrapperOperation;
meshWrapper.MakeNameNonColliding();
scene.SelectedItem = meshWrapper;
}
}
public MeshWrapperOperation(List<IObject3D> children)
public void WrapAndAddAsChildren(List<IObject3D> children)
{
Children.Modify((list) =>
{
list.Clear();
foreach (var child in children)
{
list.Add(child);

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

@ -40,9 +40,17 @@ using MatterHackers.PolygonMesh;
namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
{
public class SubtractAndReplace : IObject3DEditor
public class SubtractAndReplaceObject3D : MeshWrapperObject3D
{
private MeshWrapperOperation group;
public SubtractAndReplaceObject3D()
{
Name = "Subtract and Replace";
}
}
public class SubtractAndReplaceEditor : IObject3DEditor
{
private SubtractAndReplaceObject3D group;
private View3DWidget view3DWidget;
public string Name => "Subtract & Replace";
@ -51,11 +59,11 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
public GuiWidget Create(IObject3D group, View3DWidget view3DWidget, ThemeConfig theme)
{
this.view3DWidget = view3DWidget;
this.group = group as MeshWrapperOperation;
this.group = group as SubtractAndReplaceObject3D;
var mainContainer = new FlowLayoutWidget(FlowDirection.TopToBottom);
if (group is MeshWrapperOperation)
if (group is SubtractAndReplaceObject3D)
{
AddPaintSelector(view3DWidget, mainContainer, theme);
}
@ -65,7 +73,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
public IEnumerable<Type> SupportedTypes() => new Type[]
{
typeof(MeshWrapperOperation),
typeof(SubtractAndReplaceObject3D),
};
private static FlowLayoutWidget CreateSettingsRow(string labelText)

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

@ -41,9 +41,17 @@ using MatterHackers.PolygonMesh;
namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
{
public class SubtractObject3D : MeshWrapperObject3D
{
public SubtractObject3D()
{
Name = "Subtract";
}
}
public class SubtractEditor : IObject3DEditor
{
private MeshWrapperOperation group;
private SubtractObject3D group;
private View3DWidget view3DWidget;
public string Name => "Subtract";
@ -52,11 +60,11 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
public GuiWidget Create(IObject3D group, View3DWidget view3DWidget, ThemeConfig theme)
{
this.view3DWidget = view3DWidget;
this.group = group as MeshWrapperOperation;
this.group = group as SubtractObject3D;
var mainContainer = new FlowLayoutWidget(FlowDirection.TopToBottom);
if (group is MeshWrapperOperation)
if (group is SubtractObject3D)
{
AddSubtractSelector(view3DWidget, mainContainer, theme);
}
@ -66,7 +74,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.View3D
public IEnumerable<Type> SupportedTypes() => new Type[]
{
typeof(MeshWrapperOperation),
typeof(SubtractObject3D),
};
private void AddSubtractSelector(View3DWidget view3DWidget, FlowLayoutWidget tabContainer, ThemeConfig theme)