Skip to content

Commit 734af97

Browse files
committed
GLPathItem: Remove tool offset from calculation
Paths with tool offset are now displayed the same way as in AXIS.
1 parent 3863795 commit 734af97

File tree

1 file changed

+0
-9
lines changed

1 file changed

+0
-9
lines changed

src/pathview/glpathitem.cpp

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -803,58 +803,49 @@ GLPathItem::Position GLPathItem::calculateNewPosition(const machinetalk::Positio
803803
if (newPosition.has_x()) {
804804
position.x = m_activeOffsets.g92Offset.x;
805805
position.x += m_activeOffsets.g5xOffsets.at(m_activeOffsets.g5xOffsetIndex-1).x;
806-
position.x += m_activeOffsets.toolOffset.x;
807806
position.x += newPosition.x();
808807
}
809808

810809
if (newPosition.has_y()) {
811810
position.y = m_activeOffsets.g92Offset.y;
812811
position.y += m_activeOffsets.g5xOffsets.at(m_activeOffsets.g5xOffsetIndex-1).y;
813-
position.y += m_activeOffsets.toolOffset.y;
814812
position.y += newPosition.y();
815813
}
816814

817815
if (newPosition.has_z()) {
818816
position.z = m_activeOffsets.g92Offset.z;
819817
position.z += m_activeOffsets.g5xOffsets.at(m_activeOffsets.g5xOffsetIndex-1).z;
820-
position.z += m_activeOffsets.toolOffset.z;
821818
position.z += newPosition.z();
822819
}
823820

824821
if (newPosition.has_a()) {
825822
position.a = m_activeOffsets.g92Offset.a;
826823
position.a += m_activeOffsets.g5xOffsets.at(m_activeOffsets.g5xOffsetIndex-1).a;
827-
position.a += m_activeOffsets.toolOffset.a;
828824
position.a += newPosition.a();
829825
}
830826
if (newPosition.has_b()) {
831827
position.b = m_activeOffsets.g92Offset.b;
832828
position.b += m_activeOffsets.g5xOffsets.at(m_activeOffsets.g5xOffsetIndex-1).b;
833-
position.b += m_activeOffsets.toolOffset.b;
834829
position.b += newPosition.b();
835830
}
836831
if (newPosition.has_c()) {
837832
position.c = m_activeOffsets.g92Offset.c;
838833
position.c += m_activeOffsets.g5xOffsets.at(m_activeOffsets.g5xOffsetIndex-1).c;
839-
position.c += m_activeOffsets.toolOffset.c;
840834
position.c += newPosition.c();
841835
}
842836
if (newPosition.has_u()) {
843837
position.u = m_activeOffsets.g92Offset.u;
844838
position.u += m_activeOffsets.g5xOffsets.at(m_activeOffsets.g5xOffsetIndex-1).u;
845-
position.u += m_activeOffsets.toolOffset.u;
846839
position.u += newPosition.u();
847840
}
848841
if (newPosition.has_v()) {
849842
position.v = m_activeOffsets.g92Offset.v;
850843
position.v += m_activeOffsets.g5xOffsets.at(m_activeOffsets.g5xOffsetIndex-1).v;
851-
position.v += m_activeOffsets.toolOffset.v;
852844
position.v += newPosition.v();
853845
}
854846
if (newPosition.has_w()) {
855847
position.w = m_activeOffsets.g92Offset.w;
856848
position.w += m_activeOffsets.g5xOffsets.at(m_activeOffsets.g5xOffsetIndex-1).w;
857-
position.w += m_activeOffsets.toolOffset.w;
858849
position.w += newPosition.w();
859850
}
860851

0 commit comments

Comments
 (0)