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

Include printer name in default EEProm export ini file name

Browse source 
- Issue MatterHackers/MCCentral#3663
EEProm exports should include printer name
This commit is contained in:
John Lewin 2018-06-18 16:33:40 -07:00
parent c09ed8b65c
commit 00d475ede9
3 changed files with 43 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

27
EeProm/EePromMarlinWindow.cs
View file

@ -35,6 +35,7 @@ using MatterHackers.Agg.UI;
using MatterHackers.Localizations;
using MatterHackers.MatterControl.PartPreviewWindow;
using MatterHackers.MatterControl.PrinterCommunication;
using MatterHackers.MatterControl.SlicerConfiguration;
namespace MatterHackers.MatterControl.EeProm
{
@ -88,13 +89,13 @@ namespace MatterHackers.MatterControl.EeProm
private int currentTabIndex = 0;
public MarlinEEPromPage(PrinterConnection printerConnection)
: base(printerConnection)
public MarlinEEPromPage(PrinterConfig printer)
: base(printer)
{
AlwaysOnTopOfMain = true;
this.WindowTitle = "Marlin Firmware EEPROM Settings".Localize();
currentEePromSettings = new EePromMarlinSettings(printerConnection);
currentEePromSettings = new EePromMarlinSettings(printer.Connection);
currentEePromSettings.eventAdded += SetUiToPrinterSettings;
var mainContainer = contentRow;
@ -174,7 +175,7 @@ namespace MatterHackers.MatterControl.EeProm
this.AddPageAction(exportButton);
}
printerConnection.CommunicationUnconditionalFromPrinter.RegisterEvent(currentEePromSettings.Add, ref unregisterEvents);
printer.Connection.CommunicationUnconditionalFromPrinter.RegisterEvent(currentEePromSettings.Add, ref unregisterEvents);
// and ask the printer to send the settings
currentEePromSettings.Update();
@ -233,22 +234,22 @@ namespace MatterHackers.MatterControl.EeProm
private void ExportSettings()
{
string defaultFileNameNoPath = "eeprom_settings.ini";
string defaultFileName = $"eeprom_settings_{base.GetSanitizedPrinterName()}.ini";
AggContext.FileDialogs.SaveFileDialog(
new SaveFileDialogParams("EEPROM Settings|*.ini")
{
ActionButtonLabel = "Export EEPROM Settings".Localize(),
Title = "Export EEPROM".Localize(),
FileName = defaultFileNameNoPath
FileName = defaultFileName
},
(saveParams) =>
(saveParams) =>
{
if (!string.IsNullOrEmpty(saveParams.FileName)
&& saveParams.FileName != defaultFileName)
{
if (!string.IsNullOrEmpty(saveParams.FileName)
&& saveParams.FileName != defaultFileNameNoPath)
{
currentEePromSettings.Export(saveParams.FileName);
}
});
currentEePromSettings.Export(saveParams.FileName);
}
});
}
private GuiWidget CreateMHNumEdit(ref MHNumberEdit numberEditToCreate)