diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAdvanced.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAdvanced.ui index 45859a070e..9fe3d3cf4f 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAdvanced.ui +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAdvanced.ui @@ -6,8 +6,8 @@ 0 0 - 460 - 318 + 440 + 333 @@ -40,7 +40,95 @@ - + + + + + 0 + 20 + + + + Include 2D Objects in projection + + + Show Loose 2D Geom + + + false + + + ShowLoose2d + + + Mod/TechDraw/General + + + + + + + + 0 + 0 + + + + Include edges with unexpected geometry (zero length etc.) in results + + + Allow Crazy Edges + + + allowCrazyEdge + + + Mod/TechDraw/debug + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + Edge Fuzz + + + + + + + + 0 + 20 + + + + Override automatic dimension format + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + formatSpec + + + /Mod/TechDraw/Dimensions + + + + @@ -86,7 +174,136 @@ Only change unless you know what you are doing! - + + + + + 0 + 0 + + + + + 0 + 20 + + + + + true + + + + Perform a fuse operation on input shape(s) before Section view processing + + + Fuse Before Section + + + SectionFuseFirst + + + Mod/TechDraw/General + + + + + + + + true + + + + Dimension Format + + + + + + + + true + + + + Line End Cap Shape + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + + 0 + 20 + + + + Dump intermediate results during Detail view processing + + + Debug Detail + + + debugDetail + + + Mod/TechDraw/debugDetail + + + + + + + + 0 + 0 + + + + + 0 + 20 + + + + Highlights border of section cut in section views + + + Show Section Edges + + + true + + + ShowSectionEdges + + + /Mod/TechDraw/General + + + + @@ -122,146 +339,21 @@ Then you need to increase the tile limit. - - - - - 0 - 0 - - - - - 0 - 20 - - - - Dump intermediate results during Detail view processing - + + - Debug Detail - - - debugDetail - - - Mod/TechDraw/debugDetail + Max SVG Hatch Tiles - - - - - 0 - 20 - - - - Include 2D Objects in projection - + + - Show Loose 2D Geom - - - false - - - ShowLoose2d - - - Mod/TechDraw/General + Max PAT Hatch Segments - - - - - 0 - 0 - - - - Dump intermediate results during Section view processing - - - Debug Section - - - debugSection - - - Mod/TechDraw/debug - - - - - - - - 0 - 0 - - - - - 0 - 20 - - - - - true - - - - Perform a fuse operation on input shape(s) before Section view processing - - - Fuse Before Section - - - SectionFuseFirst - - - Mod/TechDraw/General - - - - - - - - 0 - 0 - - - - - 0 - 20 - - - - Highlights border of section cut in section views - - - Show Section Edges - - - true - - - ShowSectionEdges - - - /Mod/TechDraw/General - - - - + @@ -296,15 +388,25 @@ when hatching a face with a PAT pattern - - - - - true - + + + + + 0 + 0 + + + + Dump intermediate results during Section view processing - Line End Cap Shape + Debug Section + + + debugSection + + + Mod/TechDraw/debug @@ -336,86 +438,98 @@ can be a performance penalty in complex models. - - - - Qt::Horizontal - - + + + - 40 - 20 + 0 + 0 - + + Mark Fuzz + + - - + + 0 0 - - Include edges with unexpected geometry (zero length etc.) in results - - - Allow Crazy Edges - - - allowCrazyEdge - - - Mod/TechDraw/debug - - - - - - - Max SVG Hatch Tiles - - - - - - - Max PAT Hatch Segments - - - - - - - - true - - - - Dimension Format - - - - - + + 174 + 0 + + + 0 - 20 + 0 - Override automatic dimension format + Size of selection area around edges +Each unit is approx. 0.1 mm wide + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + 10.000000000000000 + - formatSpec + EdgeFuzz - /Mod/TechDraw/Dimensions + Mod/TechDraw/General + + + + + + + + 0 + 0 + + + + + 174 + 0 + + + + + 0 + 0 + + + + Selection area around center marks +Each unit is approx. 0.1 mm wide + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 5.000000000000000 + + + MarkFuzz + + + Mod/TechDraw/General @@ -450,8 +564,8 @@ can be a performance penalty in complex models. - 20 - 20 + 17 + 1 @@ -479,6 +593,11 @@ can be a performance penalty in complex models. QLineEdit
Gui/PrefWidgets.h
+ + Gui::PrefDoubleSpinBox + QDoubleSpinBox +
Gui/PrefWidgets.h
+ diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAdvancedImp.cpp b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAdvancedImp.cpp index fffbf95c87..39b6aeb6f1 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAdvancedImp.cpp +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAdvancedImp.cpp @@ -45,32 +45,36 @@ DlgPrefsTechDrawAdvancedImp::~DlgPrefsTechDrawAdvancedImp() void DlgPrefsTechDrawAdvancedImp::saveSettings() { - ui->cbEndCap->onSave(); - ui->cbCrazyEdges->onSave(); - ui->cbDebugSection->onSave(); - ui->cbDetectFaces->onSave(); - ui->cbDebugDetail->onSave(); + ui->cbDetectFaces->onSave(); ui->cbShowSectionEdges->onSave(); + ui->cbDebugSection->onSave(); + ui->cbDebugDetail->onSave(); + ui->cbCrazyEdges->onSave(); ui->cbFuseBeforeSection->onSave(); + ui->cbShowLoose->onSave(); + ui->pdsbEdgeFuzz->onSave(); + ui->pdsbMarkFuzz->onSave(); + ui->leFormatSpec->onSave(); + ui->cbEndCap->onSave(); ui->sbMaxTiles->onSave(); ui->sbMaxPat->onSave(); - ui->cbShowLoose->onSave(); - ui->leFormatSpec->onSave(); } void DlgPrefsTechDrawAdvancedImp::loadSettings() { - ui->cbEndCap->onRestore(); - ui->cbCrazyEdges->onRestore(); - ui->cbDebugSection->onRestore(); ui->cbDetectFaces->onRestore(); - ui->cbDebugDetail->onRestore(); ui->cbShowSectionEdges->onRestore(); + ui->cbDebugSection->onRestore(); + ui->cbDebugDetail->onRestore(); + ui->cbCrazyEdges->onRestore(); ui->cbFuseBeforeSection->onRestore(); + ui->cbShowLoose->onRestore(); + ui->pdsbEdgeFuzz->onRestore(); + ui->pdsbMarkFuzz->onRestore(); + ui->leFormatSpec->onRestore(); + ui->cbEndCap->onRestore(); ui->sbMaxTiles->onRestore(); ui->sbMaxPat->onRestore(); - ui->cbShowLoose->onRestore(); - ui->leFormatSpec->onRestore(); } /** diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotation.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotation.ui index 0e80c03b65..105a38b0a7 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotation.ui +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawAnnotation.ui @@ -6,7 +6,7 @@ 0 0 - 415 + 440 447 diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawColors.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawColors.ui index 7f277a0650..c7bacb5a0b 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawColors.ui +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawColors.ui @@ -6,8 +6,8 @@ 0 0 - 460 - 343 + 440 + 342 diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensions.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensions.ui index e6ba0f06d2..f578208f0e 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensions.ui +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensions.ui @@ -6,8 +6,8 @@ 0 0 - 460 - 403 + 440 + 336 @@ -46,19 +46,6 @@ - - - - - 0 - 0 - - - - Standard and Style - - - @@ -104,30 +91,101 @@ - - + + + + + true + + + + Arrow Style + + + + + + + + 0 + 0 + + + + Standard and Style + + + + + 0 0 + + + 0 + 22 + + + + Arrowhead style + + + -1 + + + ArrowStyle + + + Mod/TechDraw/Dimensions + + + + + true + + Arrow Size + + + + + + + + 0 + 0 + + + + + 0 + 22 + + + + + 12 + + - Use system setting for number of decimals + Character used to indicate diameter dimensions - Use Global Decimals + ⌀ - - true + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - UseGlobalDecimals + DiameterSymbol /Mod/TechDraw/Dimensions @@ -162,10 +220,40 @@ - - + + - Alternate Decimals + Diameter Symbol + + + + + + + + 0 + 0 + + + + + true + + + + Use system setting for number of decimals + + + Use Global Decimals + + + true + + + UseGlobalDecimals + + + /Mod/TechDraw/Dimensions @@ -203,18 +291,6 @@ - - - - - true - - - - Font Size - - - @@ -259,102 +335,7 @@ - - - - Diameter Symbol - - - - - - - - 0 - 0 - - - - - 0 - 22 - - - - - 12 - - - - Character used to indicate diameter dimensions - - - ⌀ - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - DiameterSymbol - - - /Mod/TechDraw/Dimensions - - - - - - - - true - - - - Arrow Style - - - - - - - - 0 - 0 - - - - - 0 - 22 - - - - Arrowhead style - - - -1 - - - ArrowStyle - - - Mod/TechDraw/Dimensions - - - - - - - - true - - - - Arrow Size - - - - + @@ -385,151 +366,91 @@ - - - - - - - - - - 0 - 0 - - - - - 0 - 85 - - - - - 16777215 - 500 - - - - - 0 - 500 - - - - Conventions - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - + + - Projection Group Angle + Alternate Decimals - - - - - 0 - 0 - + + + + + true + - - - 184 - 0 - - - - Use first- or third-angle multiview projection convention - - - ProjectionAngle - - - Mod/TechDraw/General - - - - First - - - - - Third - - - - - Page - - - - - - - Hidden Line Style + Font Size - - - - - 0 - 0 - - + + 0 0 + + + 0 + 0 + + + + + false + + + + Tolerance Text Scale + + + + + + + + 0 + 0 + + + + + 174 + 0 + + + + + 0 + 0 + + - Style for hidden lines + Tolerance text scale +Multiplier of 'Font Size' + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 0.100000000000000 + + + 0.800000000000000 - HiddenLine + TolSizeAdjust - Mod/TechDraw/General + Mod/TechDraw/Dimensions - - - Continuous - - - - :/icons/continuous-line.svg:/icons/continuous-line.svg - - - - - Dashed - - - - :/icons/dash-line.svg:/icons/dash-line.svg - - @@ -594,6 +515,11 @@ QLineEdit
Gui/PrefWidgets.h
+ + Gui::PrefDoubleSpinBox + QDoubleSpinBox +
Gui/PrefWidgets.h
+ Gui::PrefUnitSpinBox Gui::QuantitySpinBox diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensionsImp.cpp b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensionsImp.cpp index cc017f5920..8cc4a5702d 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensionsImp.cpp +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawDimensionsImp.cpp @@ -58,16 +58,15 @@ DlgPrefsTechDrawDimensionsImp::~DlgPrefsTechDrawDimensionsImp() void DlgPrefsTechDrawDimensionsImp::saveSettings() { + ui->pcbStandardAndStyle->onSave(); ui->cbGlobalDecimals->onSave(); - ui->cbHiddenLineStyle->onSave(); - ui->cbProjAngle->onSave(); ui->cbShowUnits->onSave(); + ui->sbAltDecimals->onSave(); + ui->plsb_FontSize->onSave(); + ui->pdsbToleranceScale->onSave(); ui->leDiameter->onSave(); ui->pcbArrow->onSave(); - ui->pcbStandardAndStyle->onSave(); ui->plsb_ArrowSize->onSave(); - ui->plsb_FontSize->onSave(); - ui->sbAltDecimals->onSave(); } void DlgPrefsTechDrawDimensionsImp::loadSettings() @@ -81,16 +80,15 @@ void DlgPrefsTechDrawDimensionsImp::loadSettings() // plsb_ArrowSize->setValue(arrowDefault); ui->plsb_ArrowSize->setValue(fontDefault); + ui->pcbStandardAndStyle->onRestore(); ui->cbGlobalDecimals->onRestore(); - ui->cbHiddenLineStyle->onRestore(); - ui->cbProjAngle->onRestore(); ui->cbShowUnits->onRestore(); + ui->sbAltDecimals->onRestore(); + ui->plsb_FontSize->onRestore(); + ui->pdsbToleranceScale->onRestore(); ui->leDiameter->onRestore(); ui->pcbArrow->onRestore(); - ui->pcbStandardAndStyle->onRestore(); ui->plsb_ArrowSize->onRestore(); - ui->plsb_FontSize->onRestore(); - ui->sbAltDecimals->onRestore(); DrawGuiUtil::loadArrowBox(ui->pcbArrow); ui->pcbArrow->setCurrentIndex(prefArrowStyle()); diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneral.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneral.ui index a0d599e440..d28d7872bf 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneral.ui +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneral.ui @@ -6,8 +6,8 @@ 0 0 - 496 - 495 + 440 + 581 @@ -229,8 +229,12 @@ for ProjectionGroups 0 + + * this font is also used for dimensions + Changes have no effect on existing dimensions. + - Label Font + Label Font* @@ -326,6 +330,153 @@ for ProjectionGroups + + + + + 0 + 0 + + + + + 0 + 85 + + + + + 16777215 + 500 + + + + + 0 + 500 + + + + Conventions + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Projection Group Angle + + + + + + + + 0 + 0 + + + + + 184 + 0 + + + + Use first- or third-angle multiview projection convention + + + ProjectionAngle + + + Mod/TechDraw/General + + + + First + + + + + Third + + + + + Page + + + + + + + + Hidden Line Style + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + Style for hidden lines + + + HiddenLine + + + Mod/TechDraw/General + + + + Continuous + + + + :/icons/continuous-line.svg:/icons/continuous-line.svg + + + + + Dashed + + + + :/icons/dash-line.svg:/icons/dash-line.svg + + + + + + + + + @@ -689,6 +840,11 @@ for ProjectionGroups QCheckBox
Gui/PrefWidgets.h
+ + Gui::PrefComboBox + QComboBox +
Gui/PrefWidgets.h
+ Gui::PrefLineEdit QLineEdit @@ -705,6 +861,8 @@ for ProjectionGroups
Gui/PrefWidgets.h
 - + + + diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneralImp.cpp b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneralImp.cpp index 534b9ec4cb..3eeb076a0c 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneralImp.cpp +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawGeneralImp.cpp @@ -53,54 +53,59 @@ DlgPrefsTechDrawGeneralImp::~DlgPrefsTechDrawGeneralImp() void DlgPrefsTechDrawGeneralImp::saveSettings() { - ui->pfc_DefTemp->onSave(); - ui->pfc_DefDir->onSave(); - ui->pfc_HatchFile->onSave(); - ui->pfc_FilePattern->onSave(); - ui->pfc_LineGroup->onSave(); - ui->pfc_Welding->onSave(); - ui->le_NamePattern->onSave(); - - ui->pfb_LabelFont->onSave(); - ui->plsb_LabelSize->onSave(); - ui->cb_Global->onSave(); ui->cb_Override->onSave(); ui->cb_PageUpdate->onSave(); ui->cb_AutoDist->onSave(); + + ui->pfb_LabelFont->onSave(); + ui->plsb_LabelSize->onSave(); + + ui->cbProjAngle->onSave(); + ui->cbHiddenLineStyle->onSave(); + + ui->pfc_DefTemp->onSave(); + ui->pfc_DefDir->onSave(); + ui->pfc_HatchFile->onSave(); + ui->pfc_LineGroup->onSave(); + ui->pfc_Welding->onSave(); + ui->pfc_FilePattern->onSave(); + ui->le_NamePattern->onSave(); } void DlgPrefsTechDrawGeneralImp::loadSettings() { -// double labelDefault = 8.0; - double labelDefault = Preferences::labelFontSizeMM(); - ui->plsb_LabelSize->setValue(labelDefault); - QFont prefFont(Preferences::labelFontQString()); - ui->pfb_LabelFont->setCurrentFont(prefFont); -// ui->pfb_LabelFont->setCurrentText(Preferences::labelFontQString()); //only works in Qt5 - - ui->pfc_DefTemp->setFileName(Preferences::defaultTemplate()); - ui->pfc_DefDir->setFileName(Preferences::defaultTemplateDir()); - ui->pfc_HatchFile->setFileName(QString::fromStdString(DrawHatch::prefSvgHatch())); - ui->pfc_FilePattern->setFileName(QString::fromStdString(DrawGeomHatch::prefGeomHatchFile())); - ui->pfc_Welding->setFileName(PreferencesGui::weldingDirectory()); - ui->pfc_LineGroup->setFileName(QString::fromUtf8(Preferences::lineGroupFile().c_str())); - - ui->pfc_DefTemp->onRestore(); - ui->pfc_DefDir->onRestore(); - ui->pfc_HatchFile->onRestore(); - ui->pfc_FilePattern->onRestore(); - ui->pfc_LineGroup->onRestore(); - ui->pfc_Welding->onRestore(); - ui->le_NamePattern->onRestore(); - - ui->pfb_LabelFont->onRestore(); - ui->plsb_LabelSize->onRestore(); - ui->cb_Global->onRestore(); ui->cb_Override->onRestore(); ui->cb_PageUpdate->onRestore(); ui->cb_AutoDist->onRestore(); + + double labelDefault = Preferences::labelFontSizeMM(); + ui->plsb_LabelSize->setValue(labelDefault); + QFont prefFont(Preferences::labelFontQString()); + ui->pfb_LabelFont->setCurrentFont(prefFont); + // ui->pfb_LabelFont->setCurrentText(Preferences::labelFontQString()); //only works in Qt5 + + ui->pfb_LabelFont->onRestore(); + ui->plsb_LabelSize->onRestore(); + + ui->cbProjAngle->onRestore(); + ui->cbHiddenLineStyle->onRestore(); + + ui->pfc_DefTemp->setFileName(Preferences::defaultTemplate()); + ui->pfc_DefDir->setFileName(Preferences::defaultTemplateDir()); + ui->pfc_HatchFile->setFileName(QString::fromStdString(DrawHatch::prefSvgHatch())); + ui->pfc_LineGroup->setFileName(QString::fromUtf8(Preferences::lineGroupFile().c_str())); + ui->pfc_Welding->setFileName(PreferencesGui::weldingDirectory()); + ui->pfc_FilePattern->setFileName(QString::fromStdString(DrawGeomHatch::prefGeomHatchFile())); + + ui->pfc_DefTemp->onRestore(); + ui->pfc_DefDir->onRestore(); + ui->pfc_HatchFile->onRestore(); + ui->pfc_LineGroup->onRestore(); + ui->pfc_Welding->onRestore(); + ui->pfc_FilePattern->onRestore(); + ui->le_NamePattern->onRestore(); } /** diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawHLR.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawHLR.ui index 18a86e5967..5d5a91f4cf 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawHLR.ui +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawHLR.ui @@ -6,7 +6,7 @@ 0 0 - 441 + 440 307 @@ -49,6 +49,41 @@ + + + + Visible + + + + + + + + 0 + 0 + + + + + 140 + 16777215 + + + + Number of ISO lines per face edge + + + Qt::AlignRight + + + IsoCount + + + Mod/TechDraw/HLR + + + @@ -109,6 +144,88 @@ + + + + + 0 + 0 + + + + + true + + + + Use an approximation to find hidden lines. +Fast, but result is a collection of short straight lines. + + + Use Polygon Approximation + + + UsePolygon + + + Mod/TechDraw/HLR + + + + + + + + 0 + 0 + + + + + true + + + + Show hidden smooth edges + + + Show Smooth Lines + + + SmoothHid + + + Mod/TechDraw/HLR + + + + + + + + 0 + 0 + + + + + true + + + + Show hidden hard and outline edges + + + Show Hard Lines + + + HardHid + + + Mod/TechDraw/HLR + + + @@ -148,8 +265,8 @@ - - + + 0 @@ -162,20 +279,71 @@ - Use an approximation to find hidden lines. -Fast, but result is a collection of short straight lines. + Show hidden seam lines - Use Polygon Approximation + Show Seam Lines - UsePolygon + SeamHid Mod/TechDraw/HLR + + + + + 0 + 0 + + + + + true + + + + Show hidden equal parameterization lines + + + Show UV ISO Lines + + + IsoHid + + + Mod/TechDraw/HLR + + + + + + + Hidden + + + + + + + + 0 + 0 + + + + + true + + + + ISO Count + + + @@ -203,173 +371,31 @@ Fast, but result is a collection of short straight lines. - - - - - 0 - 0 - + + + + Qt::Horizontal - - - true - + + + 40 + 20 + - - Show hidden smooth edges - - - Show Smooth Lines - - - SmoothHid - - - Mod/TechDraw/HLR - - - - - - - - 0 - 0 - - - - - true - - - - Show hidden seam lines - - - Show Seam Lines - - - SeamHid - - - Mod/TechDraw/HLR - - - - - - - - 0 - 0 - - - - - true - - - - Show hidden equal parameterization lines - - - Show UV ISO Lines - - - IsoHid - - - Mod/TechDraw/HLR - - - - - - - Visible - - + - - - Hidden + + + Qt::Horizontal - - - - - - - 0 - 0 - - - - - true - - - - Show hidden hard and outline edges - - - Show Hard Lines - - - HardHid - - - Mod/TechDraw/HLR - - - - - - + - 0 - 0 + 40 + 20 - - - true - - - - ISO Count - - - - - - - - 0 - 0 - - - - - 140 - 16777215 - - - - Number of ISO lines per face edge - - - Qt::AlignRight - - - IsoCount - - - Mod/TechDraw/HLR - - + diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawScale.ui b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawScale.ui index a0479c4f3d..b522f98a91 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawScale.ui +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawScale.ui @@ -7,7 +7,7 @@ 0 0 440 - 447 + 342 @@ -220,164 +220,6 @@ - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 0 - 200 - - - - Selection - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - - 174 - 0 - - - - - 0 - 0 - - - - Selection area around center marks -Each unit is approx. 0.1 mm wide - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 5.000000000000000 - - - MarkFuzz - - - Mod/TechDraw/General - - - - - - - - 0 - 0 - - - - - 174 - 0 - - - - - 0 - 0 - - - - Size of selection area around edges -Each unit is approx. 0.1 mm wide - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 10.000000000000000 - - - EdgeFuzz - - - Mod/TechDraw/General - - - - - - - - 0 - 0 - - - - Mark Fuzz - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - Edge Fuzz - - - - - - - - @@ -398,47 +240,14 @@ Each unit is approx. 0.1 mm wide - - - - - 0 - 0 - - - - - 174 - 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 - + @@ -469,26 +278,18 @@ Each unit is approx. 0.1 mm wide - - + + + + + true + + - Vertex Scale + Center Mark Scale - - - - Qt::Horizontal - - - - 40 - 20 - - - - @@ -512,6 +313,9 @@ Each unit is approx. 0.1 mm wide Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + 0.100000000000000 + 0.500000000000000 @@ -523,6 +327,42 @@ Each unit is approx. 0.1 mm wide + + + + Template Edit Mark + + + + + + + Multiplier for size of welding symbols + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 0.100000000000000 + + + 1.250000000000000 + + + SymbolFactor + + + Mod/TechDraw/Decorations + + + + + + + Welding Symbol Scale + + + @@ -557,74 +397,18 @@ Each unit is approx. 0.1 mm wide - - - - - true - + + + + Qt::Horizontal - - Center Mark Scale - - - - - - + - 0 - 0 + 40 + 20 - - - 0 - 0 - - - - - true - - - - Tolerance Text Scale - - - - - - - Template Edit Mark - - - - - - - Welding Symbol Scale - - - - - - - Multiplier for size of welding symbols - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 1.250000000000000 - - - SymbolFactor - - - Mod/TechDraw/Decorations - - + diff --git a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawScaleImp.cpp b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawScaleImp.cpp index 242e6f9eb2..f90cf1649f 100644 --- a/src/Mod/TechDraw/Gui/DlgPrefsTechDrawScaleImp.cpp +++ b/src/Mod/TechDraw/Gui/DlgPrefsTechDrawScaleImp.cpp @@ -61,32 +61,24 @@ void DlgPrefsTechDrawScaleImp::onScaleTypeChanged(int index) void DlgPrefsTechDrawScaleImp::saveSettings() { - ui->pdsbToleranceScale->onSave(); - ui->pdsbTemplateMark->onSave(); - ui->pdsbVertexScale->onSave(); - ui->pdsbCenterScale->onSave(); ui->pdsbPageScale->onSave(); ui->cbViewScaleType->onSave(); ui->pdsbViewScale->onSave(); - ui->pdsbEdgeFuzz->onSave(); - ui->pdsbMarkFuzz->onSave(); + ui->pdsbVertexScale->onSave(); + ui->pdsbCenterScale->onSave(); ui->pdsbTemplateMark->onSave(); ui->pdsbSymbolScale->onSave(); } void DlgPrefsTechDrawScaleImp::loadSettings() { - double markDefault = 3.0; - ui->pdsbTemplateMark->setValue(markDefault); - ui->pdsbToleranceScale->onRestore(); - ui->pdsbTemplateMark->onRestore(); - ui->pdsbVertexScale->onRestore(); - ui->pdsbCenterScale->onRestore(); ui->pdsbPageScale->onRestore(); ui->cbViewScaleType->onRestore(); ui->pdsbViewScale->onRestore(); - ui->pdsbEdgeFuzz->onRestore(); - ui->pdsbMarkFuzz->onRestore(); + ui->pdsbVertexScale->onRestore(); + ui->pdsbCenterScale->onRestore(); + double markDefault = 3.0; + ui->pdsbTemplateMark->setValue(markDefault); ui->pdsbTemplateMark->onRestore(); ui->pdsbSymbolScale->onRestore(); }