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

Moved UnitSystem from RiaEclipseUnitTools to RiaDefines. (#7225)

Browse Source 
* Moved UnitSystem from RiaEclipseUnitTools to RiaDefines.
- Renamed UnitSystem to EclipseUnitSystem
- Replaced header includes and removed obsolete includes of RiaEclipseUnitTools.h
* Moved  result name functions into separate file.
* Minor cleanup

Co-authored-by: rubenthoms <rubenthoms@users.noreply.github.com>
Co-authored-by: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Co-authored-by: magnesj <magnesj@users.noreply.github.com>
This commit is contained in:
rubenthoms
2021-01-21 12:58:46 +01:00
committed by GitHub
parent c4c6eb75f2
commit bc81437435
176 changed files with 1470 additions and 1365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationLibCode/ProjectDataModel/RimCellEdgeColors.cpp
View File

@@ -215,7 +215,7 @@ QList<caf::PdmOptionItemInfo> RimCellEdgeColors::calculateValueOptions( const ca
int i;
for ( i = 0; i < varList.size(); ++i )
{
if ( RiaDefines::isPerCellFaceResult( varList[i] ) ) continue;
if ( RiaResultNames::isPerCellFaceResult( varList[i] ) ) continue;
size_t cubeFaceIdx;
for ( cubeFaceIdx = 0; cubeFaceIdx < EdgeFaceEnum::size(); ++cubeFaceIdx )
@@ -258,7 +258,7 @@ QList<caf::PdmOptionItemInfo> RimCellEdgeColors::calculateValueOptions( const ca
options.push_back( caf::PdmOptionItemInfo( optionUiName, QVariant( it->first ) ) );
}
options.push_front( caf::PdmOptionItemInfo( RiaDefines::undefinedResultName(), "" ) );
options.push_front( caf::PdmOptionItemInfo( RiaResultNames::undefinedResultName(), "" ) );
if ( useOptionsOnly ) *useOptionsOnly = true;
@@ -317,7 +317,7 @@ QStringList RimCellEdgeColors::findResultVariableNames()
int i;
for ( i = 0; i < varList.size(); ++i )
{
if ( RiaDefines::isPerCellFaceResult( varList[i] ) ) continue;
if ( RiaResultNames::isPerCellFaceResult( varList[i] ) ) continue;
if ( varList[i].startsWith( m_resultVariable ) )
{