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

improve last page of probe calibration and leveling

Browse source 
issue: MatterHackers/MCCentral#4430
Explain where to find the probe calibration on the last page of the wizard

issue: MatterHackers/MCCentral#4431
describe where to find the bed leveling calibration on the last page of leveling wizard
This commit is contained in:
Lars Brubaker 2018-10-30 14:56:31 -07:00
parent 46c50488a5
commit 5d0f788e18
7 changed files with 50 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

7
MatterControlLib/ConfigurationPage/PrintLeveling/LevelingWizardPage.cs
View file

@ -46,8 +46,11 @@ namespace MatterHackers.MatterControl
this.WindowTitle = wizardContext.WindowTitle;
this.HeaderText = headerText;
contentRow.AddChild(
this.CreateTextField(instructionsText.Replace("\t", " ")));
if (!string.IsNullOrEmpty(instructionsText))
{
contentRow.AddChild(
this.CreateTextField(instructionsText.Replace("\t", " ")));
}
nextButton = new TextButton("Next".Localize(), theme)
{

8
MatterControlLib/ConfigurationPage/PrintLeveling/PrintLevelingWizard.cs
View file

@ -209,13 +209,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
yield return new LastPageInstructions(
this,
"Print Leveling Wizard".Localize(),
string.Format(
"{0}! {1}\n\n{2}\n{3}\n\n{4}",
"Congratulations".Localize(),
"Print Leveling is now configured and enabled.".Localize(),
useZProbe ? "" : $"\t• {"Remove the paper".Localize()}\n",
"If you need to recalibrate the printer in the future, the print leveling controls can be found under: Controls, Calibration".Localize(),
"Click 'Done' to close this window.".Localize()),
useZProbe,
probePositions);
}

1
MatterControlLib/ConfigurationPage/PrintLeveling/ProbeCalibrationWizard.cs
View file

@ -182,7 +182,6 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
yield return new CalibrateProbeLastPagelInstructions(
this,
"Done".Localize(),
"Your Probe is now calibrated.".Localize() + "\n\n\t• " + "Remove the paper".Localize() + "\n\n" + "Click 'Done' to close this window.".Localize(),
autoProbePositions,
manualProbePositions);
}

24
MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/CalibrateProbeLastPagelInstructions.cs
View file

@ -28,6 +28,11 @@ either expressed or implied, of the FreeBSD Project.
*/
using System.Collections.Generic;
using System.IO;
using Markdig.Agg;
using MatterHackers.Agg.Platform;
using MatterHackers.Agg.UI;
using MatterHackers.Localizations;
using MatterHackers.MatterControl.PrinterCommunication;
using MatterHackers.MatterControl.SlicerConfiguration;
@ -38,14 +43,29 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
private List<ProbePosition> autoProbePositions;
private List<ProbePosition> manualProbePositions;
public CalibrateProbeLastPagelInstructions(LevelingWizard context, string headerText, string instructionsText,
public CalibrateProbeLastPagelInstructions(LevelingWizard context, string headerText,
List<ProbePosition> autoProbePositions,
List<ProbePosition> manualProbePositions)
: base(context, headerText, instructionsText)
: base(context, headerText, "")
{
this.autoProbePositions = autoProbePositions;
this.manualProbePositions = manualProbePositions;
var calibrated = "Your Probe is now calibrated.".Localize() + "\n"
+ " • " + "Remove the paper".Localize() + "\n"
+ "\n"
+ "If you wish to re-calibrate your probe in the future:".Localize() + "\n"
+ " 1. Select the 'Controls' tab on the right" + "\n"
+ " 2. Look for the calibration section (pictured below)".Localize() + "\n";
contentRow.AddChild(this.CreateTextField(calibrated));
contentRow.AddChild(new ImageWidget(AggContext.StaticData.LoadImage(Path.Combine("Images", "probe.png")))
{
HAnchor = HAnchor.Center
});
contentRow.AddChild(this.CreateTextField("Click 'Done' to close this window.".Localize()));
this.ShowWizardFinished();
}

24
MatterControlLib/ConfigurationPage/PrintLeveling/WizardPages/LastPageInstructions.cs
View file

@ -29,6 +29,10 @@ either expressed or implied, of the FreeBSD Project.
using System;
using System.Collections.Generic;
using System.IO;
using MatterHackers.Agg.Platform;
using MatterHackers.Agg.UI;
using MatterHackers.Localizations;
using MatterHackers.MatterControl.PrinterCommunication;
using MatterHackers.MatterControl.PrinterCommunication.Io;
using MatterHackers.MatterControl.SlicerConfiguration;
@ -39,10 +43,26 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
{
private List<ProbePosition> probePositions;
public LastPageInstructions(LevelingWizard context, string pageDescription, string instructionsText, List<ProbePosition> probePositions)
: base(context, pageDescription, instructionsText)
public LastPageInstructions(LevelingWizard context, string pageDescription, bool useZProbe, List<ProbePosition> probePositions)
: base(context, pageDescription, "")
{
this.probePositions = probePositions;
var calibrated = "Congratulations! Print Leveling is now configured and enabled.".Localize() + "\n"
+ (useZProbe ? "" : " • Remove the paper".Localize()) + "\n"
+ "\n"
+ "If you wish to re-calibrate leveling in the future:".Localize() + "\n"
+ " 1. Select the 'Controls' tab on the right" + "\n"
+ " 2. Look for the calibration section (pictured below)".Localize() + "\n";
contentRow.AddChild(this.CreateTextField(calibrated));
contentRow.AddChild(new ImageWidget(AggContext.StaticData.LoadImage(Path.Combine("Images", "leveling.png")))
{
HAnchor = HAnchor.Center
});
contentRow.AddChild(this.CreateTextField("Click 'Done' to close this window.".Localize()));
this.ShowWizardFinished();
}