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

AppFwk: Color editor no longer calls setValueToField on update GUI

Browse Source
This commit is contained in:
Jacob Støren 2018-06-29 13:38:02 +02:00
parent bcf7938427
commit 1c8d5bf942
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Fwk/AppFwk/cafUserInterface/cafPdmUiColorEditor.cpp
View File

@ -83,7 +83,7 @@ void PdmUiColorEditor::configureAndUpdateUi(const QString& uiConfigName)
} }
QColor col = uiField()->uiValue().value<QColor>(); QColor col = uiField()->uiValue().value<QColor>();
setColor(col); setColorOnWidget(col);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -137,14 +137,17 @@ void PdmUiColorEditor::colorSelectionClicked()
QColor newColor = QColorDialog::getColor(m_color, m_colorPixmapLabel, "Select color", flags); QColor newColor = QColorDialog::getColor(m_color, m_colorPixmapLabel, "Select color", flags);
if (newColor.isValid() && newColor != m_color) if (newColor.isValid() && newColor != m_color)
{ {
setColor(newColor); setColorOnWidget(newColor);
QVariant v;
v = newColor;
this->setValueToField(v);
} }
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void PdmUiColorEditor::setColor(const QColor& color) void PdmUiColorEditor::setColorOnWidget(const QColor& color)
{ {
if (m_color != color) if (m_color != color)
{ {
@ -172,9 +175,6 @@ void PdmUiColorEditor::setColor(const QColor& color)
m_colorTextLabel->setText(colorString); m_colorTextLabel->setText(colorString);
} }
QVariant v;
v = m_color;
this->setValueToField(v);
} }

2
Fwk/AppFwk/cafUserInterface/cafPdmUiColorEditor.h
View File

@ -86,7 +86,7 @@ protected slots:
void colorSelectionClicked(); void colorSelectionClicked();
private: private:
void setColor(const QColor& c); void setColorOnWidget(const QColor& c);
private: private:
QPointer<QLabel> m_label; QPointer<QLabel> m_label;