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

On print complete text show printer name

Browse source
This commit is contained in:
Lars Brubaker 2022-01-27 16:49:46 -08:00
parent e5684e6437
commit 55a6f0fdc7
22 changed files with 39 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

8
MatterControlLib/ApplicationView/ApplicationController.cs
View file

@ -340,7 +340,7 @@ namespace MatterHackers.MatterControl
AggContext.FileDialogs.SaveFileDialog(
new SaveFileDialogParams("MatterControl Printer Export|*.printer", title: "Export Printer Settings")
{
FileName = printer.Settings.GetValue(SettingsKey.printer_name)
FileName = printer.PrinterName
},
(saveParams) =>
{
@ -1060,7 +1060,7 @@ namespace MatterHackers.MatterControl
UiThread.RunOnIdle(() =>
{
var prinerName = printerConnection.Printer.Settings.GetValue(SettingsKey.printer_name);
var prinerName = printerConnection.Printer.PrinterName;
var messageBox = new StyledMessageBox.MessageBoxPage((clickedOk) =>
{
if (clickedOk && printerConnection.Paused)
@ -2143,7 +2143,7 @@ namespace MatterHackers.MatterControl
using (var zip = new ZipArchive(file, ZipArchiveMode.Create))
{
zip.CreateEntryFromFile(sourcePath, "PrinterPlate.mcx");
zip.CreateEntryFromFile(settingsFilePath, printer.Settings.GetValue(SettingsKey.printer_name) + ".printer");
zip.CreateEntryFromFile(settingsFilePath, printer.PrinterName + ".printer");
zip.CreateEntryFromFile(gcodeFilePath, "sliced.gcode");
}
}
@ -2295,7 +2295,7 @@ namespace MatterHackers.MatterControl
AnyPrintStarted?.Invoke(sender, e);
}
public void Connection_PrintFinished(object sender, string e)
public void Connection_PrintFinished(object sender, (string printerName, string itemName) e)
{
if (sender is PrinterConnection printerConnection)
{

4
MatterControlLib/ApplicationView/Config/PrinterConfig.cs
View file

@ -96,6 +96,8 @@ namespace MatterHackers.MatterControl
public PrinterSettings Settings { get; } = PrinterSettings.Empty;
public string PrinterName => Settings?.GetValue(SettingsKey.printer_name) ?? "unknown";
[JsonIgnore]
public PrinterConnection Connection { get; }
@ -180,7 +182,7 @@ namespace MatterHackers.MatterControl
this.Bed.BedShape = this.Settings.GetValue<BedShape>(SettingsKey.bed_shape);
}
private void Connection_PrintFinished(object s, string printName)
private void Connection_PrintFinished(object s, (string printerName, string itemName) e)
{
// clear single use setting on print completion
foreach (var keyValue in this.Settings.BaseLayer)

2
MatterControlLib/ApplicationView/PartWorkspace.cs
View file

@ -55,7 +55,7 @@ namespace MatterHackers.MatterControl
{
wrappedLibrary.ExtraContainers.Add(
new DynamicContainerLink(
printer.Settings.GetValue(SettingsKey.printer_name),
printer.PrinterName,
StaticData.Instance.LoadIcon(Path.Combine("Library", "folder.png")),
StaticData.Instance.LoadIcon(Path.Combine("Library", "printer_icon.png")),
() => new PrinterContainer(printer))

4
MatterControlLib/CustomWidgets/ConfigurePrinterWidget.cs
View file

@ -40,7 +40,7 @@ namespace MatterHackers.MatterControl
public ConfigurePrinterWidget(SettingsContext settingsContext, PrinterConfig printer, ThemeConfig theme)
: base(FlowDirection.TopToBottom)
{
var inlineNameEdit = new InlineStringEdit(printer.Settings.GetValue(SettingsKey.printer_name), theme, "Printer Name", boldFont: true);
var inlineNameEdit = new InlineStringEdit(printer.PrinterName, theme, "Printer Name", boldFont: true);
inlineNameEdit.ValueChanged += (s, e) =>
{
printer.Settings.SetValue(SettingsKey.printer_name, inlineNameEdit.Text);
@ -53,7 +53,7 @@ namespace MatterHackers.MatterControl
&& stringEvent?.Data == SettingsKey.printer_name)
{
// Try to find a printer tab for the given printer
inlineNameEdit.Text = printerSettings.GetValue(SettingsKey.printer_name);
inlineNameEdit.Text = printer.PrinterName;
}
}

2
MatterControlLib/EeProm/EePromRepetierWindow.cs
View file

@ -69,7 +69,7 @@ namespace MatterHackers.MatterControl.EeProm
protected string GetSanitizedPrinterName()
{
// TODO: Determine best file name sanitization implementation: this, MakeValidFileName, something else?
string printerName = printer.Settings.GetValue(SettingsKey.printer_name).Replace(" ", "_");
string printerName = printer.PrinterName.Replace(" ", "_");
return nameSanitizer.Replace(printerName, "");
}

2
MatterControlLib/History/PrintHistoryEditor.cs
View file

@ -457,7 +457,7 @@ Support and tutorials:" + articles;
: base("Close".Localize())
{
this.WindowTitle = windowTitle;
this.HeaderText = printer.Settings.GetValue(SettingsKey.printer_name) + ": " + windowTitle;
this.HeaderText = printer.PrinterName + ": " + windowTitle;
this.WindowSize = new Vector2(500 * GuiWidget.DeviceScale, 440 * GuiWidget.DeviceScale);
var scrollable = new ScrollableWidget(autoScroll: true)

2
MatterControlLib/History/PrintRecovery.cs
View file

@ -90,7 +90,7 @@ namespace MatterHackers.MatterControl.PrintHistory
},
"It appears your last print failed to complete.\n\nWould your like to attempt to recover from the last know position?".Localize()
+ (safeHomingDirection ? "" : "\n\n" + printRecoveryWarningMessage),
"Recover Last Print".Localize() + " - " + printer.Settings.GetValue(SettingsKey.printer_name),
"Recover Last Print".Localize() + " - " + printer.PrinterName,
StyledMessageBox.MessageType.YES_NO,
"Recover Print".Localize(),
"Cancel".Localize(),

2
MatterControlLib/Library/Providers/MatterControl/PlatingHistoryContainer.cs
View file

@ -82,7 +82,7 @@ namespace MatterHackers.MatterControl.Library
internal ILibraryItem NewBedPlate(BedConfig bedConfig)
{
var name = bedConfig.Printer.Settings.GetValue(SettingsKey.printer_name);
var name = bedConfig.Printer.PrinterName;
string now = DateTime.Now.ToString("yyyy-MM-dd HH_mm_ss");
var filename = ApplicationController.Instance.SanitizeFileName($"{name} - {now}.mcx");
string mcxPath = Path.Combine(this.FullPath, filename);

2
MatterControlLib/Library/Providers/Printer/OpenPrintersContainer.cs
View file

@ -54,7 +54,7 @@ namespace MatterHackers.MatterControl.Library
{
this.ChildContainers.Add(
new DynamicContainerLink(
printer.Settings.GetValue(SettingsKey.printer_name),
printer.PrinterName,
StaticData.Instance.LoadIcon(Path.Combine("Library", "folder.png")),
StaticData.Instance.LoadIcon(Path.Combine("Library", "printer_icon.png")),
() => new PrinterContainer(printer),

2
MatterControlLib/Library/Providers/Printer/PrinterContainer.cs
View file

@ -46,7 +46,7 @@ namespace MatterHackers.MatterControl.Library
this.printer = printer;
this.ChildContainers = new SafeList<ILibraryContainerLink>();
this.Items = new SafeList<ILibraryItem>();
this.Name = printer.Settings.GetValue(SettingsKey.printer_name);
this.Name = printer.PrinterName;
}
public override void Load()

2
MatterControlLib/Library/Widgets/HardwareTreeView.cs
View file

@ -191,7 +191,7 @@ namespace MatterHackers.MatterControl.PrintLibrary
// Add the menu items to the menu itself
foreach (var printer in ApplicationController.Instance.ActivePrinters)
{
string printerName = printer.Settings.GetValue(SettingsKey.printer_name);
string printerName = printer.PrinterName;
var printerNode = new TreeNode(theme)
{

6
MatterControlLib/PartPreviewWindow/MainViewWidget.cs
View file

@ -707,8 +707,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
}
var printerTab = new ChromeTab(
printer.Settings.GetValue(SettingsKey.printer_name),
printer.Settings.GetValue(SettingsKey.printer_name),
printer.PrinterName,
printer.PrinterName,
tabControl,
new PrinterTabPage(workspace, theme, "unused_tab_title"),
theme,
@ -778,7 +778,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
new InputBoxPage(
"Rename Item".Localize(),
"Name".Localize(),
printer.Settings.GetValue(SettingsKey.printer_name),
printer.PrinterName,
"Enter New Name Here".Localize(),
"Rename".Localize(),
(newName) =>

2
MatterControlLib/PartPreviewWindow/View3D/PrinterBar/PrinterActionsBar.cs
View file

@ -437,7 +437,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
ProfileManager.Instance.DeletePrinter(printer.Settings.ID);
}
},
"Are you sure you want to delete printer '{0}'?".Localize().FormatWith(printer.Settings.GetValue(SettingsKey.printer_name)),
"Are you sure you want to delete printer '{0}'?".Localize().FormatWith(printer.PrinterName),
"Delete Printer?".Localize(),
StyledMessageBox.MessageType.YES_NO,
"Delete Printer".Localize());

2
MatterControlLib/PartPreviewWindow/View3D/View3DWidget.cs
View file

@ -1057,7 +1057,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
}
// Switch to printer
ApplicationController.Instance.MainView.TabControl.SelectedTabKey = printer.Settings.GetValue(SettingsKey.printer_name);
ApplicationController.Instance.MainView.TabControl.SelectedTabKey = printer.PrinterName;
// Save any pending changes before starting print operation
await ApplicationController.Instance.Tasks.Execute("Saving Changes".Localize(), printer, printer.Bed.SaveChanges);

4
MatterControlLib/PrinterCommunication/Io/PauseHandlingStream.cs
View file

@ -182,11 +182,11 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io
case PauseReason.PauseLayerReached:
case PauseReason.GCodeRequest:
printer.Connection.OnPauseOnLayer(new PrintPauseEventArgs(printer.Bed.EditContext?.SourceItem?.Name ?? "Unknown", false, layerNumber));
printer.Connection.OnPauseOnLayer(new PrintPauseEventArgs(printer.PrinterName, printer.Bed.EditContext?.SourceItem?.Name ?? "Unknown", false, layerNumber));
break;
case PauseReason.FilamentRunout:
printer.Connection.OnFilamentRunout(new PrintPauseEventArgs(printer.Bed.EditContext?.SourceItem?.Name ?? "Unknown", true, layerNumber));
printer.Connection.OnFilamentRunout(new PrintPauseEventArgs(printer.PrinterName, printer.Bed.EditContext?.SourceItem?.Name ?? "Unknown", true, layerNumber));
break;
}

7
MatterControlLib/PrinterCommunication/PrintPauseEventArgs.cs
View file

@ -56,13 +56,16 @@ namespace MatterHackers.MatterControl.PrinterCommunication
public class PrintPauseEventArgs : EventArgs
{
public PrintPauseEventArgs(string name, bool filamentRunout, int layerNumber)
public PrintPauseEventArgs(string printerName, string itemName, bool filamentRunout, int layerNumber)
{
this.ItemName = name;
this.PrinterName = printerName;
this.ItemName = itemName;
this.FilamentRunout = filamentRunout;
this.LayerNumber = layerNumber;
}
public string PrinterName { get; }
public string ItemName { get; }
public bool FilamentRunout { get; }

6
MatterControlLib/PrinterCommunication/PrinterConnection.cs
View file

@ -152,7 +152,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication
FilamentRunout?.Invoke(this, printPauseEventArgs);
}
public event EventHandler<string> PrintFinished;
public event EventHandler<(string printerName, string itemName)> PrintFinished;
public event EventHandler PrintStarted;
@ -611,7 +611,7 @@ namespace MatterHackers.MatterControl.PrinterCommunication
timePrinting.Stop();
if (Printer.Bed?.EditContext?.SourceItem.Name != null)
{
PrintFinished?.Invoke(this, Printer.Bed.EditContext.SourceItem.Name);
PrintFinished?.Invoke(this, (Printer.PrinterName, Printer.Bed.EditContext.SourceItem.Name));
}
}
else
@ -2190,7 +2190,7 @@ Make sure that your printer is turned on. Some printers will appear to be connec
PrintStart = DateTime.Now,
PrinterId = this.Printer.Settings.ID.GetHashCode(),
PrintName = activePrintItem.PrintItem.Name,
PrinterName = this.Printer.Settings.GetValue(SettingsKey.printer_name),
PrinterName = this.Printer.PrinterName,
Guid = Guid.NewGuid().ToString(),
PrintingGCodeFileName = gcodeFileNameForTask,
PrintComplete = false,

2
MatterControlLib/PrinterControls/EditLevelingSettingsPage.cs
View file

@ -169,7 +169,7 @@ namespace MatterHackers.MatterControl
new SaveFileDialogParams("Bed Leveling Data|*.csv")
{
Title = "Export Bed Leveling Data".Localize(),
FileName = $"{printer.Settings.GetValue(SettingsKey.printer_name)} Leveling Data"
FileName = $"{printer.PrinterName} Leveling Data"
},
(saveParams) =>
{

3
StaticData/Translations/Master.txt
View file

@ -3403,6 +3403,9 @@ Translated:Surfaced Editors
English:Switch
Translated:Switch
English:Switch to new G-Code on next layer?
Translated:Switch to new G-Code on next layer?
English:Switch to new G-Code?\n\nBefore you switch, check that you are seeing the changes you expect.
Translated:Switch to new G-Code?\n\nBefore you switch, check that you are seeing the changes you expect.

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 940c157f73bb807176c08e799bf0bb55ba08f2df
Subproject commit 95a5397e4bca6346344451da499eb0af4dfa249f

2
Tests/MatterControl.AutomationTests/PrinterDropDownTests.cs
View file

@ -87,7 +87,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
Assert.AreEqual(newName, printerTab.Title);
// Validate that the settings layer reflects the new name
Assert.AreEqual(newName, printer.Settings.GetValue(SettingsKey.printer_name));
Assert.AreEqual(newName, printer.PrinterName);
return Task.CompletedTask;
});

2
Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
View file

@ -628,7 +628,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
case "SD Card Row Item Collection":
if (ApplicationController.Instance.DragDropData.View3DWidget?.Printer is PrinterConfig printer)
{
testRunner.DoubleClickByName($"{printer.Settings.GetValue(SettingsKey.printer_name)} Row Item Collection");
testRunner.DoubleClickByName($"{printer.PrinterName} Row Item Collection");
testRunner.Delay();