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

Putting leveling buttons back on main page

Browse source 
Getting better leveling triangles
This commit is contained in:
Lars Brubaker 2018-04-03 09:50:26 -07:00
parent ad0590a2b0
commit 329aa70981
4 changed files with 51 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

53
ConfigurationPage/CalibrationSettings/CalibrationControls.cs
View file

@ -13,7 +13,6 @@ namespace MatterHackers.MatterControl.PrinterControls
public class CalibrationControls : FlowLayoutWidget
{
private EventHandler unregisterEvents;
private GuiWidget configureLevelingButton;
private TextImageButtonFactory buttonFactory;
private PrinterConfig printer;
@ -49,22 +48,22 @@ namespace MatterHackers.MatterControl.PrinterControls
autoLevelRow.AddChild(new HorizontalSpacer());
// configure button
var configureIcon = AggContext.StaticData.LoadIcon("fa-cog_16.png", IconColor.Theme);
configureLevelingButton = new IconButton(configureIcon, theme)
// run leveling button
var runWizardButton = new TextButton("Run Leveling Wizard".Localize(), theme)
{
ToolTipText = "Configure".Localize(),
Margin = theme.ButtonSpacing,
VAnchor = VAnchor.Center
VAnchor = VAnchor.Center,
BackgroundColor = theme.MinimalShade,
Margin = theme.ButtonSpacing
};
configureLevelingButton.Click += (s, e) =>
runWizardButton.Click += (s, e) =>
{
UiThread.RunOnIdle(() =>
{
DialogWindow.Show(new EditLevelingSettingsPage(printer));
LevelWizardBase.ShowPrintLevelWizard(printer, LevelWizardBase.RuningState.UserRequestedCalibration);
});
};
autoLevelRow.AddChild(configureLevelingButton);
autoLevelRow.AddChild(runWizardButton);
// put in the switch
CheckBox printLevelingSwitch = ImageButtonFactory.CreateToggleSwitch(printer.Settings.GetValue<bool>(SettingsKey.print_leveling_enabled));
@ -87,6 +86,29 @@ namespace MatterHackers.MatterControl.PrinterControls
}
this.AddChild(autoLevelRow);
// add in the controls for configuring probe offset
if (printer.Settings.GetValue<bool>(SettingsKey.has_z_probe)
&& printer.Settings.GetValue<bool>(SettingsKey.use_z_probe)
&& printer.Settings.GetValue<bool>(SettingsKey.has_z_servo))
{
var runCalibrateProbeButton = new TextButton("Recalibrate Probe".Localize(), theme)
{
VAnchor = VAnchor.Absolute,
HAnchor = HAnchor.Right,
BackgroundColor = theme.MinimalShade,
Margin = new BorderDouble(5, 0, 5, 20)
};
runCalibrateProbeButton.Click += (s, e) =>
{
UiThread.RunOnIdle(() =>
{
ProbeCalibrationWizard.ShowProbeCalibrationWizard(printer);
});
};
this.AddChild(runCalibrateProbeButton);
}
}
printer.Connection.CommunicationStateChanged.RegisterEvent(PrinterStatusChanged, ref unregisterEvents);
@ -97,10 +119,17 @@ namespace MatterHackers.MatterControl.PrinterControls
public static SectionWidget CreateSection(PrinterConfig printer, ThemeConfig theme)
{
var editButton = new IconButton(AggContext.StaticData.LoadIcon("icon_edit.png", 16, 16, IconColor.Theme), theme);
editButton.Click += (s, e) =>
{
DialogWindow.Show(new EditLevelingSettingsPage(printer));
};
return new SectionWidget(
"Calibration".Localize(),
new CalibrationControls(printer, theme),
theme);
theme,
editButton);
}
public override void OnClosed(ClosedEventArgs e)
@ -122,12 +151,10 @@ namespace MatterHackers.MatterControl.PrinterControls
|| printer.Connection.PrinterIsPaused)
{
this.Enabled = false;
configureLevelingButton.Enabled = true; // setting this true when the element is disabled makes the colors stay correct
}
else
{
this.Enabled = true;
configureLevelingButton.Enabled = printer.Connection.IsConnected;
}
}
}

2
ConfigurationPage/PrintLeveling/LevelWizard3Point.cs
View file

@ -61,9 +61,9 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
}
else
{
yield return new Vector2(printCenter.X, printCenter.Y + (bedSize.Y / 2) * .8);
yield return new Vector2(printCenter.X - (bedSize.X / 2) * .8, printCenter.Y - (bedSize.Y / 2) * .8);
yield return new Vector2(printCenter.X + (bedSize.X / 2) * .8, printCenter.Y - (bedSize.Y / 2) * .8);
yield return new Vector2(printCenter.X, printCenter.Y + (bedSize.Y / 2) * .8);
}
}
}

16
ConfigurationPage/PrintLeveling/MeshLevlingFunctions.cs
View file

@ -68,9 +68,10 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
}
};
int extraXPosition = -50000;
vertices.Add(new DefaultVertex()
{
Position = new double[] { SampledPositions[0].X, SampledPositions[0].Y }
Position = new double[] { extraXPosition, SampledPositions[0].Y }
});
var triangles = DelaunayTriangulation<DefaultVertex, DefaultTriangulationCell<DefaultVertex>>.Create(vertices, .001);
@ -81,11 +82,14 @@ namespace MatterHackers.MatterControl.ConfigurationPage.PrintLeveling
var p0 = triangle.Vertices[0].Position;
var p1 = triangle.Vertices[1].Position;
var p2 = triangle.Vertices[2].Position;
var v0 = new Vector3(p0[0], p0[1], zDictionary[(p0[0], p0[1])]);
var v1 = new Vector3(p1[0], p1[1], zDictionary[(p1[0], p1[1])]);
var v2 = new Vector3(p2[0], p2[1], zDictionary[(p2[0], p2[1])]);
// add all the regions
Regions.Add(new LevelingTriangle(v0, v1, v2));
if (p0[0] != extraXPosition && p1[0] != extraXPosition && p2[0] != extraXPosition)
{
var v0 = new Vector3(p0[0], p0[1], zDictionary[(p0[0], p0[1])]);
var v1 = new Vector3(p1[0], p1[1], zDictionary[(p1[0], p1[1])]);
var v2 = new Vector3(p2[0], p2[1], zDictionary[(p2[0], p2[1])]);
// add all the regions
Regions.Add(new LevelingTriangle(v0, v1, v2));
}
}
}