mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-02-01 18:40:12 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

--Bug fixes

Browse Source 
-Change variation spin boxes to only show the precision needed, and also allow scientific notation.
This commit is contained in:
Person 2018-01-28 11:40:34 -08:00
parent cee3ef20d4
commit 4636c1047d
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Builds/MSVC/Installer/Product.wxs
View File

@ -272,7 +272,7 @@
<Fragment> <Fragment>
<ComponentGroup Id="BenchComponents" Directory="INSTALLFOLDERBENCH"> <ComponentGroup Id="BenchComponents" Directory="INSTALLFOLDERBENCH">
<Component Id="EmberBench.ps1" Guid="a0362c11-e54a-4712-b800-0bb7c43d285e"> <Component Id="EmberBench.ps1" Guid="a0362c11-e54a-4712-b800-0bb7c43d285e">
<File Id="EmberBench.ps1" Source="$(var.SolutionDir)..\..\..\Data\Bench\EmberBench.ps1" KeyPath="yes" Checksum="yes" ReadOnly="yes"/> <File Id="EmberBench.ps1" Source="$(var.SolutionDir)..\..\..\Data\Bench\EmberBench.ps1" KeyPath="yes" Checksum="yes" ReadOnly="no"/>
</Component> </Component>
<Component Id="golubaja_rippingfrominside_complexcode.flame" Guid="74fc54d8-eb7f-4e88-b839-c6d0b847d78e"> <Component Id="golubaja_rippingfrominside_complexcode.flame" Guid="74fc54d8-eb7f-4e88-b839-c6d0b847d78e">

9
Source/Fractorium/DoubleSpinBox.cpp
View File

@ -356,7 +356,7 @@ VariationTreeDoubleSpinBox::VariationTreeDoubleSpinBox(QWidget* p, VariationTree
m_WidgetItem = widgetItem; m_WidgetItem = widgetItem;
m_Param = param; m_Param = param;
m_Id = id; m_Id = id;
setDecimals(3); //setDecimals(3);
//PI //PI
auto piAction = new QAction("PI", this); auto piAction = new QAction("PI", this);
connect(piAction, SIGNAL(triggered(bool)), this, SLOT(PiActionTriggered(bool)), Qt::QueuedConnection); connect(piAction, SIGNAL(triggered(bool)), this, SLOT(PiActionTriggered(bool)), Qt::QueuedConnection);
@ -407,6 +407,7 @@ VariationTreeDoubleSpinBox::VariationTreeDoubleSpinBox(QWidget* p, VariationTree
this->addAction(sqrtThreeAction); this->addAction(sqrtThreeAction);
//Need this for it to show up properly. //Need this for it to show up properly.
this->setContextMenuPolicy(Qt::ActionsContextMenu); this->setContextMenuPolicy(Qt::ActionsContextMenu);
lineEdit()->setValidator(new QDoubleValidator(this));
} }
void VariationTreeDoubleSpinBox::PiActionTriggered(bool checked) { setValue(M_PI); } 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::SqrtTwoActionTriggered(bool checked) { setValue(M_SQRT2); }
void VariationTreeDoubleSpinBox::SqrtThreeActionTriggered(bool checked) { setValue(std::sqrt(3.0)); } void VariationTreeDoubleSpinBox::SqrtThreeActionTriggered(bool checked) { setValue(std::sqrt(3.0)); }
QString VariationTreeDoubleSpinBox::textFromValue(double value) const
{
return QWidget::locale().toString(value, 'g', 10);
}
/// <summary> /// <summary>
/// Constructor that sets up the context menu for special numerical values specific to affine spinners. /// Constructor that sets up the context menu for special numerical values specific to affine spinners.
/// </summary> /// </summary>

1
Source/Fractorium/DoubleSpinBox.h
View File

@ -98,6 +98,7 @@ public:
string ParamName() { return m_Param; } string ParamName() { return m_Param; }
eVariationId GetVariationId() { return m_Id; } eVariationId GetVariationId() { return m_Id; }
VariationTreeWidgetItem* WidgetItem() { return m_WidgetItem; } VariationTreeWidgetItem* WidgetItem() { return m_WidgetItem; }
virtual QString textFromValue(double value) const override;
public slots: public slots:
void PiActionTriggered(bool checked = false); void PiActionTriggered(bool checked = false);

2
Source/Fractorium/FractoriumXformsVariations.cpp
View File

@ -122,7 +122,7 @@ void FractoriumEmberController<T>::SetupVariationsTree()
spinBox->DoubleClickZero(1); spinBox->DoubleClickZero(1);
spinBox->DoubleClickNonZero(0); spinBox->DoubleClickNonZero(0);
spinBox->SmallStep(0.001); spinBox->SmallStep(0.001);
spinBox->setDecimals(4); //spinBox->setDecimals(4);
tree->setItemWidget(item, 1, spinBox); tree->setItemWidget(item, 1, spinBox);
m_Fractorium->connect(spinBox, SIGNAL(valueChanged(double)), SLOT(OnVariationSpinBoxValueChanged(double)), Qt::QueuedConnection); m_Fractorium->connect(spinBox, SIGNAL(valueChanged(double)), SLOT(OnVariationSpinBoxValueChanged(double)), Qt::QueuedConnection);