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

Remove marker only type, use InstructionsPage base

Browse source
This commit is contained in:
John Lewin 2018-05-23 11:38:46 -07:00
parent afb941a1c5
commit a5d2cf89ef
4 changed files with 5 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ConfigurationPage/PrintLeveling/LevelWizardBase.cs
View file

@ -74,7 +74,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
string part1 = "Congratulations on connecting to your printer. Before starting your first print we need to run a simple calibration procedure.".Localize();
string part2 = "The next few screens will walk your through calibrating your printer.".Localize();
string requiredPageInstructions = $"{part1}\n\n{part2}";
yield return new FirstPageInstructions(printer, levelingStrings.initialPrinterSetupStepText, requiredPageInstructions, theme);
yield return new InstructionsPage(printer, levelingStrings.initialPrinterSetupStepText, requiredPageInstructions, theme);
}
// To make sure the bed is at the correct temp, put in a filament selection page.
@ -86,7 +86,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
var secondsPerAutomaticSpot = 3 * zProbeSamples;
var secondsToCompleteWizard = levelWizard.ProbeCount * (useZProbe ? secondsPerAutomaticSpot : secondsPerManualSpot);
secondsToCompleteWizard += (hasHeatedBed ? 60 * 3 : 0);
yield return new FirstPageInstructions(printer,
yield return new InstructionsPage(printer,
"Print Leveling Overview".Localize(),
levelingStrings.WelcomeText(levelWizard.ProbeCount, (int)Math.Round(secondsToCompleteWizard / 60.0)), theme);

6
ConfigurationPage/PrintLeveling/ProbeCalibrationWizard.cs
View file

@ -62,10 +62,10 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
this.doneButton.Visible = false;
// make a welocme page if this is the first time calibrating the probe
// make a welcome page if this is the first time calibrating the probe
if (!printer.Settings.GetValue<bool>(SettingsKey.probe_has_been_calibrated))
{
yield return new FirstPageInstructions(
yield return new InstructionsPage(
printer,
levelingStrings.initialPrinterSetupStepText,
string.Format(
@ -76,7 +76,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
}
// show what steps will be taken
yield return new FirstPageInstructions(
yield return new InstructionsPage(
printer,
"Probe Calibration Overview".Localize(),
string.Format(

39
ConfigurationPage/PrintLeveling/WizardPages/FirstPageInstructions.cs
View file

@ -1,39 +0,0 @@
/*
Copyright (c) 2018, Lars Brubaker
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
The views and conclusions contained in the software and documentation are those
of the authors and should not be interpreted as representing official policies,
either expressed or implied, of the FreeBSD Project.
*/
namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
{
public class FirstPageInstructions : InstructionsPage
{
public FirstPageInstructions(PrinterConfig printer, string pageDescription, string instructionsText, ThemeConfig theme)
: base(printer, pageDescription, instructionsText, theme)
{
}
}
}

1
MatterControl.csproj
View file

@ -101,7 +101,6 @@
<Compile Include="ConfigurationPage\PrintLeveling\WizardPages\AutoProbeFeedback.cs" />
<Compile Include="ConfigurationPage\PrintLeveling\WizardPages\CalibrateProbeLastPagelInstructions.cs" />
<Compile Include="ConfigurationPage\PrintLeveling\WizardPages\FindBedHeight.cs" />
<Compile Include="ConfigurationPage\PrintLeveling\WizardPages\FirstPageInstructions.cs" />
<Compile Include="ConfigurationPage\PrintLeveling\WizardPages\GetCoarseBedHeight.cs" />
<Compile Include="ConfigurationPage\PrintLeveling\WizardPages\GetFineBedHeight.cs" />
<Compile Include="ConfigurationPage\PrintLeveling\WizardPages\GettingThirdPointFor2PointCalibration.cs" />