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

Extract PrintLineEnd to new method

Browse source
This commit is contained in:
John Lewin 2019-02-15 21:20:31 -08:00 • committed by jlewin
parent 2b3817409d
commit 4334f279fe
1 changed files with 46 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

86
MatterControlLib/CustomWidgets/NozzleOffsetCalibrationPage.cs
View file

@ -173,47 +173,8 @@ namespace MatterHackers.MatterControl
turtle.Speed = 500;
if (drawGlpyphs && CalibrationLine.Glyphs.TryGetValue(i, out IVertexSource vertexSource))
{
var flattened = new FlattenCurves(vertexSource);
PrintLineEnd(turtle, drawGlpyphs, i, currentPos);
var verticies = flattened.Vertices();
var firstItem = verticies.First();
var position = turtle.CurrentPosition;
var scale = 0.32;
if (firstItem.command != ShapePath.FlagsAndCommand.MoveTo)
{
turtle.MoveTo((firstItem.position * scale) + currentPos);
}
bool closed = false;
foreach (var item in verticies)
{
switch (item.command)
{
case ShapePath.FlagsAndCommand.MoveTo:
turtle.MoveTo((item.position * scale) + currentPos);
break;
case ShapePath.FlagsAndCommand.LineTo:
turtle.LineTo((item.position * scale) + currentPos);
break;
case ShapePath.FlagsAndCommand.FlagClose:
turtle.LineTo((firstItem.position * scale) + currentPos);
closed = true;
break;
}
}
if (!closed)
{
turtle.LineTo((firstItem.position * scale) + currentPos);
}
}
turtle.Speed = 1800;
turtle.MoveTo(x, y3);
@ -300,6 +261,51 @@ namespace MatterHackers.MatterControl
base.OnLoad(args);
}
private static void PrintLineEnd(GCodeTurtle turtle, bool drawGlpyphs, int i, Vector2 currentPos)
{
if (drawGlpyphs && CalibrationLine.Glyphs.TryGetValue(i, out IVertexSource vertexSource))
{
var flattened = new FlattenCurves(vertexSource);
var verticies = flattened.Vertices();
var firstItem = verticies.First();
var position = turtle.CurrentPosition;
var scale = 0.32;
if (firstItem.command != ShapePath.FlagsAndCommand.MoveTo)
{
turtle.MoveTo((firstItem.position * scale) + currentPos);
}
bool closed = false;
foreach (var item in verticies)
{
switch (item.command)
{
case ShapePath.FlagsAndCommand.MoveTo:
turtle.MoveTo((item.position * scale) + currentPos);
break;
case ShapePath.FlagsAndCommand.LineTo:
turtle.LineTo((item.position * scale) + currentPos);
break;
case ShapePath.FlagsAndCommand.FlagClose:
turtle.LineTo((firstItem.position * scale) + currentPos);
closed = true;
break;
}
}
if (!closed)
{
turtle.LineTo((firstItem.position * scale) + currentPos);
}
}
}
}
public class NozzleOffsetCalibrationResultsPage : DialogPage