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

Merge pull request #2332 from larsbrubaker/design_tools

Browse source 
Don't try to heat bed if it doesn't exists.
This commit is contained in:
Lars Brubaker 2017-08-09 14:40:53 -07:00 • committed by GitHub
commit b626bb6f18
6 changed files with 66 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

13
ConfigurationPage/PrintLeveling/LevelWizard3Point.cs
View file

@ -63,10 +63,17 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
printLevelWizard.AddPage(new FirstPageInstructions(levelingStrings.OverviewText, levelingStrings.WelcomeText(3, 3)));
// To make sure the bed is at the correct temp, put in a filament selection page.
string filamentSelectionPage = "{0}\n\n{1}".FormatWith(levelingStrings.materialPageInstructions1, levelingStrings.materialPageInstructions2);
printLevelWizard.AddPage(new SelectMaterialPage(levelingStrings.materialStepText, filamentSelectionPage));
bool hasHeatedBed = ActiveSliceSettings.Instance.GetValue<bool>(SettingsKey.has_heated_bed);
if (hasHeatedBed)
{
string filamentSelectionPage = "{0}\n\n{1}".FormatWith(levelingStrings.materialPageInstructions1, levelingStrings.materialPageInstructions2);
printLevelWizard.AddPage(new SelectMaterialPage(levelingStrings.materialStepText, filamentSelectionPage));
}
printLevelWizard.AddPage(new HomePrinterPage(levelingStrings.homingPageStepText, levelingStrings.homingPageInstructions));
printLevelWizard.AddPage(new WaitForTempPage(levelingStrings.waitingForTempPageStepText, levelingStrings.waitingForTempPageInstructions));
if (hasHeatedBed)
{
printLevelWizard.AddPage(new WaitForTempPage(levelingStrings.waitingForTempPageStepText, levelingStrings.waitingForTempPageInstructions));
}
string positionLabel = "Position".Localize();
string autoCalibrateLabel = "Auto Calibrate".Localize();

13
ConfigurationPage/PrintLeveling/LevelWizard7PointRadial.cs
View file

@ -119,10 +119,17 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
printLevelWizard.AddPage(new FirstPageInstructions(levelingStrings.OverviewText, levelingStrings.WelcomeText(numberOfRadialSamples + 1, 5)));
// To make sure the bed is at the correct temp, put in a filament selection page.
string filamentSelectionPage = "{0}\n\n{1}".FormatWith(levelingStrings.materialPageInstructions1, levelingStrings.materialPageInstructions2);
printLevelWizard.AddPage(new SelectMaterialPage(levelingStrings.materialStepText, filamentSelectionPage));
bool hasHeatedBed = ActiveSliceSettings.Instance.GetValue<bool>(SettingsKey.has_heated_bed);
if (hasHeatedBed)
{
string filamentSelectionPage = "{0}\n\n{1}".FormatWith(levelingStrings.materialPageInstructions1, levelingStrings.materialPageInstructions2);
printLevelWizard.AddPage(new SelectMaterialPage(levelingStrings.materialStepText, filamentSelectionPage));
}
printLevelWizard.AddPage(new HomePrinterPage(levelingStrings.homingPageStepText, levelingStrings.homingPageInstructions));
printLevelWizard.AddPage(new WaitForTempPage(levelingStrings.waitingForTempPageStepText, levelingStrings.waitingForTempPageInstructions));
if (hasHeatedBed)
{
printLevelWizard.AddPage(new WaitForTempPage(levelingStrings.waitingForTempPageStepText, levelingStrings.waitingForTempPageInstructions));
}
string positionLabel = "Position".Localize();
string autoCalibrateLabel = "Auto Calibrate".Localize();

13
ConfigurationPage/PrintLeveling/LevelWizardMesh.cs
View file

@ -177,10 +177,17 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
printLevelWizard.AddPage(new FirstPageInstructions(levelingStrings.OverviewText, levelingStrings.WelcomeText(probeCount, 5)));
// To make sure the bed is at the correct temp, put in a filament selection page.
string filamentSelectionPage = "{0}\n\n{1}".FormatWith(levelingStrings.materialPageInstructions1, levelingStrings.materialPageInstructions2);
printLevelWizard.AddPage(new SelectMaterialPage(levelingStrings.materialStepText, filamentSelectionPage));
bool hasHeatedBed = ActiveSliceSettings.Instance.GetValue<bool>(SettingsKey.has_heated_bed);
if (hasHeatedBed)
{
string filamentSelectionPage = "{0}\n\n{1}".FormatWith(levelingStrings.materialPageInstructions1, levelingStrings.materialPageInstructions2);
printLevelWizard.AddPage(new SelectMaterialPage(levelingStrings.materialStepText, filamentSelectionPage));
}
printLevelWizard.AddPage(new HomePrinterPage(levelingStrings.homingPageStepText, levelingStrings.homingPageInstructions));
printLevelWizard.AddPage(new WaitForTempPage(levelingStrings.waitingForTempPageStepText, levelingStrings.waitingForTempPageInstructions));
if (hasHeatedBed)
{
printLevelWizard.AddPage(new WaitForTempPage(levelingStrings.waitingForTempPageStepText, levelingStrings.waitingForTempPageInstructions));
}
string positionLabel = "Position".Localize();
string autoCalibrateLabel = "Auto Calibrate".Localize();

54
ConfigurationPage/PrintLeveling/LevelingStrings.cs
View file

@ -57,14 +57,14 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
private string homingLine3b = "Click 'Next' to continue.".Localize();
private int stepNumber = 1;
private string welcomeLine1 = "Welcome to the print leveling wizard. Here is a quick overview on what we are going to do.".Localize();
private string welcomeLine2 = "Select the material you are printing".Localize();
private string welcomeLine3 = "Home the printer".Localize();
private string welcomeLine4 = "Heat the bed".Localize();
private string welcomeLine5 = "Sample the bed at {0} points".Localize();
private string welcomeLine6 = "Turn auto leveling on".Localize();
private string welcomeLine7 = "We should be done in less than {0} minutes.".Localize();
private string welcomeLine8 = "Note: Be sure the tip of the extruder is clean and the bed is clear.".Localize();
private string welcomeLine9 = "Click 'Next' to continue.".Localize();
private string selectMaterial = "Select the material you are printing".Localize();
private string homeThePrinter = "Home the printer".Localize();
private string heatTheBed = "Heat the bed".Localize();
private string sampelAtPoints = "Sample the bed at {0} points".Localize();
private string turnOnLeveling = "Turn auto leveling on".Localize();
private string timeToDone = "We should be done in less than {0} minutes.".Localize();
private string cleanExtruder = "Note: Be sure the tip of the extruder is clean and the bed is clear.".Localize();
private string clickNext = "Click 'Next' to continue.".Localize();
public string DoneInstructions
{
@ -118,26 +118,40 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
numberOfMinutes = 2;
}
return "{0}\n\n\t• {1}\n\t• {2}\n\t• {3}\n\t• {4}\n\t• {5}\n\n{6}\n\n{7}\n\n{8}".FormatWith(
this.welcomeLine1,
this.welcomeLine2,
this.welcomeLine3,
this.welcomeLine4,
this.WelcomeLine5(numberOfSteps),
this.welcomeLine6,
this.WelcomeLine7(numberOfMinutes),
this.welcomeLine8,
this.welcomeLine9);
if (ActiveSliceSettings.Instance.GetValue<bool>(SettingsKey.has_heated_bed))
{
return "{0}\n\n\t• {1}\n\t• {2}\n\t• {3}\n\t• {4}\n\t• {5}\n\n{6}\n\n{7}\n\n{8}".FormatWith(
this.welcomeLine1,
this.selectMaterial,
this.homeThePrinter,
this.heatTheBed,
this.WelcomeLine5(numberOfSteps),
this.turnOnLeveling,
this.WelcomeLine7(numberOfMinutes),
this.cleanExtruder,
this.clickNext);
}
else
{
return "{0}\n\n\t• {1}\n\t• {2}\n\t• {3}\n\n{4}\n\n{5}\n\n{6}".FormatWith(
this.welcomeLine1,
this.homeThePrinter,
this.WelcomeLine5(numberOfSteps),
this.turnOnLeveling,
this.WelcomeLine7(numberOfMinutes),
this.cleanExtruder,
this.clickNext);
}
}
private string WelcomeLine5(int numberOfPoints)
{
return welcomeLine5.FormatWith(numberOfPoints);
return sampelAtPoints.FormatWith(numberOfPoints);
}
private string WelcomeLine7(int numberOfMinutes)
{
return welcomeLine7.FormatWith(numberOfMinutes);
return timeToDone.FormatWith(numberOfMinutes);
}
}
}

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit 0087c461a6637bb666feb3ca2b895ceb9b4d0cbd
Subproject commit fd5e6a6f9413f4b7c95ea1227610e1dd2312aac1

4
Tests/MatterControl.AutomationTests/PrintingTests.cs
View file

@ -80,14 +80,12 @@ namespace MatterHackers.MatterControl.Tests.Automation
// switch to controls so we can see the heights
testRunner.SwitchToControlsTab();
// run the leveling wizard
// run the leveling wizard (only 4 next as there is no heated bed
testRunner.ClickByName("Finish Setup Button");
testRunner.ClickByName("Next Button");
testRunner.ClickByName("Next Button");
testRunner.ClickByName("Next Button");
testRunner.ClickByName("Next Button");
testRunner.ClickByName("Next Button");
testRunner.ClickByName("Next Button");
for (int i = 0; i < 3; i++)
{
testRunner.ClickByName("Move Z positive");