From 6fa80d8cbf0426737523c8d513edd9c952631749 Mon Sep 17 00:00:00 2001 From: donovaly Date: Sat, 21 Mar 2020 01:21:20 +0100 Subject: [PATCH] [TD] fix order of arrow heads see https://forum.freecadweb.org/viewtopic.php?f=35&t=44334#p378675 --- src/Mod/TechDraw/App/ArrowPropEnum.cpp | 10 +++++----- src/Mod/TechDraw/App/DrawLeaderLine.cpp | 10 ++++++---- src/Mod/TechDraw/Gui/DlgPrefsTechDraw3Imp.cpp | 4 ++-- src/Mod/TechDraw/Gui/QGIArrow.cpp | 2 +- src/Mod/TechDraw/Gui/QGIViewDimension.cpp | 10 +++++----- src/Mod/TechDraw/Gui/TaskLeaderLine.cpp | 2 +- 6 files changed, 20 insertions(+), 18 deletions(-) diff --git a/src/Mod/TechDraw/App/ArrowPropEnum.cpp b/src/Mod/TechDraw/App/ArrowPropEnum.cpp index 05a3f6063c..1f1ac3aaff 100644 --- a/src/Mod/TechDraw/App/ArrowPropEnum.cpp +++ b/src/Mod/TechDraw/App/ArrowPropEnum.cpp @@ -30,23 +30,23 @@ namespace TechDraw { const int ArrowPropEnum::ArrowCount = 8; -const char* ArrowPropEnum::ArrowTypeEnums[]= { "None", - "Filled Arrow", +const char* ArrowPropEnum::ArrowTypeEnums[]= { "Filled Arrow", "Open Arrow", "Tick", "Dot", "Open Circle", "Fork", "Filled Triangle", + "None", NULL}; -const std::vector ArrowPropEnum::ArrowTypeIcons = { ":icons/arrownone.svg", - ":icons/arrowfilled.svg", +const std::vector ArrowPropEnum::ArrowTypeIcons = { ":icons/arrowfilled.svg", ":icons/arrowopen.svg", ":icons/arrowtick.svg", ":icons/arrowdot.svg", ":icons/arrowopendot.svg", ":icons/arrowfork.svg", - ":icons/arrowpyramid.svg"}; + ":icons/arrowpyramid.svg", + ":icons/arrownone.svg"}; } diff --git a/src/Mod/TechDraw/App/DrawLeaderLine.cpp b/src/Mod/TechDraw/App/DrawLeaderLine.cpp index 3eb84abea1..4931216a8b 100644 --- a/src/Mod/TechDraw/App/DrawLeaderLine.cpp +++ b/src/Mod/TechDraw/App/DrawLeaderLine.cpp @@ -47,7 +47,7 @@ using namespace TechDraw; PROPERTY_SOURCE(TechDraw::DrawLeaderLine, TechDraw::DrawView) //TODO: share this between DrawViewBalloon, DrawLeaderLine, QGIArrow, Prefs, etc -//const char* DrawLeaderLine::ArrowTypeEnums[]= { "NONE", +//const char* DrawLeaderLine::ArrowTypeEnums[]= { // "FILLED_ARROW", // "OPEN_ARROW", // "TICK", @@ -55,8 +55,9 @@ PROPERTY_SOURCE(TechDraw::DrawLeaderLine, TechDraw::DrawView) // "OPEN_CIRCLE", // "FORK", // "FILLED_TRIANGLE", +// "NONE" // NULL}; -//const char* DrawLeaderLine::ArrowTypeEnums2[]= { "NONE", +//const char* DrawLeaderLine::ArrowTypeEnums2[]= { // "FILLED_ARROW", // "OPEN_ARROW", // "TICK", @@ -64,6 +65,7 @@ PROPERTY_SOURCE(TechDraw::DrawLeaderLine, TechDraw::DrawView) // "OPEN_CIRCLE", // "FORK", // "FILLED_TRIANGLE", +// "NONE" // NULL}; DrawLeaderLine::DrawLeaderLine(void) @@ -80,11 +82,11 @@ DrawLeaderLine::DrawLeaderLine(void) // ADD_PROPERTY(EndType,(prefEnd())); StartSymbol.setEnums(ArrowPropEnum::ArrowTypeEnums); - ADD_PROPERTY(StartSymbol,(1l)); //filled arrow + ADD_PROPERTY(StartSymbol,(0l)); //filled arrow // ADD_PROPERTY_TYPE(StartSymbol, (0), group, App::Prop_None, "Symbol (arrowhead) for start of line"); EndSymbol.setEnums(ArrowPropEnum::ArrowTypeEnums); - ADD_PROPERTY(EndSymbol,(0l)); //no symbol + ADD_PROPERTY(EndSymbol,(7l)); //no symbol // ADD_PROPERTY_TYPE(EndSymbol, (0), group, App::Prop_None, "Symbol (arrowhead) for end of line"); diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw3Imp.cpp b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw3Imp.cpp index 085c6ab2be..df754be722 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw3Imp.cpp +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw3Imp.cpp @@ -131,7 +131,7 @@ int DlgPrefsTechDraw3Imp::prefBalloonArrow(void) const Base::Reference hGrp = App::GetApplication().GetUserParameter(). GetGroup("BaseApp")->GetGroup("Preferences")-> GetGroup("Mod/TechDraw/Decorations"); - int end = hGrp->GetInt("BalloonArrow", 1); + int end = hGrp->GetInt("BalloonArrow", 0); return end; } @@ -140,7 +140,7 @@ int DlgPrefsTechDraw3Imp::prefArrowStyle(void) const Base::Reference hGrp = App::GetApplication().GetUserParameter(). GetGroup("BaseApp")->GetGroup("Preferences")-> GetGroup("Mod/TechDraw/Dimensions"); - int style = hGrp->GetInt("ArrowStyle", 1); + int style = hGrp->GetInt("ArrowStyle", 0); return style; } diff --git a/src/Mod/TechDraw/Gui/QGIArrow.cpp b/src/Mod/TechDraw/Gui/QGIArrow.cpp index 199172da54..eaf93f3fec 100644 --- a/src/Mod/TechDraw/Gui/QGIArrow.cpp +++ b/src/Mod/TechDraw/Gui/QGIArrow.cpp @@ -313,7 +313,7 @@ int QGIArrow::getPrefArrowStyle() Base::Reference hGrp = App::GetApplication().GetUserParameter(). GetGroup("BaseApp")->GetGroup("Preferences")-> GetGroup("Mod/TechDraw/Dimensions"); - int style = hGrp->GetInt("ArrowStyle", 1); + int style = hGrp->GetInt("ArrowStyle", 0); return style; } diff --git a/src/Mod/TechDraw/Gui/QGIViewDimension.cpp b/src/Mod/TechDraw/Gui/QGIViewDimension.cpp index 52eea880a6..f960b636c4 100644 --- a/src/Mod/TechDraw/Gui/QGIViewDimension.cpp +++ b/src/Mod/TechDraw/Gui/QGIViewDimension.cpp @@ -1198,11 +1198,11 @@ void QGIViewDimension::drawArrows(int count, const Base::Vector2d positions[], d arrow->setSize(QGIArrow::getPrefArrowSize()); arrow->setFlipped(flipped); - if (QGIArrow::getPrefArrowStyle() != 0) { // if not "None" - arrow->draw(); - arrow->show(); - } - else + if (QGIArrow::getPrefArrowStyle() != 7) { // if not "None" + arrow->draw(); + arrow->show(); + } + else arrow->hide(); } } diff --git a/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp b/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp index 60335187a3..b9164b3896 100644 --- a/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp +++ b/src/Mod/TechDraw/Gui/TaskLeaderLine.cpp @@ -727,7 +727,7 @@ int TaskLeaderLine::getPrefArrowStyle() { Base::Reference hGrp = App::GetApplication().GetUserParameter(). GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/Dimensions"); - int style = hGrp->GetInt("ArrowStyle", 1); + int style = hGrp->GetInt("ArrowStyle", 0); return style; }