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

Add prototype for hotend offset wizard

Browse source 
- Issue MatterHackers/MCCentral#5051
Create best line UI for XY Hotend calibration wizard
This commit is contained in:
John Lewin 2019-02-12 12:59:09 -08:00
parent d93690a269
commit cc68764a19
2 changed files with 347 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

178
MatterControlLib/CustomWidgets/CalibrationLine.cs Normal file
View file

@ -0,0 +1,178 @@
/*
Copyright (c) 2019, Lars Brubaker, John Lewin
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.
*/
using System.Collections.Generic;
using MatterHackers.Agg;
using MatterHackers.Agg.UI;
using MatterHackers.Agg.VertexSource;
using MatterHackers.VectorMath;
namespace MatterHackers.MatterControl
{
public class CalibrationLine : GuiWidget
{
private bool mouseInBounds;
private ThemeConfig theme;
private Dictionary<int, IVertexSource> glyphs;
private int glyphSize = 8;
public CalibrationLine(ThemeConfig theme)
{
this.theme = theme;
int glyphCenter = glyphSize / 2;
this.CreateGlyphs(glyphCenter);
}
public int GlyphIndex { get; set; } = -1;
public bool IsNegative { get; internal set; }
public bool Vertical { get; set; } = true;
public override void OnMouseEnterBounds(MouseEventArgs mouseEvent)
{
mouseInBounds = true;
this.Invalidate();
base.OnMouseEnterBounds(mouseEvent);
}
public override void OnMouseLeaveBounds(MouseEventArgs mouseEvent)
{
mouseInBounds = false;
this.Invalidate();
base.OnMouseLeaveBounds(mouseEvent);
}
public override Color BackgroundColor
{
get => mouseInBounds ? theme.AccentMimimalOverlay : base.BackgroundColor;
set => base.BackgroundColor = value;
}
public override void OnDraw(Graphics2D graphics2D)
{
if (this.Vertical)
{
int centerX = (int)this.LocalBounds.XCenter;
if (this.GlyphIndex == -1)
{
// Draw primary line
graphics2D.Line(
new Vector2(centerX + .5, (this.GlyphIndex == -1) ? 20 : 9 /*+ .5*/),
new Vector2(centerX + .5, this.LocalBounds.Height /*+ .5*/),
theme.TextColor,
1);
}
else
{
// Draw primary line
graphics2D.Line(
new Vector2(centerX, (this.GlyphIndex == -1) ? 20 : 9 /*+ .5*/),
new Vector2(centerX, this.LocalBounds.Height /*+ .5*/),
theme.TextColor,
2);
}
// Draw line end
if (this.GlyphIndex != -1
&& glyphs.TryGetValue(this.GlyphIndex, out IVertexSource vertexSource))
{
graphics2D.Render(
vertexSource,
new Vector2((int)(this.LocalBounds.XCenter - (glyphSize / 2)), 5),
theme.TextColor);
}
// Draw negative adornment below glyphs
if (this.GlyphIndex != -1
&& this.IsNegative)
{
graphics2D.Line(
new Vector2(this.LocalBounds.XCenter, 5),
new Vector2(this.LocalBounds.XCenter, 0),
theme.TextColor,
1);
}
}
base.OnDraw(graphics2D);
}
private void CreateGlyphs(int glyphCenter)
{
glyphs = new Dictionary<int, IVertexSource>();
var triangle = new VertexStorage();
triangle.LineTo(glyphSize, 0);
triangle.LineTo(glyphSize / 2, glyphSize);
triangle.LineTo(0, 0);
//triangle.ClosePolygon();
var square = new VertexStorage();
square.LineTo(glyphSize, 0);
square.LineTo(glyphSize, glyphSize);
square.LineTo(0, glyphSize);
square.LineTo(0, 0);
var diamond = new VertexStorage();
diamond.MoveTo(glyphCenter, 0);
diamond.LineTo(glyphSize, glyphCenter);
diamond.LineTo(glyphCenter, glyphSize);
diamond.LineTo(0, glyphCenter);
diamond.MoveTo(glyphCenter, 0);
var circle = new Ellipse(new Vector2(glyphCenter, glyphCenter), glyphCenter);
var center = new VertexStorage();
center.MoveTo(0, 0);
center.LineTo(glyphCenter, glyphSize);
center.LineTo(glyphSize, 0);
center.LineTo(glyphCenter, glyphSize - 4);
center.LineTo(0, 0);
center.ClosePolygon();
glyphs.Add(0, triangle);
glyphs.Add(5, diamond);
glyphs.Add(10, square);
glyphs.Add(15, circle);
glyphs.Add(20, center);
glyphs.Add(25, circle);
glyphs.Add(30, square);
glyphs.Add(35, diamond);
glyphs.Add(40, triangle);
}
}
}

169
MatterControlLib/CustomWidgets/NozzleOffsetCalibrationPage.cs Normal file
View file

@ -0,0 +1,169 @@
/*
Copyright (c) 2019, Lars Brubaker, John Lewin
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.
*/
using System;
using System.Threading;
using System.Threading.Tasks;
using MatterHackers.Agg;
using MatterHackers.Agg.UI;
using MatterHackers.Localizations;
using MatterHackers.MatterControl.CustomWidgets;
namespace MatterHackers.MatterControl
{
public class NozzleOffsetCalibrationIntroPage : DialogPage
{
public NozzleOffsetCalibrationIntroPage(PrinterConfig printer)
{
this.WindowTitle = "Nozzle Offset Calibration Wizard".Localize();
this.HeaderText = "Nozzle Offset Calibration".Localize() + ":";
this.Name = "Nozzle Offset Calibration Wizard";
this.ContentRow.AddChild(
new WrappedTextWidget(
"Offset Calibration required. We'll now print a calibration guide on the printer to tune your nozzel offsets".Localize(),
textColor: theme.TextColor,
pointSize: theme.DefaultFontSize));
var startCalibrationButton = theme.CreateDialogButton("Next".Localize());
startCalibrationButton.Name = "Begin calibration print";
startCalibrationButton.Click += (s, e) =>
{
this.DialogWindow.ChangeToPage(new NozzleOffsetCalibrationPrintPage(printer));
};
theme.ApplyPrimaryActionStyle(startCalibrationButton);
this.AddPageAction(startCalibrationButton);
}
}
public class NozzleOffsetCalibrationPrintPage: DialogPage
{
private PrinterConfig printer;
private TextButton nextButton;
public NozzleOffsetCalibrationPrintPage(PrinterConfig printer)
{
this.WindowTitle = "Nozzle Offset Calibration Wizard".Localize();
this.HeaderText = "Nozzle Offset Calibration".Localize() + ":";
this.Name = "Nozzle Offset Calibration Wizard";
this.printer = printer;
this.ContentRow.AddChild(new TextWidget("Printing Calibration Guide".Localize()));
this.ContentRow.AddChild(new TextWidget("Heating printer...".Localize()));
this.ContentRow.AddChild(new TextWidget("Printing Guide...".Localize()));
nextButton = theme.CreateDialogButton("Next".Localize());
nextButton.Name = "Configure Calibration";
nextButton.Enabled = false;
nextButton.Click += (s, e) =>
{
this.DialogWindow.ChangeToPage(new NozzleOffsetCalibrationResultsPage(printer));
};
theme.ApplyPrimaryActionStyle(nextButton);
this.AddPageAction(nextButton);
}
public override void OnLoad(EventArgs args)
{
// Replace with calibration template code
Task.Run(() =>
{
//printer.Connection.QueueLine("T0\nG1 Y180 X150 Z0.8 F1800\nG92 E0\nG1 X100 Z0.3 E25 F900");
});
// TODO: At conclusion of calibration template print, enable next button
Task.Run(() =>
{
// TODO: Silly hack to replicate expected behavior
Thread.Sleep(10 * 1000);
nextButton.Enabled = true;
});
base.OnLoad(args);
}
}
public class NozzleOffsetCalibrationResultsPage : DialogPage
{
public NozzleOffsetCalibrationResultsPage(PrinterConfig printer)
{
this.WindowTitle = "Nozzle Offset Calibration Wizard".Localize();
this.HeaderText = "Nozzle Offset Calibration".Localize() + ":";
this.Name = "Nozzle Offset Calibration Wizard";
var commonMargin = new BorderDouble(4, 2);
var row = new FlowLayoutWidget()
{
HAnchor = HAnchor.Stretch,
VAnchor = VAnchor.Absolute,
Padding = new BorderDouble(6, 0),
Height = 125
};
contentRow.AddChild(row);
for(var i = 0; i <= 40; i++)
{
row.AddChild(new CalibrationLine(theme)
{
Width = 8,
Margin = 1,
HAnchor = HAnchor.Absolute,
VAnchor = VAnchor.Stretch,
GlyphIndex = (i % 5 == 0) ? i : -1,
IsNegative = i < 20
});
// Add spacers to stretch to size
if (i < 40)
{
row.AddChild(new HorizontalSpacer());
}
}
row.AfterDraw += (s, e) =>
{
int strokeWidth = 3;
var rect = new RectangleDouble(0, 20, row.LocalBounds.Width, row.LocalBounds.Height);
rect.Inflate(-2);
var center = rect.Center;
e.Graphics2D.Rectangle(rect, theme.TextColor, strokeWidth);
e.Graphics2D.Line(rect.Left, center.Y, rect.Right, center.Y, theme.TextColor, strokeWidth);
};
}
}
}