From d2cbd6817fe6ca4ff139652dc7d82ad49405e8e4 Mon Sep 17 00:00:00 2001 From: wmayer Date: Tue, 22 Jul 2014 10:39:44 +0200 Subject: [PATCH] + fixes 0001563: Add units to Linear Pattern in PartDesign --- .../Gui/TaskLinearPatternParameters.cpp | 6 ++++-- .../Gui/TaskLinearPatternParameters.ui | 16 ++++++++++------ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp index 5d60d724d..f9e801bf3 100644 --- a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp @@ -129,9 +129,11 @@ void TaskLinearPatternParameters::setupUI() ui->comboDirection->setEnabled(true); ui->checkReverse->setEnabled(true); + ui->spinLength->blockSignals(true); ui->spinLength->setEnabled(true); + ui->spinLength->setUnit(Base::Unit::Length); + ui->spinLength->blockSignals(false); ui->spinOccurrences->setEnabled(true); - ui->spinLength->setDecimals(Base::UnitsApi::getDecimals()); updateUI(); } @@ -370,7 +372,7 @@ const bool TaskLinearPatternParameters::getReverse(void) const const double TaskLinearPatternParameters::getLength(void) const { - return ui->spinLength->value(); + return ui->spinLength->value().getValue(); } const unsigned TaskLinearPatternParameters::getOccurrences(void) const diff --git a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.ui b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.ui index 913e46eeb..35b31c4e8 100644 --- a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.ui +++ b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.ui @@ -75,12 +75,9 @@ - - - 3 - - - 999999.000000000000000 + + + mm 100.000000000000000 @@ -146,6 +143,13 @@ + + + Gui::QuantitySpinBox + QWidget +
Gui/QuantitySpinBox.h
+
+