kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Spinboxes: Fix for issue #3278.

Browse Source
This commit is contained in:
Eivind Kvedalen
2017-11-29 16:26:41 +01:00
committed by wmayer
parent 8b3755ee35
commit 1a2e77cf6e
1 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/Gui/SpinBox.cpp
View File

@@ -38,6 +38,7 @@
#include <App/Expression.h>
#include <boost/math/special_functions/round.hpp>
#include "QuantitySpinBox_p.h"
#include <App/PropertyUnits.h>
using namespace Gui;
using namespace App;
@@ -371,7 +372,13 @@ void UIntSpinBox::openFormulaDialog()
{
Q_ASSERT(isBound());
Gui::Dialog::DlgExpressionInput* box = new Gui::Dialog::DlgExpressionInput(getPath(), getExpression(), Unit(), this);
PropertyQuantity * qprop = freecad_dynamic_cast<PropertyQuantity>(getPath().getProperty());
Unit unit;
if (qprop != 0)
unit = qprop->getUnit();
Gui::Dialog::DlgExpressionInput* box = new Gui::Dialog::DlgExpressionInput(getPath(), getExpression(), unit, this);
connect(box, SIGNAL(finished(int)), this, SLOT(finishFormulaDialog()));
box->show();
@@ -546,7 +553,13 @@ void IntSpinBox::openFormulaDialog()
{
Q_ASSERT(isBound());
Gui::Dialog::DlgExpressionInput* box = new Gui::Dialog::DlgExpressionInput(getPath(), getExpression(), Unit(), this);
PropertyQuantity * qprop = freecad_dynamic_cast<PropertyQuantity>(getPath().getProperty());
Unit unit;
if (qprop != 0)
unit = qprop->getUnit();
Gui::Dialog::DlgExpressionInput* box = new Gui::Dialog::DlgExpressionInput(getPath(), getExpression(),unit, this);
connect(box, SIGNAL(finished(int)), this, SLOT(finishFormulaDialog()));
box->show();
@@ -721,7 +734,13 @@ void DoubleSpinBox::openFormulaDialog()
{
Q_ASSERT(isBound());
Gui::Dialog::DlgExpressionInput* box = new Gui::Dialog::DlgExpressionInput(getPath(), getExpression(), Unit(), this);
PropertyQuantity * qprop = freecad_dynamic_cast<PropertyQuantity>(getPath().getProperty());
Unit unit;
if (qprop != 0)
unit = qprop->getUnit();
Gui::Dialog::DlgExpressionInput* box = new Gui::Dialog::DlgExpressionInput(getPath(), getExpression(), unit, this);
connect(box, SIGNAL(finished(int)), this, SLOT(finishFormulaDialog()));
box->show();