OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-14 01:12:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

Release 2023.06

Browse Source
This commit is contained in:
Magne Sjaastad authored and GitHub committed 2023-06-19 13:48:44 +02:00
1 parent a7108f0a09
commit 77bf792b1a
1390 files changed
+66974 -11511
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/ProjectDataModel/Tools/RiaVariableMapper.cpp
+12 -8
View File
@@ -70,7 +70,8 @@ RiaVariableMapper::RiaVariableMapper( const QString& variableNameValueTable )
//--------------------------------------------------------------------------------------------------
QString RiaVariableMapper::addPathAndGetId( const QString& path )
{
auto computePathId = [this]( const auto& trimmedPath ) -> QString {
auto computePathId = [this]( const auto& trimmedPath ) -> QString
{
QString pathId;
auto pathToIdIt = m_valueToVariableMap.find( trimmedPath );
if ( pathToIdIt != m_valueToVariableMap.end() )
@@ -117,15 +118,18 @@ QString RiaVariableMapper::variableTableAsText() const
const QString pathText = variableToken() + pathIdBaseString();
// Put path variables at the end of the list
std::sort( sortedVariables.begin(), sortedVariables.end(), [pathText]( const auto& lhs, const auto& rhs ) {
bool isLhsPath = lhs.first.startsWith( pathText );
bool isRhsPath = rhs.first.startsWith( pathText );
std::sort( sortedVariables.begin(),
sortedVariables.end(),
[pathText]( const auto& lhs, const auto& rhs )
{
bool isLhsPath = lhs.first.startsWith( pathText );
bool isRhsPath = rhs.first.startsWith( pathText );
if ( isLhsPath && !isRhsPath ) return false;
if ( !isLhsPath && isRhsPath ) return true;
if ( isLhsPath && !isRhsPath ) return false;
if ( !isLhsPath && isRhsPath ) return true;
return lhs.first < rhs.first;
} );
return lhs.first < rhs.first;
} );
QString textTable;
textTable += "\n";