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

#4662 Fix erratic behaviour in Tree Selection Editor

Browse Source
This commit is contained in:
Gaute Lindkvist 2019-09-03 14:35:25 +02:00
parent b5964063a3
commit 6742f59cb3
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafInternalPdmFieldTypeSpecializations.h
View File

@ -84,9 +84,10 @@ public:
}
}
/// Operates on scalar content T value of the std::list<T>
static bool isDataElementEqual(const QVariant& variantValue, const QVariant& variantValue2)
{
return PdmValueFieldSpecialization<std::list<T>>::isEqual(variantValue, variantValue2);
return PdmValueFieldSpecialization<T>::isEqual(variantValue, variantValue2);
}
/// Methods to get a list of options for a field, specialized for AppEnum
@ -121,9 +122,10 @@ public:
return PdmValueFieldSpecialization< std::vector<T> >::setFromVariant(variantValue, value);
}
/// Operates on scalar content T value of the std::vector<T>
static bool isDataElementEqual(const QVariant& variantValue, const QVariant& variantValue2)
{
return PdmValueFieldSpecialization<std::vector<T>>::isEqual(variantValue, variantValue2);
return PdmValueFieldSpecialization<T>::isEqual(variantValue, variantValue2);
}
/// Methods to get a list of options for a field, specialized for AppEnum

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

@ -253,7 +253,7 @@ QVariant caf::PdmFieldUiCap<FieldType>::toUiBasedQVariant() const
template < typename FieldType>
bool caf::PdmFieldUiCap<FieldType>::isQVariantDataEqual(const QVariant& oldUiBasedQVariant, const QVariant& newUiBasedQVariant) const
{
return PdmUiFieldSpecialization<typename FieldType::FieldDataType>::isDataElementEqual(oldUiBasedQVariant, newUiBasedQVariant);
return PdmValueFieldSpecialization<typename FieldType::FieldDataType>::isEqual(oldUiBasedQVariant, newUiBasedQVariant);
}