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

Changed ConnectionStateChanged => CommunicationStateChanged

Browse source 
Put in support for running the print level wizard on first print.
Set the R1 to need print leveling
This commit is contained in:
larsbrubaker 2014-05-30 14:37:30 -07:00
parent 449678597a
commit 12650e854e
24 changed files with 84 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

2
PrinterControls/PrinterConnections/SetupStepComPortManual.cs
View file

@ -45,7 +45,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
connectButton = textImageButtonFactory.Generate(LocalizedString.Get("Connect"));
connectButton.Click += new ButtonBase.ButtonEventHandler(ConnectButton_Click);
PrinterCommunication.Instance.ConnectionStateChanged.RegisterEvent(onPrinterStatusChanged, ref unregisterEvents);
PrinterCommunication.Instance.CommunicationStateChanged.RegisterEvent(onPrinterStatusChanged, ref unregisterEvents);
refreshButton = textImageButtonFactory.Generate(LocalizedString.Get("Refresh"));
refreshButton.Click += new ButtonBase.ButtonEventHandler(RefreshButton_Click);

2
PrinterControls/PrinterConnections/SetupStepComPortTwo.cs
View file

@ -41,7 +41,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
connectButton = textImageButtonFactory.Generate(LocalizedString.Get("Connect"));
connectButton.Click += new ButtonBase.ButtonEventHandler(ConnectButton_Click);
PrinterCommunication.Instance.ConnectionStateChanged.RegisterEvent(onPrinterStatusChanged, ref unregisterEvents);
PrinterCommunication.Instance.CommunicationStateChanged.RegisterEvent(onPrinterStatusChanged, ref unregisterEvents);
GuiWidget hSpacer = new GuiWidget();
hSpacer.HAnchor = HAnchor.ParentLeftRight;

9
PrinterControls/PrinterConnections/SetupStepMakeModelName.cs
View file

@ -202,6 +202,13 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
ActivePrinter.BaudRate = baudRate;
}
// Check if we need to run the print level wizard before printing
string needsPrintLeveling;
if (settingsDict.TryGetValue("needs_print_leveling", out needsPrintLeveling))
{
ActivePrinter.NeedsPrintLeveling = true;
}
string defaultSliceEngine;
if (settingsDict.TryGetValue("default_slice_engine", out defaultSliceEngine))
{
@ -254,8 +261,6 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
}
}
private Dictionary<string, string> LoadPrinterSetupFromFile(string make, string model)
{
string setupSettingsPathAndFile = Path.Combine(ApplicationDataStorage.Instance.ApplicationStaticDataPath, "PrinterSettings", make, model, "setup.ini");