From ee626abef4d88b14c212bbe94a24ce2dc4880fa9 Mon Sep 17 00:00:00 2001 From: wandererfan Date: Fri, 13 Mar 2020 14:52:27 -0400 Subject: [PATCH] [TD]synchronize defaults in code and prefs --- src/Mod/TechDraw/App/DrawUtil.cpp | 2 +- src/Mod/TechDraw/App/DrawViewBalloon.cpp | 2 +- src/Mod/TechDraw/App/DrawViewDimension.cpp | 2 +- src/Mod/TechDraw/App/DrawViewPart.cpp | 10 +- src/Mod/TechDraw/App/DrawViewSection.cpp | 2 +- src/Mod/TechDraw/Gui/DlgPrefsTechDraw1.ui | 36 +- src/Mod/TechDraw/Gui/DlgPrefsTechDraw2.ui | 359 +++++++++--------- src/Mod/TechDraw/Gui/DlgPrefsTechDraw3.ui | 8 +- src/Mod/TechDraw/Gui/QGIArrow.cpp | 2 +- src/Mod/TechDraw/Gui/QGICMark.cpp | 2 +- src/Mod/TechDraw/Gui/QGIHighlight.cpp | 2 +- src/Mod/TechDraw/Gui/QGIPrimPath.cpp | 31 +- src/Mod/TechDraw/Gui/QGIViewPart.cpp | 2 +- src/Mod/TechDraw/Gui/ViewProviderViewPart.cpp | 2 +- 14 files changed, 222 insertions(+), 240 deletions(-) diff --git a/src/Mod/TechDraw/App/DrawUtil.cpp b/src/Mod/TechDraw/App/DrawUtil.cpp index 69460e9a2f..648fb071c1 100644 --- a/src/Mod/TechDraw/App/DrawUtil.cpp +++ b/src/Mod/TechDraw/App/DrawUtil.cpp @@ -656,7 +656,7 @@ bool DrawUtil::isCrazy(TopoDS_Edge e) Base::Reference hGrp = App::GetApplication().GetUserParameter().GetGroup("BaseApp")-> GetGroup("Preferences")->GetGroup("Mod/TechDraw/debug"); - bool crazyOK = hGrp->GetBool("allowCrazyEdge", true); + bool crazyOK = hGrp->GetBool("allowCrazyEdge", false); if (crazyOK) { return false; } diff --git a/src/Mod/TechDraw/App/DrawViewBalloon.cpp b/src/Mod/TechDraw/App/DrawViewBalloon.cpp index 60fd075ae0..e8c756badf 100644 --- a/src/Mod/TechDraw/App/DrawViewBalloon.cpp +++ b/src/Mod/TechDraw/App/DrawViewBalloon.cpp @@ -273,7 +273,7 @@ int DrawViewBalloon::prefEnd(void) const Base::Reference hGrp = App::GetApplication().GetUserParameter(). GetGroup("BaseApp")->GetGroup("Preferences")-> GetGroup("Mod/TechDraw/Decorations"); - int end = hGrp->GetInt("BalloonArrow", 0); + int end = hGrp->GetInt("BalloonArrow", 1); return end; } diff --git a/src/Mod/TechDraw/App/DrawViewDimension.cpp b/src/Mod/TechDraw/App/DrawViewDimension.cpp index 726c6977d1..87ae7abc91 100644 --- a/src/Mod/TechDraw/App/DrawViewDimension.cpp +++ b/src/Mod/TechDraw/App/DrawViewDimension.cpp @@ -1159,7 +1159,7 @@ bool DrawViewDimension::showUnits() const bool result = false; Base::Reference hGrp = App::GetApplication().GetUserParameter() .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/Dimensions"); - result = hGrp->GetBool("ShowUnits", true); + result = hGrp->GetBool("ShowUnits", false); return result; } diff --git a/src/Mod/TechDraw/App/DrawViewPart.cpp b/src/Mod/TechDraw/App/DrawViewPart.cpp index 0ae66f5773..dc9c78a5b4 100644 --- a/src/Mod/TechDraw/App/DrawViewPart.cpp +++ b/src/Mod/TechDraw/App/DrawViewPart.cpp @@ -1462,7 +1462,7 @@ bool DrawViewPart::prefIsoViz(void) { Base::Reference hGrp = App::GetApplication().GetUserParameter() .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/HLR"); - bool result = hGrp->GetBool("IsoViz", true); + bool result = hGrp->GetBool("IsoViz", false); return result; } @@ -1470,7 +1470,7 @@ bool DrawViewPart::prefHardHid(void) { Base::Reference hGrp = App::GetApplication().GetUserParameter() .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/HLR"); - bool result = hGrp->GetBool("HardHid", true); + bool result = hGrp->GetBool("HardHid", false); return result; } @@ -1478,7 +1478,7 @@ bool DrawViewPart::prefSeamHid(void) { Base::Reference hGrp = App::GetApplication().GetUserParameter() .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/HLR"); - bool result = hGrp->GetBool("SeamHid", true); + bool result = hGrp->GetBool("SeamHid", false); return result; } @@ -1486,7 +1486,7 @@ bool DrawViewPart::prefSmoothHid(void) { Base::Reference hGrp = App::GetApplication().GetUserParameter() .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/HLR"); - bool result = hGrp->GetBool("SmoothHid", true); + bool result = hGrp->GetBool("SmoothHid", false); return result; } @@ -1494,7 +1494,7 @@ bool DrawViewPart::prefIsoHid(void) { Base::Reference hGrp = App::GetApplication().GetUserParameter() .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/HLR"); - bool result = hGrp->GetBool("IsoHid", true); + bool result = hGrp->GetBool("IsoHid", false); return result; } diff --git a/src/Mod/TechDraw/App/DrawViewSection.cpp b/src/Mod/TechDraw/App/DrawViewSection.cpp index d179f53614..8f389a61b0 100644 --- a/src/Mod/TechDraw/App/DrawViewSection.cpp +++ b/src/Mod/TechDraw/App/DrawViewSection.cpp @@ -904,7 +904,7 @@ void DrawViewSection::getParameters() hGrp = App::GetApplication().GetUserParameter() .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/General"); - bool fuseFirst = hGrp->GetBool("SectionFuseFirst",true); + bool fuseFirst = hGrp->GetBool("SectionFuseFirst", false); FuseBeforeCut.setValue(fuseFirst); } diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw1.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw1.ui index 689c6881ac..534961ad5f 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw1.ui +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw1.ui @@ -216,7 +216,7 @@ for ProjectionGroups Normal line color - + 0 0 @@ -286,7 +286,7 @@ for ProjectionGroups Preselection color - + 255 255 @@ -318,7 +318,7 @@ for ProjectionGroups Section face color - + 225 225 @@ -350,7 +350,7 @@ for ProjectionGroups Selected item color - + 28 173 @@ -382,7 +382,7 @@ for ProjectionGroups Section face hatch color - + 0 0 @@ -414,7 +414,7 @@ for ProjectionGroups Window background color - + 80 80 @@ -446,7 +446,7 @@ for ProjectionGroups Geometric hatch color - + 0 0 @@ -473,7 +473,7 @@ for ProjectionGroups Color of Dimension lines and text. - + 0 0 @@ -565,7 +565,7 @@ for ProjectionGroups Face color - + 255 255 @@ -597,7 +597,7 @@ for ProjectionGroups Default color for annotations - + 0 0 @@ -733,7 +733,7 @@ for ProjectionGroups - + 0 @@ -743,7 +743,7 @@ for ProjectionGroups Label size - + 8.000000000000000 @@ -793,7 +793,7 @@ for ProjectionGroups - + 0 @@ -844,7 +844,7 @@ for ProjectionGroups - + 0 @@ -884,7 +884,7 @@ for ProjectionGroups - + 0 @@ -921,7 +921,7 @@ for ProjectionGroups - + 0 @@ -958,7 +958,7 @@ for ProjectionGroups - + 0 @@ -998,7 +998,7 @@ for ProjectionGroups - + 0 diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw2.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw2.ui index e7b561aa8d..78220d2496 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw2.ui +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw2.ui @@ -251,7 +251,57 @@ - + + + 24 + + + + + OverLap Radius (TBI) + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 0 + 33 + + + + Area to be inspected for overlap object selection. (not implemented yet) + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 20.000000000000000 + + + OverlapRadius + + + Mod/TechDraw/General + + + @@ -271,18 +321,12 @@ - - - - Qt::Horizontal + + + + Mark Fuzz - - - 40 - 20 - - - + @@ -294,7 +338,7 @@ - 174 + 0 0 @@ -324,13 +368,6 @@ - - - - Mark Fuzz - - - @@ -341,7 +378,7 @@ - 174 + 0 0 @@ -371,81 +408,24 @@ - - - - Overlap Radius + + + + Qt::Horizontal - - - - - - false - - - - 0 - 0 - - - + - 174 - 0 + 40 + 20 - - - 0 - 33 - - - - Area to be inspected for overlap object selection. -(not implemented yet) - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 20.000000000000000 - - - OverlapRadius - - - Mod/TechDraw/General - - + - - - - - 12 - true - - - - QFrame::Box - - - Items in italics are default values for new objects. They have no effect on existing objects. - - - true - - - @@ -463,75 +443,9 @@ Size Adjustments - + - - - - - Vertex Scale - - - - - - - - 0 - 0 - - - - - 174 - 0 - - - - Scale of vertex dots. Multiplier of line width. - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 5.000000000000000 - - - VertexScale - - - Mod/TechDraw/General - - - - - - - - true - - - - Center Mark Scale - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - + @@ -540,14 +454,8 @@ 0 - - - 174 - 0 - - - Size of center marks. Multiplier of vertex size. + Size of center marks. Multiplier of vertex size. @@ -566,6 +474,65 @@ + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 0 + 0 + + + + Tolerance font size adjustment. Multiplier of dimension font size. + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 0.500000000000000 + + + TolSizeAdjust + + + Mod/TechDraw/Dimensions + + + + + + + Vertex Scale + + + + + + + + true + + + + Center Mark Scale + + + @@ -590,28 +557,23 @@ - - + + + + Template Edit Mark + + + + + 0 0 - - - 174 - 0 - - - - - 0 - 0 - - - Tolerance font size adjustment. Multiplier of dimension font size. + Scale of vertex dots. Multiplier of line width. @@ -620,20 +582,13 @@ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - 0.500000000000000 + 5.000000000000000 - TolSizeAdjust + VertexScale - Mod/TechDraw/Dimensions - - - - - - - Template Edit Mark + Mod/TechDraw/General @@ -665,11 +620,43 @@ + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 12 + true + + + + QFrame::Box + + + Items in italics are default values for new objects. They have no effect on existing objects. + + + true + + + diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw3.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw3.ui index 23a7f067cc..1279b7b5f0 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDraw3.ui +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDraw3.ui @@ -218,7 +218,7 @@ - + 0 @@ -228,7 +228,7 @@ Dimension text font size - + 4.000000000000000 @@ -240,7 +240,7 @@ - + 0 @@ -250,7 +250,7 @@ Arrowhead size - + 5.000000000000000 diff --git a/src/Mod/TechDraw/Gui/QGIArrow.cpp b/src/Mod/TechDraw/Gui/QGIArrow.cpp index eaf93f3fec..199172da54 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", 0); + int style = hGrp->GetInt("ArrowStyle", 1); return style; } diff --git a/src/Mod/TechDraw/Gui/QGICMark.cpp b/src/Mod/TechDraw/Gui/QGICMark.cpp index 7180034021..af9b8436b1 100644 --- a/src/Mod/TechDraw/Gui/QGICMark.cpp +++ b/src/Mod/TechDraw/Gui/QGICMark.cpp @@ -106,7 +106,7 @@ QPainterPath QGICMark::shape() const { Base::Reference hGrp = App::GetApplication().GetUserParameter().GetGroup("BaseApp")-> GetGroup("Preferences")->GetGroup("Mod/TechDraw/General"); - double result = hGrp->GetFloat("MarkFuzz",20.0); + double result = hGrp->GetFloat("MarkFuzz",5.0); return result; } diff --git a/src/Mod/TechDraw/Gui/QGIHighlight.cpp b/src/Mod/TechDraw/Gui/QGIHighlight.cpp index ef515d2fbb..f67212861e 100644 --- a/src/Mod/TechDraw/Gui/QGIHighlight.cpp +++ b/src/Mod/TechDraw/Gui/QGIHighlight.cpp @@ -138,7 +138,7 @@ int QGIHighlight::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", 0); return style; } diff --git a/src/Mod/TechDraw/Gui/QGIPrimPath.cpp b/src/Mod/TechDraw/Gui/QGIPrimPath.cpp index 96834e828f..67d5c0a45b 100644 --- a/src/Mod/TechDraw/Gui/QGIPrimPath.cpp +++ b/src/Mod/TechDraw/Gui/QGIPrimPath.cpp @@ -262,25 +262,20 @@ Qt::PenCapStyle QGIPrimPath::prefCapStyle() Base::Reference hGrp = App::GetApplication().GetUserParameter() .GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/TechDraw/General"); Qt::PenCapStyle result; - //old parameter format UINT - unsigned int oldStyle = hGrp->GetUnsigned("EdgeCapStyle", 0xFF); //0x00 FlatCap, 0x10 SquareCap, 0x20 RoundCap - result = (Qt::PenCapStyle) oldStyle; int newStyle; - if (oldStyle == 0xFF) { //no old style parm found - newStyle = hGrp->GetInt("EdgeCapStyle", 32); //0x00 FlatCap, 0x10 SquareCap, 0x20 RoundCap - switch (newStyle) { - case 0: - result = (Qt::PenCapStyle) 0x20; //round; - break; - case 1: - result = (Qt::PenCapStyle) 0x10; //square; - break; - case 2: - result = (Qt::PenCapStyle) 0x00; //flat - break; - default: - result = (Qt::PenCapStyle) 0x20; - } + newStyle = hGrp->GetInt("EdgeCapStyle", 32); //0x00 FlatCap, 0x10 SquareCap, 0x20 RoundCap + switch (newStyle) { + case 0: + result = (Qt::PenCapStyle) 0x20; //round; + break; + case 1: + result = (Qt::PenCapStyle) 0x10; //square; + break; + case 2: + result = (Qt::PenCapStyle) 0x00; //flat + break; + default: + result = (Qt::PenCapStyle) 0x20; } return result; } diff --git a/src/Mod/TechDraw/Gui/QGIViewPart.cpp b/src/Mod/TechDraw/Gui/QGIViewPart.cpp index b3b04254c9..16e4de8c24 100644 --- a/src/Mod/TechDraw/Gui/QGIViewPart.cpp +++ b/src/Mod/TechDraw/Gui/QGIViewPart.cpp @@ -1288,6 +1288,6 @@ bool QGIViewPart::prefPrintCenters(void) { Base::Reference hGrp = App::GetApplication().GetUserParameter().GetGroup("BaseApp")-> GetGroup("Preferences")->GetGroup("Mod/TechDraw/Decorations"); - bool printCenters = hGrp->GetBool("PrintCenterMarks", true); //true matches v0.18 behaviour + bool printCenters = hGrp->GetBool("PrintCenterMarks", false); //true matches v0.18 behaviour return printCenters; } diff --git a/src/Mod/TechDraw/Gui/ViewProviderViewPart.cpp b/src/Mod/TechDraw/Gui/ViewProviderViewPart.cpp index e17b030452..84c4d4aaca 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderViewPart.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderViewPart.cpp @@ -89,7 +89,7 @@ ViewProviderViewPart::ViewProviderViewPart() hGrp = App::GetApplication().GetUserParameter().GetGroup("BaseApp")-> GetGroup("Preferences")->GetGroup("Mod/TechDraw/Decorations"); - double defScale = hGrp->GetFloat("CenterMarkScale",2.0); + double defScale = hGrp->GetFloat("CenterMarkScale",0.50); bool defShowCenters = hGrp->GetBool("ShowCenterMarks", false); //decorations