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

Merge pull request #727 from jlewin/master

Browse source 
Fix Macro null reference errors
This commit is contained in:
johnlewin 2016-05-09 16:14:47 -07:00
commit a66a1c19da
3 changed files with 45 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

5
PrinterControls/ControlWidgets/MacroControls.cs
View file

@ -129,6 +129,11 @@ namespace MatterHackers.MatterControl.PrinterControls
macroButtonContainer.Margin = new BorderDouble(3, 0);
macroButtonContainer.Padding = new BorderDouble(3);
if (ActiveSliceSettings.Instance?.Macros == null)
{
return macroButtonContainer;
}
int buttonCount = 0;
foreach (GCodeMacro macro in ActiveSliceSettings.Instance.Macros)
{

70
PrinterControls/EditMacrosWindow.cs
View file

@ -224,6 +224,11 @@ namespace MatterHackers.MatterControl
{
windowController.ActiveMacro.Name = macroNameInput.Text;
windowController.ActiveMacro.GCode = macroCommandInput.Text;
if (!ActiveSliceSettings.Instance.Macros.Contains(windowController.ActiveMacro))
{
ActiveSliceSettings.Instance.Macros.Add(windowController.ActiveMacro);
}
}
}
@ -269,41 +274,44 @@ namespace MatterHackers.MatterControl
topToBottom.AddChild(presetsFormContainer);
foreach (GCodeMacro macro in ActiveSliceSettings.Instance.Macros)
if (ActiveSliceSettings.Instance?.Macros != null)
{
FlowLayoutWidget macroRow = new FlowLayoutWidget();
macroRow.Margin = new BorderDouble(3, 0, 3, 3);
macroRow.HAnchor = Agg.UI.HAnchor.ParentLeftRight;
macroRow.Padding = new BorderDouble(3);
macroRow.BackgroundColor = RGBA_Bytes.White;
TextWidget buttonLabel = new TextWidget(macro.Name);
macroRow.AddChild(buttonLabel);
macroRow.AddChild(new HorizontalSpacer());
// You can't pass a foreach variable into a link function or it wall always be the last item.
// So we make a local variable copy of it and pass that. This will get the right one.
var localMacroReference = macro;
Button editLink = linkButtonFactory.Generate("edit".Localize());
editLink.Margin = new BorderDouble(right: 5);
editLink.Click += (sender, e) =>
foreach (GCodeMacro macro in ActiveSliceSettings.Instance.Macros)
{
windowController.ChangeToMacroDetail(localMacroReference);
};
macroRow.AddChild(editLink);
FlowLayoutWidget macroRow = new FlowLayoutWidget();
macroRow.Margin = new BorderDouble(3, 0, 3, 3);
macroRow.HAnchor = Agg.UI.HAnchor.ParentLeftRight;
macroRow.Padding = new BorderDouble(3);
macroRow.BackgroundColor = RGBA_Bytes.White;
Button removeLink = linkButtonFactory.Generate("remove".Localize());
removeLink.Click += (sender, e) =>
{
ActiveSliceSettings.Instance.Macros.Remove(localMacroReference);
windowController.functionToCallOnSave(this, null);
windowController.ChangeToMacroList();
};
macroRow.AddChild(removeLink);
TextWidget buttonLabel = new TextWidget(macro.Name);
macroRow.AddChild(buttonLabel);
presetsFormContainer.AddChild(macroRow);
macroRow.AddChild(new HorizontalSpacer());
// You can't pass a foreach variable into a link function or it wall always be the last item.
// So we make a local variable copy of it and pass that. This will get the right one.
var localMacroReference = macro;
Button editLink = linkButtonFactory.Generate("edit".Localize());
editLink.Margin = new BorderDouble(right: 5);
editLink.Click += (sender, e) =>
{
windowController.ChangeToMacroDetail(localMacroReference);
};
macroRow.AddChild(editLink);
Button removeLink = linkButtonFactory.Generate("remove".Localize());
removeLink.Click += (sender, e) =>
{
ActiveSliceSettings.Instance.Macros.Remove(localMacroReference);
windowController.functionToCallOnSave(this, null);
windowController.ChangeToMacroList();
};
macroRow.AddChild(removeLink);
presetsFormContainer.AddChild(macroRow);
}
}
Button addMacroButton = textImageButtonFactory.Generate("Add".Localize(), "icon_circle_plus.png");

2
SlicerConfiguration/Settings/LayeredProfile.cs
View file

@ -57,7 +57,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
this.BaseLayer = baseConfig;
}
public List<GCodeMacro> Macros { get; set; }
public List<GCodeMacro> Macros { get; set; } = new List<GCodeMacro>();
[OnDeserialized]
internal void OnDeserializedMethod(StreamingContext context)