diff --git a/Builds/MSVC/Installer/Product.wxs b/Builds/MSVC/Installer/Product.wxs index e105753..321f4dd 100644 --- a/Builds/MSVC/Installer/Product.wxs +++ b/Builds/MSVC/Installer/Product.wxs @@ -272,7 +272,7 @@ - + diff --git a/Source/Fractorium/DoubleSpinBox.cpp b/Source/Fractorium/DoubleSpinBox.cpp index 94d7ba2..66e9393 100644 --- a/Source/Fractorium/DoubleSpinBox.cpp +++ b/Source/Fractorium/DoubleSpinBox.cpp @@ -356,7 +356,7 @@ VariationTreeDoubleSpinBox::VariationTreeDoubleSpinBox(QWidget* p, VariationTree m_WidgetItem = widgetItem; m_Param = param; m_Id = id; - setDecimals(3); + //setDecimals(3); //PI auto piAction = new QAction("PI", this); connect(piAction, SIGNAL(triggered(bool)), this, SLOT(PiActionTriggered(bool)), Qt::QueuedConnection); @@ -407,6 +407,7 @@ VariationTreeDoubleSpinBox::VariationTreeDoubleSpinBox(QWidget* p, VariationTree this->addAction(sqrtThreeAction); //Need this for it to show up properly. this->setContextMenuPolicy(Qt::ActionsContextMenu); + lineEdit()->setValidator(new QDoubleValidator(this)); } void VariationTreeDoubleSpinBox::PiActionTriggered(bool checked) { setValue(M_PI); } @@ -422,6 +423,12 @@ void VariationTreeDoubleSpinBox::FourOverPiActionTriggered(bool checked) { setV void VariationTreeDoubleSpinBox::SqrtTwoActionTriggered(bool checked) { setValue(M_SQRT2); } void VariationTreeDoubleSpinBox::SqrtThreeActionTriggered(bool checked) { setValue(std::sqrt(3.0)); } + +QString VariationTreeDoubleSpinBox::textFromValue(double value) const +{ + return QWidget::locale().toString(value, 'g', 10); +} + /// /// Constructor that sets up the context menu for special numerical values specific to affine spinners. /// diff --git a/Source/Fractorium/DoubleSpinBox.h b/Source/Fractorium/DoubleSpinBox.h index 9d756e5..26bc4f8 100644 --- a/Source/Fractorium/DoubleSpinBox.h +++ b/Source/Fractorium/DoubleSpinBox.h @@ -98,6 +98,7 @@ public: string ParamName() { return m_Param; } eVariationId GetVariationId() { return m_Id; } VariationTreeWidgetItem* WidgetItem() { return m_WidgetItem; } + virtual QString textFromValue(double value) const override; public slots: void PiActionTriggered(bool checked = false); diff --git a/Source/Fractorium/FractoriumXformsVariations.cpp b/Source/Fractorium/FractoriumXformsVariations.cpp index 642ce8c..6042a1d 100644 --- a/Source/Fractorium/FractoriumXformsVariations.cpp +++ b/Source/Fractorium/FractoriumXformsVariations.cpp @@ -122,7 +122,7 @@ void FractoriumEmberController::SetupVariationsTree() spinBox->DoubleClickZero(1); spinBox->DoubleClickNonZero(0); spinBox->SmallStep(0.001); - spinBox->setDecimals(4); + //spinBox->setDecimals(4); tree->setItemWidget(item, 1, spinBox); m_Fractorium->connect(spinBox, SIGNAL(valueChanged(double)), SLOT(OnVariationSpinBoxValueChanged(double)), Qt::QueuedConnection);