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

all the code is ported

Browse source
This commit is contained in:
LarsBrubaker 2020-09-24 22:20:27 -07:00
parent d62f93a36e
commit 777dc97527
9 changed files with 177 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

166
MatterControlLib/ApplicationView/ApplicationController.cs
View file

@ -252,7 +252,6 @@ namespace MatterHackers.MatterControl
private static void AddActionMenuItems(ISceneContext sceneContext, bool useSubMenu, IEnumerable<SceneOperation> sceneOperations, ThemeConfig menuTheme, PopupMenu popupMenu, Type selectedItemType)
{
var selectedItem = sceneContext.Scene.SelectedItem;
void AddItems(PopupMenu menu)
{
foreach (var sceneOperation in sceneOperations)
@ -260,7 +259,7 @@ namespace MatterHackers.MatterControl
var type = sceneOperation.OperationType;
if (type.IsAssignableFrom(selectedItemType)
&& (sceneOperation.IsVisible?.Invoke(selectedItem) != false)
&& (sceneOperation.IsVisible?.Invoke(sceneContext) != false)
&& sceneOperation.IsEnabled?.Invoke(sceneContext) != false)
{
var menuItem = menu.CreateMenuItem(sceneOperation.Title, sceneOperation.Icon?.Invoke(menuTheme.InvertIcons));
@ -275,6 +274,7 @@ namespace MatterHackers.MatterControl
var renameMenuItem = popupMenu.CreateMenuItem("Rename".Localize());
renameMenuItem.Click += (s, e) =>
{
var selectedItem = sceneContext.Scene.SelectedItem;
DialogWindow.Show(
new InputBoxPage(
"Rename Item".Localize(),
@ -963,163 +963,11 @@ namespace MatterHackers.MatterControl
this.Graph.RegisterOperation(SceneOperations.ImageConverterOperation());
this.Graph.RegisterOperation(SceneOperations.MirrorOperation());
this.Graph.RegisterOperation(SceneOperations.EditComponentOperation());
this.Graph.RegisterOperation(
new NodeOperation()
{
OperationID = "LinearExtrude",
Title = "Linear Extrude".Localize(),
MappedTypes = new List<Type> { typeof(IPathObject) },
ResultType = typeof(LinearExtrudeObject3D),
Operation = (sceneItem, scene) =>
{
if (sceneItem is IPathObject imageObject)
{
var extrude = new LinearExtrudeObject3D();
var itemClone = sceneItem.Clone();
extrude.Children.Add(itemClone);
extrude.Matrix = itemClone.Matrix;
itemClone.Matrix = Matrix4X4.Identity;
using (new SelectionMaintainer(scene))
{
scene.UndoBuffer.AddAndDo(new ReplaceCommand(new[] { sceneItem }, new[] { extrude }));
}
extrude.Invalidate(InvalidateType.Properties);
}
return Task.CompletedTask;
},
IconCollector = (invertIcon) => AggContext.StaticData.LoadIcon("noun_84751.png", 16, 16, invertIcon)
});
this.Graph.RegisterOperation(
new NodeOperation()
{
OperationID = "SmoothPath",
Title = "Smooth Path".Localize(),
MappedTypes = new List<Type> { typeof(IPathObject) },
ResultType = typeof(SmoothPathObject3D),
Operation = (sceneItem, scene) =>
{
if (sceneItem is IPathObject imageObject)
{
var smoothPath = new SmoothPathObject3D();
var itemClone = sceneItem.Clone();
smoothPath.Children.Add(itemClone);
smoothPath.Matrix = itemClone.Matrix;
itemClone.Matrix = Matrix4X4.Identity;
using (new SelectionMaintainer(scene))
{
scene.UndoBuffer.AddAndDo(new ReplaceCommand(new[] { sceneItem }, new[] { smoothPath }));
}
smoothPath.Invalidate(InvalidateType.Properties);
}
return Task.CompletedTask;
},
IconCollector = (invertIcon) => AggContext.StaticData.LoadIcon("noun_simplify_340976_000000.png", 16, 16, invertIcon)
});
this.Graph.RegisterOperation(
new NodeOperation()
{
OperationID = "InflatePath",
Title = "Inflate Path".Localize(),
MappedTypes = new List<Type> { typeof(IPathObject) },
ResultType = typeof(InflatePathObject3D),
Operation = (sceneItem, scene) =>
{
if (sceneItem is IPathObject imageObject)
{
var inflatePath = new InflatePathObject3D();
var itemClone = sceneItem.Clone();
inflatePath.Children.Add(itemClone);
inflatePath.Matrix = itemClone.Matrix;
itemClone.Matrix = Matrix4X4.Identity;
using (new SelectionMaintainer(scene))
{
scene.UndoBuffer.AddAndDo(new ReplaceCommand(new[] { sceneItem }, new[] { inflatePath }));
}
inflatePath.Invalidate(InvalidateType.Properties);
}
return Task.CompletedTask;
},
IconCollector = (invertIcon) => AggContext.StaticData.LoadIcon("inflate.png", 16, 16, invertIcon)
});
this.Graph.RegisterOperation(
new NodeOperation()
{
OperationID = "OutlinePath",
Title = "Outline Path".Localize(),
MappedTypes = new List<Type> { typeof(IPathObject) },
ResultType = typeof(OutlinePathObject3D),
Operation = (sceneItem, scene) =>
{
if (sceneItem is IPathObject imageObject)
{
var outlinePath = new OutlinePathObject3D();
var itemClone = sceneItem.Clone();
outlinePath.Children.Add(itemClone);
outlinePath.Matrix = itemClone.Matrix;
itemClone.Matrix = Matrix4X4.Identity;
using (new SelectionMaintainer(scene))
{
scene.UndoBuffer.AddAndDo(new ReplaceCommand(new[] { sceneItem }, new[] { outlinePath }));
}
outlinePath.Invalidate(InvalidateType.Properties);
}
return Task.CompletedTask;
},
IconCollector = (invertIcon) => AggContext.StaticData.LoadIcon("outline.png", 16, 16, invertIcon)
});
this.Graph.RegisterOperation(
new NodeOperation()
{
OperationID = "AddBase",
Title = "Add Base".Localize(),
MappedTypes = new List<Type> { typeof(IObject3D) },
ResultType = typeof(BaseObject3D),
Operation = (item, scene) =>
{
bool wasSelected = scene.SelectedItem == item;
var newChild = item.Clone();
var baseMesh = new BaseObject3D()
{
Matrix = newChild.Matrix
};
newChild.Matrix = Matrix4X4.Identity;
baseMesh.Children.Add(newChild);
baseMesh.Invalidate(InvalidateType.Properties);
scene.UndoBuffer.AddAndDo(
new ReplaceCommand(
new List<IObject3D> { item },
new List<IObject3D> { baseMesh }));
if (wasSelected)
{
scene.SelectedItem = baseMesh;
}
return Task.CompletedTask;
},
IsVisible = (sceneItem) => sceneItem.Children.Any((i) => i is IPathObject),
IconCollector = (invertIcon) => AggContext.StaticData.LoadIcon("noun_55060.png", 16, 16, invertIcon)
});
this.Graph.RegisterOperation(SceneOperations.LinearExtrudeOperation());
this.Graph.RegisterOperation(SceneOperations.SmoothPathOperation());
this.Graph.RegisterOperation(SceneOperations.InflatePathOperation());
this.Graph.RegisterOperation(SceneOperations.OutlinePathOperation());
this.Graph.RegisterOperation(SceneOperations.AddBaseOperation());
this.InitializeLibrary();

164
MatterControlLib/ApplicationView/SceneOperations.cs
View file

@ -881,6 +881,133 @@ namespace MatterHackers.MatterControl
};
}
public static SceneOperation InflatePathOperation()
{
return new SceneOperation()
{
OperationID = "InflatePath",
OperationType = typeof(IPathObject),
TitleResolver = () => "Inflate Path".Localize(),
ResultType = typeof(InflatePathObject3D),
Action = (sceneContext) =>
{
var scene = sceneContext.Scene;
var sceneItem = scene.SelectedItem;
var inflatePath = new InflatePathObject3D();
var itemClone = sceneItem.Clone();
inflatePath.Children.Add(itemClone);
inflatePath.Matrix = itemClone.Matrix;
itemClone.Matrix = Matrix4X4.Identity;
using (new SelectionMaintainer(scene))
{
scene.UndoBuffer.AddAndDo(new ReplaceCommand(new[] { sceneItem }, new[] { inflatePath }));
}
inflatePath.Invalidate(InvalidateType.Properties);
},
Icon = (invertIcon) => AggContext.StaticData.LoadIcon("smooth_path.png", 16, 16).SetPreMultiply(),
HelpTextResolver = () => "*A path must be selected*".Localize(),
IsEnabled = (sceneContext) => sceneContext.Scene.SelectedItem != null && !(sceneContext.Scene.SelectedItem is IPathObject),
};
}
public static SceneOperation OutlinePathOperation()
{
return new SceneOperation()
{
OperationID = "OutlinePath",
OperationType = typeof(IPathObject),
TitleResolver = () => "Outline Path".Localize(),
ResultType = typeof(OutlinePathObject3D),
Action = (sceneContext) =>
{
var scene = sceneContext.Scene;
var sceneItem = scene.SelectedItem;
var outlinePath = new OutlinePathObject3D();
var itemClone = sceneItem.Clone();
outlinePath.Children.Add(itemClone);
outlinePath.Matrix = itemClone.Matrix;
itemClone.Matrix = Matrix4X4.Identity;
using (new SelectionMaintainer(scene))
{
scene.UndoBuffer.AddAndDo(new ReplaceCommand(new[] { sceneItem }, new[] { outlinePath }));
}
outlinePath.Invalidate(InvalidateType.Properties);
},
Icon = (invertIcon) => AggContext.StaticData.LoadIcon("outline.png", 16, 16).SetPreMultiply(),
HelpTextResolver = () => "*A path must be selected*".Localize(),
IsEnabled = (sceneContext) => sceneContext.Scene.SelectedItem != null && !(sceneContext.Scene.SelectedItem is IPathObject),
};
}
public static SceneOperation AddBaseOperation()
{
return new SceneOperation()
{
OperationID = "AddBase",
OperationType = typeof(IObject3D),
TitleResolver = () => "Add Base".Localize(),
ResultType = typeof(BaseObject3D),
Action = (sceneContext) =>
{
var scene = sceneContext.Scene;
var item = scene.SelectedItem;
var newChild = item.Clone();
var baseMesh = new BaseObject3D()
{
Matrix = newChild.Matrix
};
newChild.Matrix = Matrix4X4.Identity;
baseMesh.Children.Add(newChild);
baseMesh.Invalidate(InvalidateType.Properties);
scene.UndoBuffer.AddAndDo(
new ReplaceCommand(
new List<IObject3D> { item },
new List<IObject3D> { baseMesh }));
scene.SelectedItem = baseMesh;
},
Icon = (invertIcon) => AggContext.StaticData.LoadIcon("add_base.png", 16, 16).SetPreMultiply(),
HelpTextResolver = () => "*A path must be selected*".Localize(),
IsEnabled = (sceneContext) => sceneContext.Scene.SelectedItem != null && !(sceneContext.Scene.SelectedItem is IPathObject),
};
}
public static SceneOperation SmoothPathOperation()
{
return new SceneOperation()
{
OperationID = "SmoothPath",
OperationType = typeof(IPathObject),
TitleResolver = () => "Smooth Path".Localize(),
ResultType = typeof(SmoothPathObject3D),
Action = (sceneContext) =>
{
var scene = sceneContext.Scene;
var sceneItem = scene.SelectedItem;
var smoothPath = new SmoothPathObject3D();
var itemClone = sceneItem.Clone();
smoothPath.Children.Add(itemClone);
smoothPath.Matrix = itemClone.Matrix;
itemClone.Matrix = Matrix4X4.Identity;
using (new SelectionMaintainer(scene))
{
scene.UndoBuffer.AddAndDo(new ReplaceCommand(new[] { sceneItem }, new[] { smoothPath }));
}
smoothPath.Invalidate(InvalidateType.Properties);
},
Icon = (invertIcon) => AggContext.StaticData.LoadIcon("smooth_path.png", 16, 16).SetPreMultiply(),
HelpTextResolver = () => "*A path must be selected*".Localize(),
IsEnabled = (sceneContext) => sceneContext.Scene.SelectedItem != null && !(sceneContext.Scene.SelectedItem is IPathObject),
};
}
public static SceneOperation EditComponentOperation()
{
return new SceneOperation()
@ -903,7 +1030,7 @@ namespace MatterHackers.MatterControl
scene.SelectedItem = componentObject;
}
},
IsVisible = (sceneItem) =>
IsVisible = (sceneContext) =>
{
var scene = sceneContext.Scene;
var sceneItem = scene.SelectedItem;
@ -919,6 +1046,41 @@ namespace MatterHackers.MatterControl
};
}
public static SceneOperation LinearExtrudeOperation()
{
return new SceneOperation()
{
OperationID = "LinearExtrude",
OperationType = typeof(IPathObject),
TitleResolver = () => "Linear Extrude".Localize(),
ResultType = typeof(LinearExtrudeObject3D),
Action = (sceneContext) =>
{
var scene = sceneContext.Scene;
var sceneItem = scene.SelectedItem;
if (sceneItem is IPathObject imageObject)
{
var extrude = new LinearExtrudeObject3D();
var itemClone = sceneItem.Clone();
extrude.Children.Add(itemClone);
extrude.Matrix = itemClone.Matrix;
itemClone.Matrix = Matrix4X4.Identity;
using (new SelectionMaintainer(scene))
{
scene.UndoBuffer.AddAndDo(new ReplaceCommand(new[] { sceneItem }, new[] { extrude }));
}
extrude.Invalidate(InvalidateType.Properties);
}
},
Icon = (invertIcon) => AggContext.StaticData.LoadIcon("linear_extrude.png", 16, 16).SetPreMultiply(),
HelpTextResolver = () => "*A path must be selected*".Localize(),
IsEnabled = (sceneContext) => sceneContext.Scene.SelectedItem != null && !(sceneContext.Scene.SelectedItem is IPathObject),
};
}
private SceneOperation RadialArrayOperation()
{
return new SceneOperation()

8
MatterControlLib/CustomWidgets/SceneOperation.cs
View file

@ -43,6 +43,9 @@ namespace MatterHackers.Agg.UI
public Action<ISceneContext> Action { get; set; }
/// <summary>
/// Gets or sets the type this operation outputs
/// </summary>
public Type ResultType { get; set; }
public Func<bool, ImageBuffer> Icon { get; set; }
@ -57,9 +60,12 @@ namespace MatterHackers.Agg.UI
public string Title => this.TitleResolver?.Invoke();
/// <summary>
/// Gets or sets the type that this operation can be applied to
/// </summary>
public Type OperationType { get; set; }
public Func<object, bool> IsVisible { get; set; }
public Func<ISceneContext, bool> IsVisible { get; set; }
}
public class SceneSelectionSeparator : SceneOperation

1
MatterControlLib/PartPreviewWindow/View3D/PrinterBar/ValidationErrorsPanel.cs
View file

@ -49,7 +49,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
var errorImage = AggContext.StaticData.LoadIcon("SettingsGroupError_16x.png", 16, 16, theme.InvertIcons);
var warningImage = AggContext.StaticData.LoadIcon("SettingsGroupWarning_16x.png", 16, 16, theme.InvertIcons);
var infoImage = AggContext.StaticData.LoadIcon("StatusInfoTip_16x.png", 16, 16);
var fixIcon = AggContext.StaticData.LoadIcon("noun_1306.png", 16, 16, theme.InvertIcons);
foreach (var validationError in errors.OrderByDescending(e => e.ErrorLevel))
{

0
StaticData/Icons/noun_55060.png → StaticData/Icons/add_base.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1,015 B

After

Width:  |  Height:  |  Size: 1,015 B

Before After
Before After

0
StaticData/Icons/noun_84751.png → StaticData/Icons/linear_extrude.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Before After
Before After

BIN
StaticData/Icons/noun_1306.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 989 B

BIN
StaticData/Icons/noun_766157.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 889 B

0
StaticData/Icons/noun_simplify_340976_000000.png → StaticData/Icons/smooth_path.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 711 B

After

Width:  |  Height:  |  Size: 711 B

Before After
Before After