From 5d363b450a5c8a12946c19dedce4a968fdffd5e0 Mon Sep 17 00:00:00 2001 From: wandererfan Date: Sat, 10 Mar 2018 16:34:57 -0500 Subject: [PATCH] Sync code default values with Pref defaults --- src/Mod/TechDraw/Gui/QGIArrow.cpp | 6 +++--- src/Mod/TechDraw/Gui/QGICenterLine.cpp | 2 +- src/Mod/TechDraw/Gui/QGIEdge.cpp | 2 +- src/Mod/TechDraw/Gui/QGIMatting.cpp | 2 +- src/Mod/TechDraw/Gui/QGISectionLine.cpp | 4 ++-- src/Mod/TechDraw/Gui/QGIView.cpp | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Mod/TechDraw/Gui/QGIArrow.cpp b/src/Mod/TechDraw/Gui/QGIArrow.cpp index 0a6db47d00..d269e79da3 100644 --- a/src/Mod/TechDraw/Gui/QGIArrow.cpp +++ b/src/Mod/TechDraw/Gui/QGIArrow.cpp @@ -90,7 +90,7 @@ QPainterPath QGIArrow::makeFilledTriangle(double length, double width, bool flip if (!flipped) { length *= -1; } - + QPainterPath path; path.moveTo(QPointF(0.,0.)); path.lineTo(QPointF(Rez::guiX(length),Rez::guiX(-width))); @@ -106,7 +106,7 @@ QPainterPath QGIArrow::makeOpenArrow(double length, double width, bool flipped) if (!flipped) { length *= -1; } - + QPainterPath path; path.moveTo(QPointF(Rez::guiX(length),Rez::guiX(-width))); path.lineTo(QPointF(0.,0.)); @@ -163,7 +163,7 @@ double QGIArrow::getPrefArrowSize() { Base::Reference hGrp = App::GetApplication().GetUserParameter(). GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/Dimensions"); - double style = hGrp->GetFloat("ArrowSize", 5.0); + double style = hGrp->GetFloat("ArrowSize", 3.5); return style; } diff --git a/src/Mod/TechDraw/Gui/QGICenterLine.cpp b/src/Mod/TechDraw/Gui/QGICenterLine.cpp index b46f7ebfc9..552219e191 100644 --- a/src/Mod/TechDraw/Gui/QGICenterLine.cpp +++ b/src/Mod/TechDraw/Gui/QGICenterLine.cpp @@ -80,7 +80,7 @@ Qt::PenStyle QGICenterLine::getCenterStyle() { Base::Reference hGrp = App::GetApplication().GetUserParameter().GetGroup("BaseApp")-> GetGroup("Preferences")->GetGroup("Mod/TechDraw/Decorations"); - Qt::PenStyle centerStyle = static_cast (hGrp->GetInt("CenterLine", 4)); + Qt::PenStyle centerStyle = static_cast (hGrp->GetInt("CenterLine", 2)); return centerStyle; } diff --git a/src/Mod/TechDraw/Gui/QGIEdge.cpp b/src/Mod/TechDraw/Gui/QGIEdge.cpp index 93fc0cf42b..b6397a11c4 100644 --- a/src/Mod/TechDraw/Gui/QGIEdge.cpp +++ b/src/Mod/TechDraw/Gui/QGIEdge.cpp @@ -105,7 +105,7 @@ Qt::PenStyle QGIEdge::getHiddenStyle() { Base::Reference hGrp = App::GetApplication().GetUserParameter().GetGroup("BaseApp")-> GetGroup("Preferences")->GetGroup("Mod/TechDraw/General"); - Qt::PenStyle hidStyle = static_cast (hGrp->GetInt("HiddenLine",2)); + Qt::PenStyle hidStyle = static_cast (hGrp->GetInt("HiddenLine",1)); return hidStyle; } diff --git a/src/Mod/TechDraw/Gui/QGIMatting.cpp b/src/Mod/TechDraw/Gui/QGIMatting.cpp index ed0c39849e..0bb70316c8 100644 --- a/src/Mod/TechDraw/Gui/QGIMatting.cpp +++ b/src/Mod/TechDraw/Gui/QGIMatting.cpp @@ -106,7 +106,7 @@ int QGIMatting::getHoleStyle() { Base::Reference hGrp = App::GetApplication().GetUserParameter() .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/Decorations"); - int style = hGrp->GetInt("MattingStyle", 1l); + int style = hGrp->GetInt("MattingStyle", 0l); return style; } diff --git a/src/Mod/TechDraw/Gui/QGISectionLine.cpp b/src/Mod/TechDraw/Gui/QGISectionLine.cpp index cd387ec9ba..459ff9fd9a 100644 --- a/src/Mod/TechDraw/Gui/QGISectionLine.cpp +++ b/src/Mod/TechDraw/Gui/QGISectionLine.cpp @@ -43,7 +43,7 @@ QGISectionLine::QGISectionLine() { m_symbol = ""; m_symSize = 0.0; - + m_extLen = Rez::guiX(8.0); m_arrowSize = 0.0; @@ -181,7 +181,7 @@ Qt::PenStyle QGISectionLine::getSectionStyle() { Base::Reference hGrp = App::GetApplication().GetUserParameter().GetGroup("BaseApp")-> GetGroup("Preferences")->GetGroup("Mod/TechDraw"); - Qt::PenStyle sectStyle = static_cast (hGrp->GetInt("SectionLine", 4)); + Qt::PenStyle sectStyle = static_cast (hGrp->GetInt("SectionLine", 2)); return sectStyle; } diff --git a/src/Mod/TechDraw/Gui/QGIView.cpp b/src/Mod/TechDraw/Gui/QGIView.cpp index 57cabedd89..994f5b22f4 100644 --- a/src/Mod/TechDraw/Gui/QGIView.cpp +++ b/src/Mod/TechDraw/Gui/QGIView.cpp @@ -311,7 +311,7 @@ void QGIView::setViewFeature(TechDraw::DrawView *obj) viewObj = obj; viewName = obj->getNameInDocument(); - + //mark the actual QGraphicsItem so we can check what's in the scene later setData(0,QString::fromUtf8("QGIV")); setData(1,QString::fromUtf8(obj->getNameInDocument())); @@ -528,7 +528,7 @@ double QGIView::getPrefFontSize() { Base::Reference hGrp = App::GetApplication().GetUserParameter(). GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/Labels"); - double fontSize = hGrp->GetFloat("LabelSize", 5.0); + double fontSize = hGrp->GetFloat("LabelSize", 3.5); return Rez::guiX(fontSize); }