From 9e5ea69471bec1cfe8474737a97b17e4982fcd1a Mon Sep 17 00:00:00 2001 From: John Lewin Date: Wed, 1 Mar 2017 12:22:49 -0800 Subject: [PATCH 1/2] Remove orphaned control, remove unused printActionRow variable --- ActionBar/PrintStatusRow.cs | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/ActionBar/PrintStatusRow.cs b/ActionBar/PrintStatusRow.cs index 243cdc4b8..13ee33093 100644 --- a/ActionBar/PrintStatusRow.cs +++ b/ActionBar/PrintStatusRow.cs @@ -43,7 +43,6 @@ namespace MatterHackers.MatterControl.ActionBar { public class PrintStatusRow : FlowLayoutWidget { - private TextWidget activePrintInfo; private TextWidget activePrintLabel; private TextWidget activePrintName; private PartThumbnailWidget activePrintPreviewImage; @@ -160,15 +159,10 @@ namespace MatterHackers.MatterControl.ActionBar activePrintStatus.Text = ""; activePrintStatus.Margin = new BorderDouble(top: 3); - activePrintInfo = getPrintStatusLabel("", pointSize: 11); - activePrintInfo.AutoExpandBoundsToText = true; - - PrintActionRow printActionRow = new PrintActionRow(queueDataView); - container.AddChild(topRow); container.AddChild(activePrintName); container.AddChild(activePrintStatus); - container.AddChild(printActionRow); + container.AddChild(new PrintActionRow(queueDataView)); return container; } @@ -306,7 +300,6 @@ namespace MatterHackers.MatterControl.ActionBar { case PrinterConnectionAndCommunication.CommunicationStates.PreparingToPrint: activePrintLabel.Text = "Preparing To Print".Localize() + ":"; - activePrintInfo.Text = ""; break; case PrinterConnectionAndCommunication.CommunicationStates.Printing: From f7bd0fcda231b753cba8837e8ba03dd183915049 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Wed, 1 Mar 2017 17:32:58 -0800 Subject: [PATCH 2/2] Display connection failure on PrintActionRow --- ActionBar/PrintStatusRow.cs | 44 +++++++++-------------- ActionBar/TouchScreenPrintStatusRow.cs | 48 +++++++++----------------- 2 files changed, 32 insertions(+), 60 deletions(-) diff --git a/ActionBar/PrintStatusRow.cs b/ActionBar/PrintStatusRow.cs index 13ee33093..876ba23cf 100644 --- a/ActionBar/PrintStatusRow.cs +++ b/ActionBar/PrintStatusRow.cs @@ -296,6 +296,8 @@ namespace MatterHackers.MatterControl.ActionBar } } + activePrintLabel.Text = "Next Print".Localize() + ":"; + switch (PrinterConnectionAndCommunication.Instance.CommunicationState) { case PrinterConnectionAndCommunication.CommunicationStates.PreparingToPrint: @@ -317,35 +319,21 @@ namespace MatterHackers.MatterControl.ActionBar activePrintStatus.Text = totalPrintTimeText; break; + case PrinterConnectionAndCommunication.CommunicationStates.Disconnected: + activePrintStatus.Text = "Not connected. Press 'Connect' to enable printing.".Localize(); + break; + + case PrinterConnectionAndCommunication.CommunicationStates.AttemptingToConnect: + activePrintStatus.Text = "Attempting to Connect".Localize() + "..."; + break; + + case PrinterConnectionAndCommunication.CommunicationStates.ConnectionLost: + case PrinterConnectionAndCommunication.CommunicationStates.FailedToConnect: + activePrintStatus.Text = "Connection Failed".Localize() + ": " + PrinterConnectionAndCommunication.Instance.ConnectionFailureMessage; + break; + default: - activePrintLabel.Text = "Next Print".Localize() + ":"; - - string statusMessage = ""; - - if (!ActiveSliceSettings.Instance.PrinterSelected) - { - statusMessage = "Select a Printer.".Localize(); - } - else - { - switch (PrinterConnectionAndCommunication.Instance.CommunicationState) - { - case PrinterConnectionAndCommunication.CommunicationStates.Disconnected: - statusMessage = "Not connected. Press 'Connect' to enable printing.".Localize(); - break; - - case PrinterConnectionAndCommunication.CommunicationStates.AttemptingToConnect: - statusMessage = "Attempting to Connect".Localize() + "..."; - break; - - case PrinterConnectionAndCommunication.CommunicationStates.ConnectionLost: - case PrinterConnectionAndCommunication.CommunicationStates.FailedToConnect: - statusMessage = "Unable to communicate with printer.".Localize(); - break; - } - } - - activePrintStatus.Text = statusMessage; + activePrintStatus.Text = ActiveSliceSettings.Instance.PrinterSelected ? "" : "Select a Printer.".Localize(); break; } } diff --git a/ActionBar/TouchScreenPrintStatusRow.cs b/ActionBar/TouchScreenPrintStatusRow.cs index 796078074..1cbf397db 100644 --- a/ActionBar/TouchScreenPrintStatusRow.cs +++ b/ActionBar/TouchScreenPrintStatusRow.cs @@ -43,7 +43,6 @@ namespace MatterHackers.MatterControl.ActionBar { public class TouchScreenPrintStatusRow : FlowLayoutWidget { - private TextWidget activePrintInfo; private TextWidget activePrintLabel; private TextWidget activePrintName; private PartThumbnailWidget activePrintPreviewImage; @@ -197,9 +196,6 @@ namespace MatterHackers.MatterControl.ActionBar activePrintStatus.Text = ""; activePrintStatus.Margin = new BorderDouble(top: 3); - activePrintInfo = getPrintStatusLabel("", pointSize: 11); - activePrintInfo.AutoExpandBoundsToText = true; - labelContainer.AddChild(activePrintName); labelContainer.AddChild(activePrintStatus); } @@ -343,11 +339,12 @@ namespace MatterHackers.MatterControl.ActionBar } } + activePrintLabel.Text = "Next Print".Localize() + ":"; + switch (PrinterConnectionAndCommunication.Instance.CommunicationState) { case PrinterConnectionAndCommunication.CommunicationStates.PreparingToPrint: activePrintLabel.Text = "Preparing To Print".Localize() + ":"; - activePrintInfo.Text = ""; break; case PrinterConnectionAndCommunication.CommunicationStates.Printing: @@ -365,34 +362,21 @@ namespace MatterHackers.MatterControl.ActionBar activePrintStatus.Text = totalPrintTimeText; break; + case PrinterConnectionAndCommunication.CommunicationStates.Disconnected: + activePrintStatus.Text = "Not connected. Press 'Connect' to enable printing.".Localize(); + break; + + case PrinterConnectionAndCommunication.CommunicationStates.AttemptingToConnect: + activePrintStatus.Text = "Attempting to Connect".Localize() + "..."; + break; + + case PrinterConnectionAndCommunication.CommunicationStates.ConnectionLost: + case PrinterConnectionAndCommunication.CommunicationStates.FailedToConnect: + activePrintStatus.Text = "Connection Failed".Localize() + ": " + PrinterConnectionAndCommunication.Instance.ConnectionFailureMessage; + break; + default: - activePrintLabel.Text = "Next Print".Localize() + ":"; - - string statusMessage = ""; - if (!ActiveSliceSettings.Instance.PrinterSelected) - { - statusMessage = "Select a printer.".Localize(); - } - else - { - switch (PrinterConnectionAndCommunication.Instance.CommunicationState) - { - case PrinterConnectionAndCommunication.CommunicationStates.Disconnected: - statusMessage = "Not connected. Press 'Connect' to enable printing.".Localize(); - break; - - case PrinterConnectionAndCommunication.CommunicationStates.AttemptingToConnect: - statusMessage = "Attempting to Connect".Localize() + "..."; - break; - - case PrinterConnectionAndCommunication.CommunicationStates.ConnectionLost: - case PrinterConnectionAndCommunication.CommunicationStates.FailedToConnect: - statusMessage = "Unable to communicate with printer.".Localize(); - break; - } - } - - activePrintStatus.Text = statusMessage; + activePrintStatus.Text = ActiveSliceSettings.Instance.PrinterSelected ? "" : "Select a Printer.".Localize(); break; } }