From 5fb89f535b867220907e0ba4e41e7c14daa91306 Mon Sep 17 00:00:00 2001 From: Gaute Lindkvist Date: Thu, 6 Feb 2020 16:17:31 +0100 Subject: [PATCH] CAF: Add support for validators in PdmUiDoubleValueEditor --- Fwk/AppFwk/cafUserInterface/cafPdmUiDoubleValueEditor.cpp | 6 ++++++ Fwk/AppFwk/cafUserInterface/cafPdmUiDoubleValueEditor.h | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiDoubleValueEditor.cpp b/Fwk/AppFwk/cafUserInterface/cafPdmUiDoubleValueEditor.cpp index f06af9abc9..ce7aa74a47 100644 --- a/Fwk/AppFwk/cafUserInterface/cafPdmUiDoubleValueEditor.cpp +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiDoubleValueEditor.cpp @@ -78,6 +78,12 @@ void PdmUiDoubleValueEditor::configureAndUpdateUi(const QString& uiConfigName) if (uiObject) { uiObject->editorAttribute(uiField()->fieldHandle(), uiConfigName, &m_attributes); + if (m_attributes.m_validator) + { + m_lineEdit->setValidator(m_attributes.m_validator); + } + + } bool valueOk = false; diff --git a/Fwk/AppFwk/cafUserInterface/cafPdmUiDoubleValueEditor.h b/Fwk/AppFwk/cafUserInterface/cafPdmUiDoubleValueEditor.h index 482f9cc877..d409cc451f 100644 --- a/Fwk/AppFwk/cafUserInterface/cafPdmUiDoubleValueEditor.h +++ b/Fwk/AppFwk/cafUserInterface/cafPdmUiDoubleValueEditor.h @@ -38,6 +38,7 @@ #include "cafPdmUiFieldEditorHandle.h" +#include #include #include #include @@ -66,8 +67,9 @@ public: } public: - int m_decimals; - NumberFormat m_numberFormat; + int m_decimals; + NumberFormat m_numberFormat; + QPointer m_validator; }; //==================================================================================================