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

Remove enumerator manipulation in constructor

Browse source
This commit is contained in:
jlewin 2019-03-22 12:24:17 -07:00
parent 62bdba2c1b
commit df803eb9eb
7 changed files with 5 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
MatterControlLib/ConfigurationPage/PrintLeveling/SetupWizards/LoadFilamentWizard.cs
View file

@ -53,10 +53,6 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
this.Title = "Load Filament".Localize();
this.extruderIndex = extruderIndex;
// Capture enumerator, moving to first item
this.Reset();
this.MoveNext();
}
public double TemperatureAtStart { get; private set; }

4
MatterControlLib/ConfigurationPage/PrintLeveling/SetupWizards/NozzleCalibrationWizard.cs
View file

@ -42,10 +42,6 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
{
this.Title = "Nozzle Calibration".Localize();
this.WindowSize = new Vector2(600 * GuiWidget.DeviceScale, 700 * GuiWidget.DeviceScale);
// Capture enumerator, moving to first item
this.Reset();
this.MoveNext();
}
public override bool Visible => printer.Settings.GetValue<int>(SettingsKey.extruder_count) > 1;

4
MatterControlLib/ConfigurationPage/PrintLeveling/SetupWizards/PrintLevelingWizard.cs
View file

@ -48,10 +48,6 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
: base(printer)
{
this.Title = "Print Leveling".Localize();
// Capture enumerator, moving to first item
this.Reset();
this.MoveNext();
}
public override bool Visible

4
MatterControlLib/ConfigurationPage/PrintLeveling/SetupWizards/ProbeCalibrationWizard.cs
View file

@ -44,10 +44,6 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
: base(printer)
{
this.Title = "Probe Calibration".Localize();
// Capture enumerator, moving to first item
this.Reset();
this.MoveNext();
}
public override bool SetupRequired => NeedsToBeRun(printer);

4
MatterControlLib/ConfigurationPage/PrintLeveling/SetupWizards/UnloadFilamentWizard.cs
View file

@ -49,10 +49,6 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
{
this.Title = "Unload Filament".Localize();
this.extruderIndex = extruderIndex;
// Capture enumerator, moving to first item
this.Reset();
this.MoveNext();
}
public override bool SetupRequired => false;

6
MatterControlLib/ConfigurationPage/PrintLeveling/SetupWizards/XyCalibrationWizard.cs
View file

@ -38,7 +38,7 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
public class XyCalibrationWizard : PrinterSetupWizard
{
private int extruderToCalibrateIndex;
XyCalibrationData xyCalibrationData;
private XyCalibrationData xyCalibrationData;
public XyCalibrationWizard(PrinterConfig printer, int extruderToCalibrateIndex)
: base(printer)
@ -46,10 +46,6 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
this.extruderToCalibrateIndex = extruderToCalibrateIndex;
this.Title = "Nozzle Calibration".Localize();
this.WindowSize = new Vector2(600 * GuiWidget.DeviceScale, 700 * GuiWidget.DeviceScale);
// Capture enumerator, moving to first item
this.Reset();
this.MoveNext();
}
public override bool SetupRequired => NeedsToBeRun(printer);

4
MatterControlLib/SetupWizard/StagedSetupWindow.cs
View file

@ -65,6 +65,10 @@ namespace MatterHackers.MatterControl
_activeStage = value;
// Reset enumerator, move to first item
_activeStage.Reset();
_activeStage.MoveNext();
if (stageButtons.TryGetValue(_activeStage, out WizardStageRow stageButton))
{
stageButton.Active = true;