suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ fixes #0002118: Units conversion when using Imperial decimal (in/lb)

Browse Source
This commit is contained in:
wmayer 2015-09-15 11:30:11 +02:00
parent 29f827a575
commit 2a569497b9
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Mod/Sketcher/Gui/SketchOrientationDialog.cpp
View File

@ -41,7 +41,6 @@ SketchOrientationDialog::SketchOrientationDialog(void)
: QDialog(Gui::getMainWindow()), ui(new Ui_SketchOrientationDialog)
{
ui->setupUi(this);
ui->Offset_doubleSpinBox->setDecimals(Base::UnitsApi::getDecimals());
onPreview();
connect(ui->Reverse_checkBox, SIGNAL(clicked(bool)), this, SLOT(onPreview()));
@ -57,7 +56,7 @@ SketchOrientationDialog::~SketchOrientationDialog()
void SketchOrientationDialog::accept()
{
double offset = ui->Offset_doubleSpinBox->value();
double offset = ui->Offset_doubleSpinBox->value().getValue();
bool reverse = ui->Reverse_checkBox->isChecked();
if (ui->XY_radioButton->isChecked()) {
if (reverse) {

13
src/Mod/Sketcher/Gui/SketchOrientationDialog.ui
View File

@ -83,9 +83,9 @@
</widget>
</item>
<item>
<widget class="QDoubleSpinBox" name="Offset_doubleSpinBox">
<property name="decimals">
<number>2</number>
<widget class="Gui::QuantitySpinBox" name="Offset_doubleSpinBox">
<property name="unit" stdset="0">
<string notr="true">mm</string>
</property>
<property name="minimum">
<double>-999999999.000000000000000</double>
@ -112,6 +112,13 @@
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>Gui::QuantitySpinBox</class>
<extends>QWidget</extends>
<header>Gui/QuantitySpinBox.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections>
<connection>