Every function that tracks position implements SetPerinterPosition Moved GCodeStreamProxy to its own file Created a new PauseHandlingStream Wrote a test for same Fixed the bug with pausing not returning to correct extrusion Fixed print leveling to pass on the correct offset to SetPrinterPosition Made sure we always send the shut off extruders on exit Make agg parse double able to handle a space between the negative sign and the number "- 10". Put in a test for same.
80 lines
No EOL
2.7 KiB
C#
80 lines
No EOL
2.7 KiB
C#
/*
|
|
Copyright (c) 2014, Lars Brubaker
|
|
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 MatterHackers.Agg;
|
|
using MatterHackers.GCodeVisualizer;
|
|
using MatterHackers.VectorMath;
|
|
using System.Text;
|
|
using System.Collections.Generic;
|
|
|
|
namespace MatterHackers.MatterControl.PrinterCommunication.Io
|
|
{
|
|
public class OffsetStream : GCodeStreamProxy
|
|
{
|
|
Vector3 offset;
|
|
protected PrinterMove lastDestination = new PrinterMove();
|
|
public PrinterMove LastDestination { get { return lastDestination; } }
|
|
|
|
public OffsetStream(GCodeStream internalStream, Vector3 offset)
|
|
: base(internalStream)
|
|
{
|
|
this.offset = offset;
|
|
}
|
|
|
|
public override void SetPrinterPosition(PrinterMove position)
|
|
{
|
|
lastDestination = position;
|
|
lastDestination.position -= offset;
|
|
internalStream.SetPrinterPosition(lastDestination);
|
|
}
|
|
|
|
public Vector3 Offset { get { return offset; } set { offset = value; } }
|
|
|
|
public override string ReadLine()
|
|
{
|
|
string lineToSend = base.ReadLine();
|
|
|
|
if (lineToSend != null
|
|
&& LineIsMovement(lineToSend))
|
|
{
|
|
PrinterMove currentMove = GetPosition(lineToSend, lastDestination);
|
|
|
|
PrinterMove moveToSend = currentMove;
|
|
moveToSend.position += offset;
|
|
|
|
lineToSend = CreateMovementLine(moveToSend, lastDestination);
|
|
lastDestination = currentMove;
|
|
return lineToSend;
|
|
}
|
|
|
|
return lineToSend;
|
|
}
|
|
}
|
|
} |