From a564c468f0d592a57a662122ce065df2446a48dc Mon Sep 17 00:00:00 2001 From: wandererfan Date: Sun, 22 Mar 2020 19:37:48 -0400 Subject: [PATCH] [TD]fix Leader end type selection --- src/Mod/TechDraw/Gui/QGILeaderLine.cpp | 8 ++++---- src/Mod/TechDraw/Gui/TaskLeaderLine.cpp | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Mod/TechDraw/Gui/QGILeaderLine.cpp b/src/Mod/TechDraw/Gui/QGILeaderLine.cpp index f2925274fa..b01d8c375f 100644 --- a/src/Mod/TechDraw/Gui/QGILeaderLine.cpp +++ b/src/Mod/TechDraw/Gui/QGILeaderLine.cpp @@ -424,11 +424,11 @@ QPainterPath QGILeaderLine::makeLeaderPath(std::vector qPoints) double endAdjLength(0.0); if (qPoints.size() > 1) { //make path adjustment to hide leaderline ends behind arrowheads - if (featLeader->StartSymbol.getValue() > ArrowType::NONE) { + if (featLeader->StartSymbol.getValue() != ArrowType::NONE) { startAdjLength = QGIArrow::getOverlapAdjust(featLeader->StartSymbol.getValue(), QGIArrow::getPrefArrowSize()); } - if (featLeader->EndSymbol.getValue() > ArrowType::NONE) { + if (featLeader->EndSymbol.getValue() != ArrowType::NONE) { endAdjLength = QGIArrow::getOverlapAdjust(featLeader->EndSymbol.getValue(), QGIArrow::getPrefArrowSize()); } @@ -499,7 +499,7 @@ void QGILeaderLine::setArrows(std::vector pathPoints) QPointF lastOffset = (pathPoints.back() - pathPoints.front()); - if (featLeader->StartSymbol.getValue() > ArrowType::NONE) { + if (featLeader->StartSymbol.getValue() != ArrowType::NONE) { m_arrow1->setStyle(featLeader->StartSymbol.getValue()); m_arrow1->setWidth(getLineWidth()); // TODO: variable size arrow heads @@ -521,7 +521,7 @@ void QGILeaderLine::setArrows(std::vector pathPoints) m_arrow1->hide(); } - if (featLeader->EndSymbol.getValue() > ArrowType::NONE) { + if (featLeader->EndSymbol.getValue() != ArrowType::NONE) { m_arrow2->setStyle(featLeader->EndSymbol.getValue()); m_arrow2->setWidth(getLineWidth()); m_arrow2->setDirMode(true); diff --git a/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp b/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp index db770e1806..43808bc1e0 100644 --- a/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp +++ b/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp @@ -46,6 +46,7 @@ #include #include #include +#include #include @@ -267,7 +268,7 @@ void TaskLeaderLine::setUiPrimary() ui->cboxStartSym->setCurrentIndex(aStyle); DrawGuiUtil::loadArrowBox(ui->cboxEndSym); - ui->cboxEndSym->setCurrentIndex(0); + ui->cboxEndSym->setCurrentIndex(TechDraw::ArrowType::NONE); ui->dsbWeight->setUnit(Base::Unit::Length); ui->dsbWeight->setMinimum(0);