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

Remove unused parameter

Browse source
This commit is contained in:
jlewin 2019-03-26 11:50:52 -07:00
parent a71c19e0c9
commit 7d7cced199
6 changed files with 19 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -84,17 +84,17 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
protected override IEnumerator<WizardPage> GetPages()
{
yield return new XyCalibrationSelectPage(this, printer);
yield return new XyCalibrationStartPrintPage(this, printer);
yield return new XyCalibrationCollectDataPage(this, printer);
yield return new XyCalibrationDataRecieved(this, printer);
yield return new XyCalibrationSelectPage(this);
yield return new XyCalibrationStartPrintPage(this);
yield return new XyCalibrationCollectDataPage(this);
yield return new XyCalibrationDataRecieved(this);
// loop until we are done calibrating
while (this.PrintAgain)
{
yield return new XyCalibrationStartPrintPage(this, printer);
yield return new XyCalibrationCollectDataPage(this, printer);
yield return new XyCalibrationDataRecieved(this, printer);
yield return new XyCalibrationStartPrintPage(this);
yield return new XyCalibrationCollectDataPage(this);
yield return new XyCalibrationDataRecieved(this);
}
}
}

2
MatterControlLib/CustomWidgets/XyCalibrationCollectDataPage.cs
View file

@ -43,7 +43,7 @@ namespace MatterHackers.MatterControl
private bool pageCanceled;
private XyCalibrationWizard calibrationWizard;
public XyCalibrationCollectDataPage(XyCalibrationWizard calibrationWizard, PrinterConfig printer)
public XyCalibrationCollectDataPage(XyCalibrationWizard calibrationWizard)
: base(calibrationWizard)
{
this.calibrationWizard = calibrationWizard;

3
MatterControlLib/CustomWidgets/XyCalibrationDataRecieved.cs
View file

@ -37,7 +37,7 @@ namespace MatterHackers.MatterControl
{
public class XyCalibrationDataRecieved : WizardPage
{
public XyCalibrationDataRecieved(XyCalibrationWizard calibrationWizard, PrinterConfig printer)
public XyCalibrationDataRecieved(XyCalibrationWizard calibrationWizard)
: base(calibrationWizard)
{
this.WindowTitle = "Nozzle Offset Calibration Wizard".Localize();
@ -87,6 +87,7 @@ namespace MatterHackers.MatterControl
{
Margin = new Agg.BorderDouble(0, 15, 0, 0)
});
var startFineCalibratingButton = theme.CreateDialogButton("Print Ultra Fine Calibration".Localize());
startFineCalibratingButton.HAnchor = HAnchor.Fit | HAnchor.Right;
startFineCalibratingButton.VAnchor = VAnchor.Absolute;

2
MatterControlLib/CustomWidgets/XyCalibrationSelectPage.cs
View file

@ -41,7 +41,7 @@ namespace MatterHackers.MatterControl
private RadioButton normalCalibration;
private RadioButton fineCalibration;
public XyCalibrationSelectPage(XyCalibrationWizard calibrationWizard, PrinterConfig printer)
public XyCalibrationSelectPage(XyCalibrationWizard calibrationWizard)
: base(calibrationWizard)
{
this.WindowTitle = "Nozzle Offset Calibration Wizard".Localize();

2
MatterControlLib/CustomWidgets/XyCalibrationStartPrintPage.cs
View file

@ -43,7 +43,7 @@ namespace MatterHackers.MatterControl
{
public class XyCalibrationStartPrintPage : WizardPage
{
public XyCalibrationStartPrintPage(XyCalibrationWizard calibrationWizard, PrinterConfig printer)
public XyCalibrationStartPrintPage(XyCalibrationWizard calibrationWizard)
: base(calibrationWizard)
{
this.WindowTitle = "Nozzle Offset Calibration Wizard".Localize();

7
MatterControlLib/Library/Providers/MatterControl/PrimitivesContainer.cs
View file

@ -35,6 +35,7 @@ using MatterHackers.Agg.Platform;
using MatterHackers.DataConverters3D;
using MatterHackers.Localizations;
using MatterHackers.MatterControl.DesignTools;
using MatterHackers.MatterControl.SlicerConfiguration;
namespace MatterHackers.MatterControl.Library
{
@ -56,6 +57,12 @@ namespace MatterHackers.MatterControl.Library
() => "Cube".Localize(),
async () => await CubeObject3D.Create())
{ DateCreated = new System.DateTime(index++) },
#if DEBUG
new GeneratorItem(
() => "Calibration Tab".Localize(),
async () => await XyCalibrationTabObject3D.Create())
{ DateCreated = new System.DateTime(index++) },
#endif
new GeneratorItem(
() => "Pyramid".Localize(),
async () => await PyramidObject3D.Create())