Remove dead code
This commit is contained in:
John Lewin
parent
316caff877
commit
6a99f16d6e
4 changed files with 12 additions and 723 deletions
|
|
@ -1,221 +0,0 @@
|
|||
using MatterHackers.Agg;
|
||||
using MatterHackers.Agg.Platform;
|
||||
using MatterHackers.Agg.UI;
|
||||
using MatterHackers.Agg.VertexSource;
|
||||
using MatterHackers.Localizations;
|
||||
using MatterHackers.MatterControl.DataStorage;
|
||||
using MatterHackers.MatterControl.SlicerConfiguration;
|
||||
using MatterHackers.SerialPortCommunication.FrostedSerial;
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text.RegularExpressions;
|
||||
|
||||
namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
|
||||
{
|
||||
public class SerialPortIndexRadioButton : RadioButton
|
||||
{
|
||||
public string PortValue;
|
||||
|
||||
public SerialPortIndexRadioButton(string label, string value)
|
||||
: base(label)
|
||||
{
|
||||
PortValue = value;
|
||||
}
|
||||
}
|
||||
|
||||
public class PrinterSelectRadioButton : RadioButton
|
||||
{
|
||||
public PrinterInfo printer;
|
||||
|
||||
public PrinterSelectRadioButton(PrinterInfo printer)
|
||||
: base(printer.Name)
|
||||
{
|
||||
this.printer = printer;
|
||||
}
|
||||
}
|
||||
|
||||
public class OptionContainer : GuiWidget
|
||||
{
|
||||
private Color borderColor = new Color(63, 63, 70);
|
||||
private Color backgroundColor = ActiveTheme.Instance.PrimaryBackgroundColor;
|
||||
|
||||
public OptionContainer()
|
||||
: base()
|
||||
{
|
||||
this.Margin = new BorderDouble(2, 5, 2, 0);
|
||||
this.BackgroundColor = backgroundColor;
|
||||
}
|
||||
|
||||
public override void OnDraw(Agg.Graphics2D graphics2D)
|
||||
{
|
||||
base.OnDraw(graphics2D);
|
||||
graphics2D.Rectangle(LocalBounds, borderColor);
|
||||
}
|
||||
}
|
||||
|
||||
public class ActionLinkFactory
|
||||
{
|
||||
public ActionLink Generate(string linkText, int fontSize, EventHandler<MouseEventArgs> clickEvent)
|
||||
{
|
||||
ActionLink actionLink = new ActionLink(linkText, fontSize);
|
||||
if (clickEvent != null)
|
||||
{
|
||||
actionLink.MouseUp += clickEvent;
|
||||
}
|
||||
return actionLink;
|
||||
}
|
||||
}
|
||||
|
||||
public class ActionLink : TextWidget
|
||||
{
|
||||
private bool isUnderlined = true;
|
||||
|
||||
public ActionLink(string text, int fontSize = 10)
|
||||
: base(text, 0, 0, fontSize)
|
||||
{
|
||||
this.Selectable = true;
|
||||
this.Margin = new BorderDouble(3, 0, 3, 0);
|
||||
this.VAnchor = VAnchor.Stretch;
|
||||
this.MouseEnter += new EventHandler(onMouse_Enter);
|
||||
this.MouseLeave += new EventHandler(onMouse_Leave);
|
||||
this.Cursor = Cursors.Hand;
|
||||
}
|
||||
|
||||
public override void OnDraw(Agg.Graphics2D graphics2D)
|
||||
{
|
||||
base.OnDraw(graphics2D);
|
||||
if (this.isUnderlined)
|
||||
{
|
||||
//Printer.TypeFaceStyle.DoUnderline = true;
|
||||
RectangleDouble underline = new RectangleDouble(LocalBounds.Left, LocalBounds.Bottom, LocalBounds.Right, LocalBounds.Bottom);
|
||||
graphics2D.Rectangle(underline, this.TextColor);
|
||||
}
|
||||
}
|
||||
|
||||
private void onMouse_Enter(object sender, EventArgs args)
|
||||
{
|
||||
this.isUnderlined = false;
|
||||
this.Invalidate();
|
||||
}
|
||||
|
||||
private void onMouse_Leave(object sender, EventArgs args)
|
||||
{
|
||||
this.isUnderlined = true;
|
||||
this.Invalidate();
|
||||
}
|
||||
}
|
||||
|
||||
public class PrinterActionLink : ActionLink
|
||||
{
|
||||
public PrinterInfo LinkedPrinter;
|
||||
|
||||
public PrinterActionLink(string text, PrinterInfo printer, int fontSize = 10)
|
||||
: base(text, fontSize)
|
||||
{
|
||||
this.LinkedPrinter = printer;
|
||||
}
|
||||
}
|
||||
|
||||
public class DetailRow : FlowLayoutWidget
|
||||
{
|
||||
public List<GuiWidget> showOnHoverChildren = new List<GuiWidget>();
|
||||
|
||||
public DetailRow()
|
||||
: base(FlowDirection.LeftToRight)
|
||||
{
|
||||
this.MouseEnter += new EventHandler(onMouse_Enter);
|
||||
this.MouseLeave += new EventHandler(onMouse_Leave);
|
||||
}
|
||||
|
||||
private void onMouse_Enter(object sender, EventArgs args)
|
||||
{
|
||||
foreach (GuiWidget item in showOnHoverChildren)
|
||||
{
|
||||
item.Visible = true;
|
||||
}
|
||||
this.Invalidate();
|
||||
}
|
||||
|
||||
private void onMouse_Leave(object sender, EventArgs args)
|
||||
{
|
||||
foreach (GuiWidget item in showOnHoverChildren)
|
||||
{
|
||||
item.Visible = false;
|
||||
}
|
||||
this.Invalidate();
|
||||
}
|
||||
}
|
||||
|
||||
public class LabelContainer : GuiWidget
|
||||
{
|
||||
private Color backgroundColor = new Color(0, 140, 158);
|
||||
|
||||
public LabelContainer()
|
||||
: base()
|
||||
{
|
||||
this.Margin = new BorderDouble(2, -2, 2, 5);
|
||||
this.Padding = new BorderDouble(3);
|
||||
this.BackgroundColor = backgroundColor;
|
||||
}
|
||||
|
||||
public override void OnDraw(Agg.Graphics2D graphics2D)
|
||||
{
|
||||
base.OnDraw(graphics2D);
|
||||
}
|
||||
}
|
||||
|
||||
//Base widget for use in ButtonStatesViewWidget
|
||||
public class ControlButtonViewBase : GuiWidget
|
||||
{
|
||||
protected Color fillColor;
|
||||
protected Color borderColor;
|
||||
protected double borderWidth;
|
||||
protected double borderRadius;
|
||||
protected double padding;
|
||||
|
||||
public ControlButtonViewBase(string label,
|
||||
double width,
|
||||
double height,
|
||||
double textHeight,
|
||||
double borderWidth,
|
||||
double borderRadius,
|
||||
double padding,
|
||||
Color textColor,
|
||||
Color fillColor,
|
||||
Color borderColor)
|
||||
: base(width, height)
|
||||
{
|
||||
this.borderRadius = borderRadius;
|
||||
this.borderWidth = borderWidth;
|
||||
this.fillColor = fillColor;
|
||||
this.borderColor = borderColor;
|
||||
this.padding = padding;
|
||||
|
||||
TextWidget buttonText = new TextWidget(label, textHeight);
|
||||
buttonText.VAnchor = VAnchor.Center;
|
||||
buttonText.HAnchor = HAnchor.Center;
|
||||
buttonText.TextColor = textColor;
|
||||
|
||||
//this.AnchorAll();
|
||||
this.AddChild(buttonText);
|
||||
}
|
||||
|
||||
public override void OnDraw(Graphics2D graphics2D)
|
||||
{
|
||||
RectangleDouble Bounds = LocalBounds;
|
||||
RoundedRect rectBorder = new RoundedRect(Bounds, this.borderRadius);
|
||||
|
||||
graphics2D.Render(rectBorder, borderColor);
|
||||
|
||||
RectangleDouble insideBounds = Bounds;
|
||||
insideBounds.Inflate(-this.borderWidth);
|
||||
RoundedRect rectInside = new RoundedRect(insideBounds, Math.Max(this.borderRadius - this.borderWidth, 0));
|
||||
|
||||
graphics2D.Render(rectInside, this.fillColor);
|
||||
|
||||
base.OnDraw(graphics2D);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,500 +0,0 @@
|
|||
using MatterHackers.Agg;
|
||||
using MatterHackers.Agg.UI;
|
||||
using MatterHackers.Localizations;
|
||||
using MatterHackers.MatterControl.CustomWidgets;
|
||||
using MatterHackers.MatterControl.DataStorage;
|
||||
using MatterHackers.MatterControl.PrinterCommunication;
|
||||
using MatterHackers.MatterControl.SlicerConfiguration;
|
||||
using MatterHackers.SerialPortCommunication.FrostedSerial;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics;
|
||||
using System.Linq;
|
||||
|
||||
namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
|
||||
{
|
||||
public class EditConnectionWidget : ConnectionWidgetBase
|
||||
{
|
||||
private List<BaudRateRadioButton> BaudRateButtonsList = new List<BaudRateRadioButton>();
|
||||
private FlowLayoutWidget ConnectionControlContainer;
|
||||
private SettingsProfile ActivePrinter;
|
||||
private MHTextEditWidget printerNameInput;
|
||||
private MHTextEditWidget otherBaudRateInput;
|
||||
private MHTextEditWidget printerModelInput;
|
||||
private MHTextEditWidget printerMakeInput;
|
||||
private LinkButtonFactory linkButtonFactory = new LinkButtonFactory();
|
||||
private Button saveButton;
|
||||
private Button cancelButton;
|
||||
private GuiWidget comPortLabelWidget;
|
||||
private GuiWidget baudRateWidget;
|
||||
private RadioButton otherBaudRateRadioButton;
|
||||
private CheckBox enableAutoconnect;
|
||||
private TextImageButtonFactory textImageButtonFactory = new TextImageButtonFactory();
|
||||
|
||||
private bool addNewPrinterFlag = false;
|
||||
|
||||
public EditConnectionWidget(ConnectionWindow windowController, GuiWidget containerWindowToClose, Printer activePrinter = null, object state = null)
|
||||
: base(windowController, containerWindowToClose)
|
||||
{
|
||||
textImageButtonFactory.normalTextColor = ActiveTheme.Instance.PrimaryTextColor;
|
||||
textImageButtonFactory.hoverTextColor = ActiveTheme.Instance.PrimaryTextColor;
|
||||
textImageButtonFactory.disabledTextColor = ActiveTheme.Instance.PrimaryTextColor;
|
||||
textImageButtonFactory.pressedTextColor = ActiveTheme.Instance.PrimaryTextColor;
|
||||
textImageButtonFactory.borderWidth = 0;
|
||||
|
||||
linkButtonFactory.textColor = ActiveTheme.Instance.PrimaryTextColor;
|
||||
linkButtonFactory.fontSize = 8;
|
||||
|
||||
this.BackgroundColor = ActiveTheme.Instance.SecondaryBackgroundColor;
|
||||
this.AnchorAll();
|
||||
this.Padding = new BorderDouble(0); //To be re-enabled once native borders are turned off
|
||||
|
||||
GuiWidget mainContainer = new FlowLayoutWidget(FlowDirection.TopToBottom);
|
||||
mainContainer.AnchorAll();
|
||||
mainContainer.Padding = new BorderDouble(3, 3, 3, 5);
|
||||
mainContainer.BackgroundColor = ActiveTheme.Instance.PrimaryBackgroundColor;
|
||||
|
||||
string headerTitle;
|
||||
|
||||
if (activePrinter == null)
|
||||
{
|
||||
headerTitle = string.Format("Add a Printer");
|
||||
this.addNewPrinterFlag = true;
|
||||
this.ActivePrinter = new Printer();
|
||||
this.ActivePrinter.Name = "Default Printer";
|
||||
this.ActivePrinter.BaudRate = "250000";
|
||||
try
|
||||
{
|
||||
this.ActivePrinter.ComPort = FrostedSerialPort.GetPortNames().FirstOrDefault();
|
||||
}
|
||||
catch(Exception e)
|
||||
{
|
||||
Debug.Print(e.Message);
|
||||
GuiWidget.BreakInDebugger();
|
||||
//No active COM ports
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
this.ActivePrinter = activePrinter;
|
||||
string editHeaderTitleTxt = LocalizedString.Get("Edit Printer");
|
||||
headerTitle = string.Format("{1} - {0}", this.ActivePrinter.Name, editHeaderTitleTxt);
|
||||
if (this.ActivePrinter.BaudRate == null)
|
||||
{
|
||||
this.ActivePrinter.BaudRate = "250000";
|
||||
}
|
||||
if (this.ActivePrinter.ComPort == null)
|
||||
{
|
||||
try
|
||||
{
|
||||
this.ActivePrinter.ComPort = FrostedSerialPort.GetPortNames().FirstOrDefault();
|
||||
}
|
||||
catch(Exception e)
|
||||
{
|
||||
Debug.Print(e.Message);
|
||||
GuiWidget.BreakInDebugger();
|
||||
//No active COM ports
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
FlowLayoutWidget headerRow = new FlowLayoutWidget(FlowDirection.LeftToRight);
|
||||
headerRow.Margin = new BorderDouble(0, 3, 0, 0);
|
||||
headerRow.Padding = new BorderDouble(0, 3, 0, 3);
|
||||
headerRow.HAnchor = HAnchor.ParentLeftRight;
|
||||
{
|
||||
TextWidget headerLabel = new TextWidget(headerTitle, pointSize: 14);
|
||||
headerLabel.TextColor = this.defaultTextColor;
|
||||
|
||||
headerRow.AddChild(headerLabel);
|
||||
}
|
||||
|
||||
ConnectionControlContainer = new FlowLayoutWidget(FlowDirection.TopToBottom);
|
||||
ConnectionControlContainer.Padding = new BorderDouble(5);
|
||||
ConnectionControlContainer.BackgroundColor = ActiveTheme.Instance.SecondaryBackgroundColor;
|
||||
ConnectionControlContainer.HAnchor = HAnchor.ParentLeftRight;
|
||||
{
|
||||
TextWidget printerNameLabel = new TextWidget(LocalizedString.Get("Name"), 0, 0, 10);
|
||||
printerNameLabel.TextColor = this.defaultTextColor;
|
||||
printerNameLabel.HAnchor = HAnchor.ParentLeftRight;
|
||||
printerNameLabel.Margin = new BorderDouble(0, 0, 0, 1);
|
||||
|
||||
printerNameInput = new MHTextEditWidget(this.ActivePrinter.Name);
|
||||
|
||||
printerNameInput.HAnchor |= HAnchor.ParentLeftRight;
|
||||
|
||||
comPortLabelWidget = new FlowLayoutWidget();
|
||||
|
||||
Button refreshComPorts = linkButtonFactory.Generate(LocalizedString.Get("(refresh)"));
|
||||
refreshComPorts.Margin = new BorderDouble(left: 5);
|
||||
refreshComPorts.VAnchor = VAnchor.ParentBottom;
|
||||
refreshComPorts.Click += new EventHandler(RefreshComPorts);
|
||||
|
||||
FlowLayoutWidget comPortContainer = null;
|
||||
|
||||
#if !__ANDROID__
|
||||
TextWidget comPortLabel = new TextWidget(LocalizedString.Get("Serial Port"), 0, 0, 10);
|
||||
comPortLabel.TextColor = this.defaultTextColor;
|
||||
|
||||
comPortLabelWidget.AddChild(comPortLabel);
|
||||
comPortLabelWidget.AddChild(refreshComPorts);
|
||||
comPortLabelWidget.Margin = new BorderDouble(0, 0, 0, 10);
|
||||
comPortLabelWidget.HAnchor = HAnchor.ParentLeftRight;
|
||||
|
||||
comPortContainer = new FlowLayoutWidget(FlowDirection.TopToBottom);
|
||||
comPortContainer.Margin = new BorderDouble(0);
|
||||
comPortContainer.HAnchor = HAnchor.ParentLeftRight;
|
||||
|
||||
CreateSerialPortControls(comPortContainer, this.ActivePrinter.ComPort);
|
||||
#endif
|
||||
|
||||
TextWidget baudRateLabel = new TextWidget(LocalizedString.Get("Baud Rate"), 0, 0, 10);
|
||||
baudRateLabel.TextColor = this.defaultTextColor;
|
||||
baudRateLabel.Margin = new BorderDouble(0, 0, 0, 10);
|
||||
baudRateLabel.HAnchor = HAnchor.ParentLeftRight;
|
||||
|
||||
baudRateWidget = GetBaudRateWidget();
|
||||
baudRateWidget.HAnchor = HAnchor.ParentLeftRight;
|
||||
|
||||
FlowLayoutWidget printerMakeContainer = createPrinterMakeContainer();
|
||||
FlowLayoutWidget printerModelContainer = createPrinterModelContainer();
|
||||
|
||||
enableAutoconnect = new CheckBox(LocalizedString.Get("Auto Connect"));
|
||||
enableAutoconnect.TextColor = ActiveTheme.Instance.PrimaryTextColor;
|
||||
enableAutoconnect.Margin = new BorderDouble(top: 10);
|
||||
enableAutoconnect.HAnchor = HAnchor.ParentLeft;
|
||||
if (this.ActivePrinter.AutoConnectFlag)
|
||||
{
|
||||
enableAutoconnect.Checked = true;
|
||||
}
|
||||
|
||||
if (state as StateBeforeRefresh != null)
|
||||
{
|
||||
enableAutoconnect.Checked = ((StateBeforeRefresh)state).autoConnect;
|
||||
}
|
||||
|
||||
SerialPortControl serialPortScroll = new SerialPortControl();
|
||||
|
||||
if (comPortContainer != null)
|
||||
{
|
||||
serialPortScroll.AddChild(comPortContainer);
|
||||
}
|
||||
|
||||
ConnectionControlContainer.VAnchor = VAnchor.ParentBottomTop;
|
||||
ConnectionControlContainer.AddChild(printerNameLabel);
|
||||
ConnectionControlContainer.AddChild(printerNameInput);
|
||||
ConnectionControlContainer.AddChild(printerMakeContainer);
|
||||
ConnectionControlContainer.AddChild(printerModelContainer);
|
||||
ConnectionControlContainer.AddChild(comPortLabelWidget);
|
||||
ConnectionControlContainer.AddChild(serialPortScroll);
|
||||
ConnectionControlContainer.AddChild(baudRateLabel);
|
||||
ConnectionControlContainer.AddChild(baudRateWidget);
|
||||
#if !__ANDROID__
|
||||
ConnectionControlContainer.AddChild(enableAutoconnect);
|
||||
#endif
|
||||
}
|
||||
|
||||
FlowLayoutWidget buttonContainer = new FlowLayoutWidget(FlowDirection.LeftToRight);
|
||||
buttonContainer.HAnchor = HAnchor.ParentLeft | HAnchor.ParentRight;
|
||||
//buttonContainer.VAnchor = VAnchor.BottomTop;
|
||||
buttonContainer.Margin = new BorderDouble(0, 5, 0, 3);
|
||||
{
|
||||
//Construct buttons
|
||||
saveButton = textImageButtonFactory.Generate(LocalizedString.Get("Save"));
|
||||
//saveButton.VAnchor = VAnchor.Bottom;
|
||||
|
||||
cancelButton = textImageButtonFactory.Generate(LocalizedString.Get("Cancel"));
|
||||
//cancelButton.VAnchor = VAnchor.Bottom;
|
||||
cancelButton.Click += new EventHandler(CancelButton_Click);
|
||||
|
||||
//Add buttons to buttonContainer
|
||||
buttonContainer.AddChild(saveButton);
|
||||
buttonContainer.AddChild(new HorizontalSpacer());
|
||||
buttonContainer.AddChild(cancelButton);
|
||||
}
|
||||
|
||||
//mainContainer.AddChild(new PrinterChooser());
|
||||
|
||||
mainContainer.AddChild(headerRow);
|
||||
mainContainer.AddChild(ConnectionControlContainer);
|
||||
mainContainer.AddChild(buttonContainer);
|
||||
|
||||
#if __ANDROID__
|
||||
this.AddChild(new SoftKeyboardContentOffset(mainContainer));
|
||||
#else
|
||||
this.AddChild(mainContainer);
|
||||
#endif
|
||||
|
||||
BindSaveButtonHandlers();
|
||||
BindBaudRateHandlers();
|
||||
}
|
||||
|
||||
private FlowLayoutWidget createPrinterMakeContainer()
|
||||
{
|
||||
FlowLayoutWidget container = new FlowLayoutWidget(FlowDirection.TopToBottom);
|
||||
container.Margin = new BorderDouble(0, 5);
|
||||
BorderDouble elementMargin = new BorderDouble(top: 3);
|
||||
|
||||
TextWidget printerManufacturerLabel = new TextWidget(LocalizedString.Get("Make"), 0, 0, 10);
|
||||
printerManufacturerLabel.TextColor = this.defaultTextColor;
|
||||
printerManufacturerLabel.HAnchor = HAnchor.ParentLeftRight;
|
||||
printerManufacturerLabel.Margin = elementMargin;
|
||||
|
||||
string printerMake = "";
|
||||
if (this.ActivePrinter.Make != null)
|
||||
{
|
||||
printerMake = this.ActivePrinter.Make;
|
||||
}
|
||||
|
||||
printerMakeInput = new MHTextEditWidget(printerMake);
|
||||
printerMakeInput.HAnchor |= HAnchor.ParentLeftRight;
|
||||
printerMakeInput.Margin = elementMargin;
|
||||
|
||||
container.AddChild(printerManufacturerLabel);
|
||||
container.AddChild(printerMakeInput);
|
||||
|
||||
container.HAnchor = HAnchor.ParentLeftRight;
|
||||
return container;
|
||||
}
|
||||
|
||||
private FlowLayoutWidget createPrinterModelContainer()
|
||||
{
|
||||
FlowLayoutWidget container = new FlowLayoutWidget(FlowDirection.TopToBottom);
|
||||
container.Margin = new BorderDouble(0, 5);
|
||||
BorderDouble elementMargin = new BorderDouble(top: 3);
|
||||
|
||||
TextWidget printerModelLabel = new TextWidget(LocalizedString.Get("Model"), 0, 0, 10);
|
||||
printerModelLabel.TextColor = this.defaultTextColor;
|
||||
printerModelLabel.HAnchor = HAnchor.ParentLeftRight;
|
||||
printerModelLabel.Margin = elementMargin;
|
||||
|
||||
string printerModel = "";
|
||||
if (this.ActivePrinter.Model != null)
|
||||
{
|
||||
printerModel = this.ActivePrinter.Model;
|
||||
}
|
||||
|
||||
printerModelInput = new MHTextEditWidget(printerModel);
|
||||
printerModelInput.HAnchor |= HAnchor.ParentLeftRight;
|
||||
printerModelInput.Margin = elementMargin;
|
||||
|
||||
container.AddChild(printerModelLabel);
|
||||
container.AddChild(printerModelInput);
|
||||
|
||||
container.HAnchor = HAnchor.ParentLeftRight;
|
||||
return container;
|
||||
}
|
||||
|
||||
public GuiWidget GetBaudRateWidget()
|
||||
{
|
||||
FlowLayoutWidget baudRateContainer = new FlowLayoutWidget(FlowDirection.TopToBottom);
|
||||
baudRateContainer.Margin = new BorderDouble(0);
|
||||
|
||||
List<string> baudRates = new List<string> { "115200", "250000" };
|
||||
BorderDouble baudRateMargin = new BorderDouble(3, 3, 5, 3);
|
||||
|
||||
foreach (string baudRate in baudRates)
|
||||
{
|
||||
BaudRateRadioButton baudOption = new BaudRateRadioButton(baudRate);
|
||||
BaudRateButtonsList.Add(baudOption);
|
||||
baudOption.Margin = baudRateMargin;
|
||||
baudOption.HAnchor = HAnchor.ParentLeft;
|
||||
baudOption.TextColor = this.subContainerTextColor;
|
||||
if (this.ActivePrinter.BaudRate == baudRate)
|
||||
{
|
||||
baudOption.Checked = true;
|
||||
}
|
||||
baudRateContainer.AddChild(baudOption);
|
||||
}
|
||||
|
||||
otherBaudRateRadioButton = new RadioButton(LocalizedString.Get("Other"));
|
||||
otherBaudRateRadioButton.Margin = baudRateMargin;
|
||||
otherBaudRateRadioButton.TextColor = this.subContainerTextColor;
|
||||
|
||||
baudRateContainer.AddChild(otherBaudRateRadioButton);
|
||||
|
||||
//See if the baud rate of the current print is in the list of displayed rates,
|
||||
//flag the 'other' option if it is not and prefill the rate.
|
||||
otherBaudRateInput = new MHTextEditWidget("");
|
||||
otherBaudRateInput.Visible = false;
|
||||
otherBaudRateInput.HAnchor |= HAnchor.ParentLeftRight;
|
||||
|
||||
if (this.ActivePrinter.BaudRate != null)
|
||||
{
|
||||
if (!baudRates.Contains(this.ActivePrinter.BaudRate.ToString()))
|
||||
{
|
||||
otherBaudRateRadioButton.Checked = true;
|
||||
otherBaudRateInput.Text = this.ActivePrinter.BaudRate.ToString();
|
||||
otherBaudRateInput.Visible = true;
|
||||
}
|
||||
}
|
||||
|
||||
baudRateContainer.AddChild(otherBaudRateInput);
|
||||
return baudRateContainer;
|
||||
}
|
||||
|
||||
private void BindBaudRateHandlers()
|
||||
{
|
||||
otherBaudRateRadioButton.CheckedStateChanged += BindBaudRate_Select;
|
||||
foreach (BaudRateRadioButton button in BaudRateButtonsList)
|
||||
{
|
||||
button.CheckedStateChanged += BindBaudRate_Select;
|
||||
}
|
||||
BindBaudRate_Select(null, null);
|
||||
}
|
||||
|
||||
private void BindBaudRate_Select(object sender, EventArgs e)
|
||||
{
|
||||
if (otherBaudRateRadioButton.Checked == true)
|
||||
{
|
||||
otherBaudRateInput.Visible = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
otherBaudRateInput.Visible = false;
|
||||
}
|
||||
}
|
||||
|
||||
internal class StateBeforeRefresh
|
||||
{
|
||||
internal bool autoConnect;
|
||||
|
||||
internal StateBeforeRefresh(bool autoConnect)
|
||||
{
|
||||
this.autoConnect = autoConnect;
|
||||
}
|
||||
}
|
||||
|
||||
private void RefreshComPorts(object sender, EventArgs mouseEvent)
|
||||
{
|
||||
// TODO: Why would refresh change the active state and why would it need to destroy and recreate
|
||||
// the control rather than just refreshing the content?
|
||||
try
|
||||
{
|
||||
var settings = ActiveSliceSettings.Instance;
|
||||
|
||||
settings.Name = printerNameInput.Text;
|
||||
settings.BaudRate = GetSelectedBaudRate();
|
||||
settings.ComPort = GetSelectedSerialPort();
|
||||
}
|
||||
catch
|
||||
{
|
||||
}
|
||||
this.windowController.ChangedToEditPrinter(this.ActivePrinter, new StateBeforeRefresh(enableAutoconnect.Checked));
|
||||
}
|
||||
|
||||
private void BindSaveButtonHandlers()
|
||||
{
|
||||
saveButton.UnbindClickEvents();
|
||||
saveButton.Text = "Save";
|
||||
saveButton.Enabled = true;
|
||||
saveButton.Click += new EventHandler(SaveButton_Click);
|
||||
}
|
||||
|
||||
private void CloseWindow(object o, EventArgs e)
|
||||
{
|
||||
PrinterConnectionAndCommunication.Instance.HaltConnectionThread();
|
||||
this.containerWindowToClose.Close();
|
||||
}
|
||||
|
||||
private void CancelButton_Click(object sender, EventArgs mouseEvent)
|
||||
{
|
||||
if (GetPrinterRecordCount() > 0)
|
||||
{
|
||||
this.windowController.ChangeToChoosePrinter();
|
||||
}
|
||||
else
|
||||
{
|
||||
UiThread.RunOnIdle(() =>
|
||||
{
|
||||
this.containerWindowToClose.Close();
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
private void SaveButton_Click(object sender, EventArgs mouseEvent)
|
||||
{
|
||||
this.ActivePrinter.Name = printerNameInput.Text;
|
||||
try
|
||||
{
|
||||
this.ActivePrinter.BaudRate = GetSelectedBaudRate();
|
||||
this.ActivePrinter.ComPort = GetSelectedSerialPort();
|
||||
|
||||
// TODO: These should be read only properties that describe what OEM definition your settings came from
|
||||
//this.ActivePrinter.Make = printerMakeInput.Text;
|
||||
//this.ActivePrinter.Model = printerModelInput.Text;
|
||||
this.ActivePrinter.AutoConnectFlag = enableAutoconnect.Checked;
|
||||
}
|
||||
catch
|
||||
{
|
||||
//Unable to retrieve Baud or Port, possibly because they weren't shown as options - needs better handling
|
||||
}
|
||||
|
||||
this.windowController.ChangeToChoosePrinter();
|
||||
}
|
||||
|
||||
private string GetSelectedBaudRate()
|
||||
{
|
||||
foreach (BaudRateRadioButton button in BaudRateButtonsList)
|
||||
{
|
||||
if (button.Checked)
|
||||
{
|
||||
return button.BaudRate.ToString();
|
||||
}
|
||||
}
|
||||
if (otherBaudRateRadioButton.Checked)
|
||||
{
|
||||
return otherBaudRateInput.Text;
|
||||
}
|
||||
|
||||
throw new Exception(LocalizedString.Get("Could not find a selected button."));
|
||||
}
|
||||
|
||||
private string GetSelectedSerialPort()
|
||||
{
|
||||
foreach (SerialPortIndexRadioButton button in SerialPortButtonsList)
|
||||
{
|
||||
if (button.Checked)
|
||||
{
|
||||
return button.PortValue;
|
||||
}
|
||||
}
|
||||
|
||||
throw new Exception(LocalizedString.Get("Could not find a selected button."));
|
||||
}
|
||||
}
|
||||
|
||||
internal class SerialPortControl : ScrollableWidget
|
||||
{
|
||||
private FlowLayoutWidget topToBottomItemList;
|
||||
|
||||
public SerialPortControl()
|
||||
{
|
||||
this.AnchorAll();
|
||||
this.AutoScroll = true;
|
||||
this.ScrollArea.HAnchor |= Agg.UI.HAnchor.ParentLeftRight;
|
||||
|
||||
topToBottomItemList = new FlowLayoutWidget(FlowDirection.TopToBottom);
|
||||
topToBottomItemList.HAnchor = Agg.UI.HAnchor.Max_FitToChildren_ParentWidth;
|
||||
topToBottomItemList.Margin = new BorderDouble(top: 3);
|
||||
|
||||
base.AddChild(topToBottomItemList);
|
||||
}
|
||||
|
||||
public void RemoveScrollChildren()
|
||||
{
|
||||
topToBottomItemList.RemoveAllChildren();
|
||||
}
|
||||
|
||||
public override void AddChild(GuiWidget child, int indexInChildrenList = -1)
|
||||
{
|
||||
FlowLayoutWidget itemHolder = new FlowLayoutWidget();
|
||||
itemHolder.Margin = new BorderDouble(0, 0, 0, 0);
|
||||
itemHolder.HAnchor = Agg.UI.HAnchor.Max_FitToChildren_ParentWidth;
|
||||
itemHolder.AddChild(child);
|
||||
itemHolder.VAnchor = VAnchor.FitToChildren;
|
||||
|
||||
topToBottomItemList.AddChild(itemHolder, indexInChildrenList);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
Copyright (c) 2017, Lars Brubaker, John Lewin
|
||||
Copyright (c) 2018, Lars Brubaker, John Lewin
|
||||
All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
|
|
@ -38,6 +38,17 @@ using MatterHackers.SerialPortCommunication.FrostedSerial;
|
|||
|
||||
namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
|
||||
{
|
||||
public class SerialPortIndexRadioButton : RadioButton
|
||||
{
|
||||
public string PortValue;
|
||||
|
||||
public SerialPortIndexRadioButton(string label, string value)
|
||||
: base(label)
|
||||
{
|
||||
PortValue = value;
|
||||
}
|
||||
}
|
||||
|
||||
public class SetupStepComPortManual : DialogPage
|
||||
{
|
||||
private GuiWidget nextButton;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue