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

Move up or home z after printing templates

Browse source
This commit is contained in:
jlewin 2019-02-21 14:57:06 -08:00
parent 3e232cc279
commit 79c448ba2b
1 changed files with 33 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

33
MatterControlLib/CustomWidgets/NozzleOffsetCalibrationPage.cs
View file

@ -28,9 +28,16 @@ either expressed or implied, of the FreeBSD Project.
*/
using System;
using System.IO;
using System.Threading;
using System.Threading.Tasks;
using MatterHackers.Agg;
using MatterHackers.Agg.UI;
using MatterHackers.Localizations;
using MatterHackers.MatterControl.DataStorage;
using MatterHackers.MatterControl.PrinterCommunication;
using MatterHackers.MatterControl.SlicerConfiguration;
using MatterHackers.VectorMath;
namespace MatterHackers.MatterControl
{
@ -40,6 +47,9 @@ namespace MatterHackers.MatterControl
private NozzleOffsetTemplateWidget xOffsetWidget;
private NozzleOffsetTemplateWidget yOffsetWidget;
private double activeYOffset = double.MinValue;
private double activeXOffset = double.MinValue;
public NozzleOffsetCalibrationPrintPage(ISetupWizard setupWizard, PrinterConfig printer)
: base(setupWizard)
{
@ -58,12 +68,24 @@ namespace MatterHackers.MatterControl
Padding = new BorderDouble(left: 4)
});
xOffsetWidget.OffsetChanged += (s, e) =>
{
activeXOffset = yOffsetWidget.ActiveOffset;
this.NextButton.Enabled = activeXOffset != double.MinValue && activeYOffset != double.MinValue;
};
contentRow.AddChild(yOffsetWidget = new NozzleOffsetTemplateWidget(templatePrinter.ActiveOffsets, FlowDirection.TopToBottom, theme)
{
Margin = new BorderDouble(top: 15),
Padding = new BorderDouble(top: 4)
});
yOffsetWidget.OffsetChanged += (s, e) =>
{
activeYOffset = yOffsetWidget.ActiveOffset;
this.NextButton.Enabled = activeXOffset != double.MinValue && activeYOffset != double.MinValue;
};
this.NextButton.Enabled = false;
}
@ -109,6 +131,17 @@ namespace MatterHackers.MatterControl
{
Thread.Sleep(500);
}
if (printer.Settings.GetValue<bool>(SettingsKey.z_homes_to_max))
{
printer.Connection.HomeAxis(PrinterConnection.Axis.Z);
}
else
{
printer.Connection.MoveRelative(PrinterConnection.Axis.Z, 20, printer.Settings.Helpers.ManualMovementSpeeds().Z);
}
});
}
public override void OnClosed(EventArgs e)