OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#2414 AppFwk : Do not overwrite field double value with UI text representation

Browse Source
This commit is contained in:
Magne Sjaastad 2018-01-26 14:30:06 +01:00
parent 906484bd46
commit 4b00c6e144
2 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Fwk/AppFwk/cafUserInterface/cafPdmUiDoubleSliderEditor.cpp
View File

@ -106,6 +106,7 @@ void PdmUiDoubleSliderEditor::configureAndUpdateUi(const QString& uiConfigName)
uiObject->editorAttribute(field()->fieldHandle(), uiConfigName, &m_attributes); uiObject->editorAttribute(field()->fieldHandle(), uiConfigName, &m_attributes);
} }
double doubleValue = field()->uiValue().toDouble();
QString textValue = field()->uiValue().toString(); QString textValue = field()->uiValue().toString();
m_slider->blockSignals(true); m_slider->blockSignals(true);
@ -118,7 +119,7 @@ void PdmUiDoubleSliderEditor::configureAndUpdateUi(const QString& uiConfigName)
m_lineEdit->setValidator(pdmValidator); m_lineEdit->setValidator(pdmValidator);
m_lineEdit->setText(textValue); m_lineEdit->setText(textValue);
updateSliderPosition(); updateSliderPosition(doubleValue);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -161,9 +162,12 @@ QWidget* PdmUiDoubleSliderEditor::createLabelWidget(QWidget * parent)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void PdmUiDoubleSliderEditor::slotEditingFinished() void PdmUiDoubleSliderEditor::slotEditingFinished()
{ {
updateSliderPosition(); QString textValue = m_lineEdit->text();
writeValueToField(); double doubleVal = textValue.toDouble();
doubleVal = qBound(m_attributes.m_minimum, doubleVal, m_attributes.m_maximum);
writeValueToField(doubleVal);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -172,22 +176,16 @@ void PdmUiDoubleSliderEditor::slotEditingFinished()
void PdmUiDoubleSliderEditor::slotSliderValueChanged(int value) void PdmUiDoubleSliderEditor::slotSliderValueChanged(int value)
{ {
double newDoubleValue = convertFromSliderValue(value); double newDoubleValue = convertFromSliderValue(value);
m_lineEdit->setText(QString::number(newDoubleValue));
writeValueToField(); writeValueToField(newDoubleValue);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void PdmUiDoubleSliderEditor::updateSliderPosition() void PdmUiDoubleSliderEditor::updateSliderPosition(double value)
{ {
QString textValue = m_lineEdit->text(); int newSliderPosition = convertToSliderValue(value);
bool convertOk = false;
double newSliderValue = textValue.toDouble(&convertOk);
int newSliderPosition = convertToSliderValue(newSliderValue);
if (m_slider->value() != newSliderPosition) if (m_slider->value() != newSliderPosition)
{ {
m_slider->blockSignals(true); m_slider->blockSignals(true);
@ -199,11 +197,9 @@ void PdmUiDoubleSliderEditor::updateSliderPosition()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void PdmUiDoubleSliderEditor::writeValueToField() void PdmUiDoubleSliderEditor::writeValueToField(double value)
{ {
QString textValue = m_lineEdit->text(); QVariant v = value;
QVariant v;
v = textValue;
this->setValueToField(v); this->setValueToField(v);
} }

4
Fwk/AppFwk/cafUserInterface/cafPdmUiDoubleSliderEditor.h
View File

@ -92,8 +92,8 @@ protected slots:
void slotSliderValueChanged(int value); void slotSliderValueChanged(int value);
private: private:
void updateSliderPosition(); void updateSliderPosition(double value);
void writeValueToField(); void writeValueToField(double value);
int convertToSliderValue(double value); int convertToSliderValue(double value);
double convertFromSliderValue(int sliderValue); double convertFromSliderValue(int sliderValue);