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

Consolidate WizardControlPage into InstructionsPage

Browse source
This commit is contained in:
John Lewin 2018-05-23 12:15:52 -07:00
parent bfc3eddb06
commit 9799795dc1
13 changed files with 35 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

16
ConfigurationPage/PrintLeveling/InstructionsPage.cs
View file

@ -28,21 +28,20 @@ either expressed or implied, of the FreeBSD Project.
*/
using MatterHackers.Agg;
using MatterHackers.Agg.Font;
using MatterHackers.Agg.UI;
namespace MatterHackers.MatterControl
{
public class InstructionsPage : WizardControlPage
public class InstructionsPage : GuiWidget
{
protected FlowLayoutWidget topToBottomControls;
protected PrinterConfig printer { get; }
public InstructionsPage(PrinterConfig printer, string pageDescription, string instructionsText, ThemeConfig theme)
: base(pageDescription)
{
this.printer = printer;
this.StepDescription = pageDescription;
topToBottomControls = new FlowLayoutWidget(FlowDirection.TopToBottom);
topToBottomControls.Padding = new BorderDouble(3);
@ -56,6 +55,17 @@ namespace MatterHackers.MatterControl
AnchorAll();
}
public string StepDescription { get; protected set; } = "";
public virtual void PageIsBecomingActive()
{
}
public virtual void PageIsBecomingInactive()
{
}
public void AddTextField(string instructionsText, int pixelsFromLast, ThemeConfig theme)
{
GuiWidget spacer = new GuiWidget(10, pixelsFromLast);

2
ConfigurationPage/PrintLeveling/LevelWizardBase.cs
View file

@ -51,7 +51,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
this.printer = printer;
}
protected override IEnumerator<WizardControlPage> Pages
protected override IEnumerator<InstructionsPage> Pages
{
get
{

2
ConfigurationPage/PrintLeveling/ProbeCalibrationWizard.cs
View file

@ -47,7 +47,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
this.printer = printer;
}
protected override IEnumerator<WizardControlPage> Pages
protected override IEnumerator<InstructionsPage> Pages
{
get
{

6
ConfigurationPage/PrintLeveling/WizardPages/AutoProbeFeedback.cs
View file

@ -27,6 +27,9 @@ of the authors and should not be interpreted as representing official policies,
either expressed or implied, of the FreeBSD Project.
*/
using System;
using System.Collections.Generic;
using System.Linq;
using MatterControl.Printing;
using MatterHackers.Agg;
using MatterHackers.Agg.UI;
@ -34,9 +37,6 @@ using MatterHackers.MatterControl.PrinterCommunication;
using MatterHackers.MatterControl.PrinterCommunication.Io;
using MatterHackers.MatterControl.SlicerConfiguration;
using MatterHackers.VectorMath;
using System;
using System.Collections.Generic;
using System.Linq;
namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
{

4
ConfigurationPage/PrintLeveling/WizardPages/CalibrateProbeLastPagelInstructions.cs
View file

@ -27,9 +27,9 @@ of the authors and should not be interpreted as representing official policies,
either expressed or implied, of the FreeBSD Project.
*/
using System.Collections.Generic;
using MatterHackers.MatterControl.PrinterCommunication;
using MatterHackers.MatterControl.SlicerConfiguration;
using System.Collections.Generic;
namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
{
@ -40,7 +40,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
private List<ProbePosition> manualProbePositions;
private ThemeConfig theme;
public CalibrateProbeLastPagelInstructions(PrinterConfig printer, WizardControl container, string pageDescription, string instructionsText,
public CalibrateProbeLastPagelInstructions(PrinterConfig printer, WizardControl container, string pageDescription, string instructionsText,
List<ProbePosition> autoProbePositions,
List<ProbePosition> manualProbePositions, ThemeConfig theme)
: base(printer, pageDescription, instructionsText, theme)

8
ConfigurationPage/PrintLeveling/WizardPages/FindBedHeight.cs
View file

@ -27,15 +27,15 @@ of the authors and should not be interpreted as representing official policies,
either expressed or implied, of the FreeBSD Project.
*/
using System;
using System.Collections.Generic;
using System.Linq;
using MatterHackers.Agg;
using MatterHackers.Agg.UI;
using MatterHackers.Localizations;
using MatterHackers.MatterControl.PrinterCommunication;
using MatterHackers.MatterControl.PrinterCommunication.Io;
using MatterHackers.VectorMath;
using System;
using System.Collections.Generic;
using System.Linq;
namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
{
@ -51,7 +51,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
private ThemeConfig theme;
protected WizardControl container;
public FindBedHeight(PrinterConfig printer, WizardControl container, string pageDescription, string setZHeightCoarseInstruction1, string setZHeightCoarseInstruction2, double moveDistance,
public FindBedHeight(PrinterConfig printer, WizardControl container, string pageDescription, string setZHeightCoarseInstruction1, string setZHeightCoarseInstruction2, double moveDistance,
List<ProbePosition> probePositions, int probePositionsBeingEditedIndex, ThemeConfig theme)
: base(printer, pageDescription, setZHeightCoarseInstruction1, theme)
{

6
ConfigurationPage/PrintLeveling/WizardPages/GetCoarseBedHeight.cs
View file

@ -27,12 +27,12 @@ of the authors and should not be interpreted as representing official policies,
either expressed or implied, of the FreeBSD Project.
*/
using System;
using System.Collections.Generic;
using MatterHackers.Localizations;
using MatterHackers.MatterControl.PrinterCommunication;
using MatterHackers.MatterControl.SlicerConfiguration;
using MatterHackers.VectorMath;
using System;
using System.Collections.Generic;
namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
{
@ -40,7 +40,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
{
protected Vector3 probeStartPosition;
public GetCoarseBedHeight(PrinterConfig printer, WizardControl container, Vector3 probeStartPosition, string pageDescription, List<ProbePosition> probePositions,
public GetCoarseBedHeight(PrinterConfig printer, WizardControl container, Vector3 probeStartPosition, string pageDescription, List<ProbePosition> probePositions,
int probePositionsBeingEditedIndex, LevelingStrings levelingStrings, ThemeConfig theme)
: base(printer, container, pageDescription, "Using the [Z] controls on this screen, we will now take a coarse measurement of the extruder height at this position.".Localize(),
levelingStrings.CoarseInstruction2, 1, probePositions, probePositionsBeingEditedIndex, theme)

4
ConfigurationPage/PrintLeveling/WizardPages/GetUltraFineBedHeight.cs
View file

@ -27,15 +27,15 @@ of the authors and should not be interpreted as representing official policies,
either expressed or implied, of the FreeBSD Project.
*/
using System.Collections.Generic;
using MatterHackers.Agg;
using MatterHackers.MatterControl.PrinterCommunication;
using System.Collections.Generic;
namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
{
public class GetUltraFineBedHeight : FindBedHeight
{
public GetUltraFineBedHeight(PrinterConfig printer, WizardControl container, string pageDescription, List<ProbePosition> probePositions,
public GetUltraFineBedHeight(PrinterConfig printer, WizardControl container, string pageDescription, List<ProbePosition> probePositions,
int probePositionsBeingEditedIndex, LevelingStrings levelingStrings, ThemeConfig theme)
: base(printer, container, pageDescription, levelingStrings.UltraFineInstruction1, levelingStrings.FineInstruction2, .02, probePositions, probePositionsBeingEditedIndex, theme)
{

2
ConfigurationPage/PrintLeveling/WizardPages/GettingThirdPointFor2PointCalibration.cs
View file

@ -27,11 +27,11 @@ of the authors and should not be interpreted as representing official policies,
either expressed or implied, of the FreeBSD Project.
*/
using System;
using MatterHackers.Agg;
using MatterHackers.Agg.UI;
using MatterHackers.MatterControl.PrinterCommunication;
using MatterHackers.VectorMath;
using System;
namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
{

2
ConfigurationPage/PrintLeveling/WizardPages/HomePrinterPage.cs
View file

@ -27,9 +27,9 @@ of the authors and should not be interpreted as representing official policies,
either expressed or implied, of the FreeBSD Project.
*/
using System;
using MatterHackers.Agg.UI;
using MatterHackers.MatterControl.PrinterCommunication;
using System;
namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
{

5
ConfigurationPage/PrintLeveling/WizardPages/LastPagelInstructions.cs
View file

@ -27,12 +27,11 @@ of the authors and should not be interpreted as representing official policies,
either expressed or implied, of the FreeBSD Project.
*/
using MatterHackers.Agg.UI;
using System;
using System.Collections.Generic;
using MatterHackers.MatterControl.PrinterCommunication;
using MatterHackers.MatterControl.PrinterCommunication.Io;
using MatterHackers.MatterControl.SlicerConfiguration;
using System;
using System.Collections.Generic;
namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
{

5
ConfigurationPage/PrintLeveling/WizardPages/WaitForTempPage.cs
View file

@ -27,12 +27,11 @@ of the authors and should not be interpreted as representing official policies,
either expressed or implied, of the FreeBSD Project.
*/
using System;
using MatterHackers.Agg;
using MatterHackers.Agg.UI;
using MatterHackers.Localizations;
using MatterHackers.MatterControl.PrinterCommunication;
using MatterHackers.MatterControl.SlicerConfiguration;
using System;
namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
{
@ -52,7 +51,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
private TextWidget hotEndDoneText;
double hotEndTargetTemp;
public WaitForTempPage(PrinterConfig printer, WizardControl container,
public WaitForTempPage(PrinterConfig printer, WizardControl container,
string step, string instructions,
double targetBedTemp, double targetHotendTemp,
ThemeConfig theme)