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

Ignore Non-True Value Strings

Browse Source 
This avoids reassigning "valueString" and also, incidentally,
fixes the build using Visual Studio 2017.
This commit is contained in:
Bård Skaflestad 2022-10-18 12:48:54 +02:00 committed by Kristian Bendiksen
parent c46bd16064
commit b1fa8b45ab
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiFieldHandle.cpp
View File

@ -212,27 +212,21 @@ std::vector<std::pair<QString, QString>> PdmUiFieldHandle::attributes() const
//--------------------------------------------------------------------------------------------------
void PdmUiFieldHandle::setAttributes( const std::vector<std::pair<QString, QString>>& attributes )
{
for ( auto [key, valueString] : attributes )
for ( const auto& [key, valueString] : attributes )
{
valueString = valueString.toUpper();
if ( valueString.toUpper() != "TRUE" ) continue;
if ( key == "autoValueEnabled" )
{
if ( valueString == "TRUE" )
{
// If notifyFieldChanged equals true, recursion will happen. Triggered by
// RimSummaryPlot::copyMatchingAxisPropertiesFromOther(), where data from one object is copied and set
// in another object using readObjectFromXmlString()
bool notifyFieldChanged = false;
enableAutoValue( true, notifyFieldChanged );
}
// If notifyFieldChanged equals true, recursion will happen. Triggered by
// RimSummaryPlot::copyMatchingAxisPropertiesFromOther(), where data from one object is copied and set
// in another object using readObjectFromXmlString()
bool notifyFieldChanged = false;
enableAutoValue( true, notifyFieldChanged );
}
else if ( key == "autoValueSupported" )
{
if ( valueString == "TRUE" )
{
enableAutoValueSupport( true );
}
enableAutoValueSupport( true );
}
}
}