Json Profiles
This commit is contained in:
John Lewin
parent
bfa2ddafd8
commit
4496720772
93 changed files with 3069 additions and 4120 deletions
|
|
@ -7,6 +7,7 @@ using MatterHackers.MatterControl.SettingsManagement;
|
|||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using MatterHackers.MatterControl.CustomWidgets;
|
||||
using MatterHackers.MatterControl.SlicerConfiguration;
|
||||
|
||||
namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
|
||||
{
|
||||
|
|
@ -19,8 +20,6 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
|
|||
|
||||
private MHTextEditWidget printerNameInput;
|
||||
|
||||
private List<CustomCommands> printerCustomCommands;
|
||||
|
||||
private TextWidget printerNameError;
|
||||
private TextWidget printerModelError;
|
||||
private TextWidget printerMakeError;
|
||||
|
|
@ -31,8 +30,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
|
|||
|
||||
private bool usingDefaultName;
|
||||
|
||||
public SetupStepMakeModelName(ConnectionWindow windowController, GuiWidget containerWindowToClose, PrinterSetupStatus printerSetupStatus = null)
|
||||
: base(windowController, containerWindowToClose, printerSetupStatus)
|
||||
public SetupStepMakeModelName(ConnectionWizard windowController) : base(windowController)
|
||||
{
|
||||
//Construct inputs
|
||||
printerNameContainer = createPrinterNameContainer();
|
||||
|
|
@ -59,7 +57,14 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
|
|||
//Construct buttons
|
||||
nextButton = textImageButtonFactory.Generate(LocalizedString.Get("Save & Continue"));
|
||||
nextButton.Name = "Save & Continue Button";
|
||||
nextButton.Click += new EventHandler(NextButton_Click);
|
||||
nextButton.Click += (s, e) =>
|
||||
{
|
||||
bool canContinue = this.OnSave();
|
||||
if (canContinue)
|
||||
{
|
||||
UiThread.RunOnIdle(connectionWizard.Close);
|
||||
}
|
||||
};
|
||||
|
||||
//Add buttons to buttonContainer
|
||||
footerRow.AddChild(nextButton);
|
||||
|
|
@ -68,10 +73,10 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
|
|||
|
||||
usingDefaultName = true;
|
||||
|
||||
SetElementState();
|
||||
SetElementVisibility();
|
||||
}
|
||||
|
||||
private void SetElementState()
|
||||
private void SetElementVisibility()
|
||||
{
|
||||
printerModelContainer.Visible = (this.ActivePrinter.Make != null);
|
||||
nextButton.Visible = (this.ActivePrinter.Model != null && this.ActivePrinter.Make != null);
|
||||
|
|
@ -79,93 +84,104 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
|
|||
|
||||
private FlowLayoutWidget createPrinterNameContainer()
|
||||
{
|
||||
TextWidget printerNameLabel = new TextWidget("Name".Localize() + ":", 0, 0, 12)
|
||||
{
|
||||
TextColor = ActiveTheme.Instance.PrimaryTextColor,
|
||||
HAnchor = HAnchor.ParentLeftRight,
|
||||
Margin = new BorderDouble(0, 0, 0, 1)
|
||||
};
|
||||
|
||||
printerNameInput = new MHTextEditWidget(this.ActivePrinter.Name)
|
||||
{
|
||||
HAnchor = HAnchor.ParentLeftRight,
|
||||
};
|
||||
printerNameInput.KeyPressed += (s, e) => this.usingDefaultName = false;
|
||||
|
||||
printerNameError = new TextWidget("Give your printer a name.".Localize(), 0, 0, 10)
|
||||
{
|
||||
TextColor = ActiveTheme.Instance.PrimaryTextColor,
|
||||
HAnchor = HAnchor.ParentLeftRight,
|
||||
Margin = new BorderDouble(top: 3)
|
||||
};
|
||||
|
||||
FlowLayoutWidget container = new FlowLayoutWidget(FlowDirection.TopToBottom);
|
||||
container.Margin = new BorderDouble(0, 5);
|
||||
BorderDouble elementMargin = new BorderDouble(top: 3);
|
||||
|
||||
string printerNameLabelTxt = LocalizedString.Get("Name");
|
||||
string printerNameLabelTxtFull = string.Format("{0}:", printerNameLabelTxt);
|
||||
TextWidget printerNameLabel = new TextWidget(printerNameLabelTxtFull, 0, 0, 12);
|
||||
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;
|
||||
printerNameInput.KeyPressed += PrinterNameInput_KeyPressed;
|
||||
|
||||
printerNameError = new TextWidget(LocalizedString.Get("Give your printer a name."), 0, 0, 10);
|
||||
printerNameError.TextColor = ActiveTheme.Instance.PrimaryTextColor;
|
||||
printerNameError.HAnchor = HAnchor.ParentLeftRight;
|
||||
printerNameError.Margin = elementMargin;
|
||||
|
||||
container.AddChild(printerNameLabel);
|
||||
container.AddChild(printerNameInput);
|
||||
container.AddChild(printerNameError);
|
||||
container.HAnchor = HAnchor.ParentLeftRight;
|
||||
|
||||
return container;
|
||||
}
|
||||
|
||||
private FlowLayoutWidget createPrinterMakeContainer()
|
||||
{
|
||||
FlowLayoutWidget container = new FlowLayoutWidget(FlowDirection.TopToBottom);
|
||||
container.Margin = new BorderDouble(0, 5);
|
||||
BorderDouble elementMargin = new BorderDouble(top: 3);
|
||||
|
||||
string printerManufacturerLabelTxt = LocalizedString.Get("Make");
|
||||
string printerManufacturerLabelTxtFull = string.Format("{0}:", printerManufacturerLabelTxt);
|
||||
TextWidget printerManufacturerLabel = new TextWidget(printerManufacturerLabelTxtFull, 0, 0, 12);
|
||||
printerManufacturerLabel.TextColor = this.defaultTextColor;
|
||||
printerManufacturerLabel.HAnchor = HAnchor.ParentLeftRight;
|
||||
printerManufacturerLabel.Margin = elementMargin;
|
||||
TextWidget printerManufacturerLabel = new TextWidget("Make".Localize() + ":", 0, 0, 12)
|
||||
{
|
||||
TextColor = ActiveTheme.Instance.PrimaryTextColor,
|
||||
HAnchor = HAnchor.ParentLeftRight,
|
||||
Margin = elementMargin
|
||||
};
|
||||
|
||||
printerManufacturerSelector = new PrinterChooser();
|
||||
printerManufacturerSelector.HAnchor = HAnchor.ParentLeftRight;
|
||||
printerManufacturerSelector.Margin = elementMargin;
|
||||
printerManufacturerSelector.ManufacturerDropList.SelectionChanged += new EventHandler(ManufacturerDropList_SelectionChanged);
|
||||
printerManufacturerSelector = new PrinterChooser()
|
||||
{
|
||||
HAnchor = HAnchor.ParentLeftRight,
|
||||
Margin = elementMargin
|
||||
};
|
||||
printerManufacturerSelector.ManufacturerDropList.SelectionChanged += ManufacturerDropList_SelectionChanged;
|
||||
|
||||
printerMakeError = new TextWidget(LocalizedString.Get("Select the printer manufacturer"), 0, 0, 10);
|
||||
printerMakeError.TextColor = ActiveTheme.Instance.PrimaryTextColor;
|
||||
printerMakeError.HAnchor = HAnchor.ParentLeftRight;
|
||||
printerMakeError.Margin = elementMargin;
|
||||
printerMakeError = new TextWidget("Select the printer manufacturer".Localize(), 0, 0, 10)
|
||||
{
|
||||
TextColor = ActiveTheme.Instance.PrimaryTextColor,
|
||||
HAnchor = HAnchor.ParentLeftRight,
|
||||
Margin = elementMargin
|
||||
};
|
||||
|
||||
FlowLayoutWidget container = new FlowLayoutWidget(FlowDirection.TopToBottom);
|
||||
container.Margin = new BorderDouble(0, 5);
|
||||
container.AddChild(printerManufacturerLabel);
|
||||
container.AddChild(printerManufacturerSelector);
|
||||
container.AddChild(printerMakeError);
|
||||
|
||||
container.HAnchor = HAnchor.ParentLeftRight;
|
||||
|
||||
return container;
|
||||
}
|
||||
|
||||
private FlowLayoutWidget createPrinterModelContainer(string make = "Other")
|
||||
{
|
||||
FlowLayoutWidget container = new FlowLayoutWidget(FlowDirection.TopToBottom);
|
||||
container.Margin = new BorderDouble(0, 5);
|
||||
BorderDouble elementMargin = new BorderDouble(top: 3);
|
||||
|
||||
string printerModelLabelTxt = LocalizedString.Get("Model");
|
||||
string printerModelLabelTxtFull = string.Format("{0}:", printerModelLabelTxt);
|
||||
TextWidget printerModelLabel = new TextWidget(printerModelLabelTxtFull, 0, 0, 12);
|
||||
printerModelLabel.TextColor = this.defaultTextColor;
|
||||
printerModelLabel.HAnchor = HAnchor.ParentLeftRight;
|
||||
printerModelLabel.Margin = elementMargin;
|
||||
TextWidget printerModelLabel = new TextWidget("Model".Localize() + ":", 0, 0, 12)
|
||||
{
|
||||
TextColor = ActiveTheme.Instance.PrimaryTextColor,
|
||||
HAnchor = HAnchor.ParentLeftRight,
|
||||
Margin = elementMargin
|
||||
};
|
||||
|
||||
ModelChooser printerModelSelector = new ModelChooser(make);
|
||||
printerModelSelector.HAnchor = HAnchor.ParentLeftRight;
|
||||
printerModelSelector.Margin = elementMargin;
|
||||
ModelChooser printerModelSelector = new ModelChooser(make)
|
||||
{
|
||||
HAnchor = HAnchor.ParentLeftRight,
|
||||
Margin = elementMargin
|
||||
};
|
||||
printerModelSelector.ModelDropList.SelectionChanged += new EventHandler(ModelDropList_SelectionChanged);
|
||||
printerModelSelector.SelectIfOnlyOneModel();
|
||||
|
||||
printerModelError = new TextWidget(LocalizedString.Get("Select the printer model"), 0, 0, 10);
|
||||
printerModelError.TextColor = ActiveTheme.Instance.PrimaryTextColor;
|
||||
printerModelError.HAnchor = HAnchor.ParentLeftRight;
|
||||
printerModelError.Margin = elementMargin;
|
||||
printerModelError = new TextWidget("Select the printer model".Localize(), 0, 0, 10)
|
||||
{
|
||||
TextColor = ActiveTheme.Instance.PrimaryTextColor,
|
||||
HAnchor = HAnchor.ParentLeftRight,
|
||||
Margin = elementMargin
|
||||
};
|
||||
|
||||
FlowLayoutWidget container = new FlowLayoutWidget(FlowDirection.TopToBottom);
|
||||
container.Margin = new BorderDouble(0, 5);
|
||||
container.AddChild(printerModelLabel);
|
||||
container.AddChild(printerModelSelector);
|
||||
container.AddChild(printerModelError);
|
||||
|
||||
container.HAnchor = HAnchor.ParentLeftRight;
|
||||
|
||||
return container;
|
||||
}
|
||||
|
||||
|
|
@ -174,7 +190,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
|
|||
ActivePrinter.Make = ((DropDownList)sender).SelectedValue;
|
||||
ActivePrinter.Model = null;
|
||||
ReconstructModelSelector();
|
||||
SetElementState();
|
||||
SetElementVisibility();
|
||||
}
|
||||
|
||||
private void ReconstructModelSelector()
|
||||
|
|
@ -183,8 +199,6 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
|
|||
int currentIndex = contentRow.GetChildIndex(printerModelContainer);
|
||||
contentRow.RemoveChild(printerModelContainer);
|
||||
|
||||
|
||||
|
||||
printerModelContainer = createPrinterModelContainer(ActivePrinter.Make);
|
||||
contentRow.AddChild(printerModelContainer, currentIndex);
|
||||
contentRow.Invalidate();
|
||||
|
|
@ -197,101 +211,53 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
|
|||
UiThread.RunOnIdle(() =>
|
||||
{
|
||||
ActivePrinter.Model = ((DropDownList)sender).SelectedLabel;
|
||||
currentPrinterSetupStatus.LoadSetupSettings(ActivePrinter.Make, ActivePrinter.Model);
|
||||
|
||||
printerModelError.Visible = false;
|
||||
SetElementState();
|
||||
SetElementVisibility();
|
||||
if (usingDefaultName)
|
||||
{
|
||||
// Use ManufacturerDropList.SelectedLabel instead of ActivePrinter.Make to ensure the mapped Unicode values are picked up
|
||||
string mappedMakeText = printerManufacturerSelector.ManufacturerDropList.SelectedLabel;
|
||||
|
||||
string printerInputName = String.Format("{0} {1}", mappedMakeText, this.ActivePrinter.Model);
|
||||
string query = "SELECT Name FROM Printer WHERE Name LIKE @printerName;";
|
||||
var names = Datastore.Instance.dbSQLite.Query<sqlName>(query, printerInputName + "%").Select(item => item.Name).ToList();
|
||||
string printerInputName = String.Format("{0} {1}", mappedMakeText, this.ActivePrinter.Model);
|
||||
var names = ActiveSliceSettings.ProfileData.Profiles.Where(p => p.Name.StartsWith(printerInputName)).Select(p => p.Name).ToList();
|
||||
if (!names.Contains(printerInputName))
|
||||
{
|
||||
printerNameInput.Text = printerInputName;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
if (!names.Contains(printerInputName))
|
||||
{
|
||||
printerNameInput.Text = printerInputName;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
int printerModelCount = 0; //Used to keep track of how many of the printer models we run into before and empty one
|
||||
string possiblePrinterName;
|
||||
int printerModelCount = 1; //Used to keep track of how many of the printer models we run into before and empty one
|
||||
string possiblePrinterName;
|
||||
|
||||
do
|
||||
{
|
||||
printerModelCount++;
|
||||
possiblePrinterName = String.Format("{0} ({1})", printerInputName, printerModelCount);
|
||||
} while (names.Contains(possiblePrinterName));
|
||||
|
||||
|
||||
printerNameInput.Text = possiblePrinterName;
|
||||
}
|
||||
do
|
||||
{
|
||||
possiblePrinterName = String.Format("{0} ({1})", printerInputName, printerModelCount++);
|
||||
} while (names.Contains(possiblePrinterName));
|
||||
|
||||
printerNameInput.Text = possiblePrinterName;
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private void PrinterNameInput_KeyPressed(object sender, KeyPressEventArgs e)
|
||||
{
|
||||
this.usingDefaultName = false;
|
||||
}
|
||||
|
||||
private void MoveToNextWidget()
|
||||
{
|
||||
if (Parent != null) // if it hasn't been closed
|
||||
{
|
||||
if (this.ActivePrinter.BaudRate == null)
|
||||
{
|
||||
Parent.AddChild(new SetupStepBaudRate((ConnectionWindow)Parent, Parent, this.currentPrinterSetupStatus));
|
||||
Parent.RemoveChild(this);
|
||||
}
|
||||
else if (this.currentPrinterSetupStatus.DriversToInstall.Count > 0)
|
||||
{
|
||||
Parent.AddChild(new SetupStepInstallDriver((ConnectionWindow)Parent, Parent, this.currentPrinterSetupStatus));
|
||||
Parent.RemoveChild(this);
|
||||
}
|
||||
else
|
||||
{
|
||||
Parent.AddChild(new SetupStepComPortOne((ConnectionWindow)Parent, Parent, this.currentPrinterSetupStatus));
|
||||
Parent.RemoveChild(this);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void NextButton_Click(object sender, EventArgs mouseEvent)
|
||||
{
|
||||
bool canContinue = this.OnSave();
|
||||
if (canContinue)
|
||||
{
|
||||
this.currentPrinterSetupStatus.LoadCalibrationPrints();
|
||||
UiThread.RunOnIdle(MoveToNextWidget);
|
||||
}
|
||||
}
|
||||
|
||||
public int ExistingPrinterCount()
|
||||
{
|
||||
return Datastore.Instance.RecordCount("Printer");
|
||||
}
|
||||
|
||||
private class sqlName
|
||||
{
|
||||
public string Name { get; set; }
|
||||
}
|
||||
|
||||
private bool OnSave()
|
||||
{
|
||||
if (printerNameInput.Text != "")
|
||||
if (!string.IsNullOrEmpty(printerNameInput.Text))
|
||||
{
|
||||
this.ActivePrinter.Name = printerNameInput.Text;
|
||||
|
||||
if (this.ActivePrinter.Make == null || this.ActivePrinter.Model == null)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
else
|
||||
{
|
||||
Datastore.Instance.dbSQLite.RunInTransaction(currentPrinterSetupStatus.Save);
|
||||
// TODO: Plumb in saving the profile to disk, then setting the instance to be the active profile
|
||||
System.Diagnostics.Debugger.Launch();
|
||||
|
||||
ActiveSliceSettings.AcquireNewProfile(ActivePrinter.Make, ActivePrinter.Model, ActivePrinter.Name);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
@ -300,6 +266,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
|
|||
this.printerNameError.TextColor = RGBA_Bytes.Red;
|
||||
this.printerNameError.Text = "Printer name cannot be blank";
|
||||
this.printerNameError.Visible = true;
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue