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

#8592: Temporary workaround for crash seen on RHEL7

Browse Source
This commit is contained in:
Magne Sjaastad 2022-03-02 15:27:55 +01:00
parent 423dde93fc
commit 7a2a297648
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafInternalPdmUiFieldCapability.inl
View File

@ -14,7 +14,7 @@ namespace caf
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
template <typename FieldType> template <typename FieldType>
void caf::PdmFieldUiCap<FieldType>::setValueFromUiEditor( const QVariant& uiValue ) void PdmFieldUiCap<FieldType>::setValueFromUiEditor( const QVariant& uiValue )
{ {
QVariant oldUiBasedQVariant = toUiBasedQVariant(); QVariant oldUiBasedQVariant = toUiBasedQVariant();
@ -123,7 +123,7 @@ void caf::PdmFieldUiCap<FieldType>::setValueFromUiEditor( const QVariant& uiValu
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
template <typename FieldType> template <typename FieldType>
QVariant caf::PdmFieldUiCap<FieldType>::uiValue() const QVariant PdmFieldUiCap<FieldType>::uiValue() const
{ {
if ( m_optionEntryCache.size() ) if ( m_optionEntryCache.size() )
{ {
@ -137,7 +137,9 @@ QVariant caf::PdmFieldUiCap<FieldType>::uiValue() const
if ( isAutoAddingOptionFromValue() && if ( isAutoAddingOptionFromValue() &&
indexesToFoundOptions.size() != static_cast<size_t>( uiBasedQVariant.toList().size() ) ) indexesToFoundOptions.size() != static_cast<size_t>( uiBasedQVariant.toList().size() ) )
{ {
CAF_ASSERT( false ); // Did not find all the field values among the options available, even though we return QVariant();
// CAF_ASSERT( false ); // Did not find all the field values among the options available, even though we
// should. Reasons might be: // should. Reasons might be:
// The "core" data type in the field is probably not supported by // The "core" data type in the field is probably not supported by
// QVariant::toString() You forgot to call valueOptions() before the call to // QVariant::toString() You forgot to call valueOptions() before the call to
@ -181,7 +183,7 @@ QVariant caf::PdmFieldUiCap<FieldType>::uiValue() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
template <typename FieldType> template <typename FieldType>
QList<PdmOptionItemInfo> caf::PdmFieldUiCap<FieldType>::valueOptions( bool* useOptionsOnly ) const QList<PdmOptionItemInfo> PdmFieldUiCap<FieldType>::valueOptions( bool* useOptionsOnly ) const
{ {
m_optionEntryCache.clear(); m_optionEntryCache.clear();
@ -261,7 +263,7 @@ QList<PdmOptionItemInfo> caf::PdmFieldUiCap<FieldType>::valueOptions( bool* useO
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
template <typename FieldType> template <typename FieldType>
QVariant caf::PdmFieldUiCap<FieldType>::toUiBasedQVariant() const QVariant PdmFieldUiCap<FieldType>::toUiBasedQVariant() const
{ {
return PdmUiFieldSpecialization<typename FieldType::FieldDataType>::convert( m_field->value() ); return PdmUiFieldSpecialization<typename FieldType::FieldDataType>::convert( m_field->value() );
} }
@ -270,7 +272,7 @@ QVariant caf::PdmFieldUiCap<FieldType>::toUiBasedQVariant() const
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
template <typename FieldType> template <typename FieldType>
bool caf::PdmFieldUiCap<FieldType>::isQVariantDataEqual( const QVariant& oldUiBasedQVariant, bool PdmFieldUiCap<FieldType>::isQVariantDataEqual( const QVariant& oldUiBasedQVariant,
const QVariant& newUiBasedQVariant ) const const QVariant& newUiBasedQVariant ) const
{ {
return PdmValueFieldSpecialization<typename FieldType::FieldDataType>::isEqual( oldUiBasedQVariant, newUiBasedQVariant ); return PdmValueFieldSpecialization<typename FieldType::FieldDataType>::isEqual( oldUiBasedQVariant, newUiBasedQVariant );