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

4
ApplicationLibCode/ProjectDataModel/Summary/RimCalculatedSummaryCurveReader.cpp
View File

@@ -106,7 +106,7 @@ RimSummaryCalculation*
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiaEclipseUnitTools::UnitSystem RifCalculatedSummaryCurveReader::unitSystem() const
RiaDefines::EclipseUnitSystem RifCalculatedSummaryCurveReader::unitSystem() const
{
return RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN;
return RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN;
}

2
ApplicationLibCode/ProjectDataModel/Summary/RimCalculatedSummaryCurveReader.h
View File

@@ -41,7 +41,7 @@ public:
void buildMetaData();
RiaEclipseUnitTools::UnitSystem unitSystem() const override;
RiaDefines::EclipseUnitSystem unitSystem() const override;
private:
RimSummaryCalculation* findCalculationByName( const RifEclipseSummaryAddress& resultAddress ) const;

3
ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp
View File

@@ -21,6 +21,7 @@
#include "RiaColorTools.h"
#include "RiaGuiApplication.h"
#include "RiaPreferences.h"
#include "RiaResultNames.h"
#include "RiaStatisticsTools.h"
#include "RiaSummaryCurveAnalyzer.h"
#include "RiaSummaryCurveDefinition.h"
@@ -1282,7 +1283,7 @@ void RimEnsembleCurveSet::appendOptionItemsForSummaryAddresses( QList<caf::PdmOp
options->push_back( caf::PdmOptionItemInfo( s, QVariant::fromValue( addr ) ) );
}
options->push_front( caf::PdmOptionItemInfo( RiaDefines::undefinedResultName(),
options->push_front( caf::PdmOptionItemInfo( RiaResultNames::undefinedResultName(),
QVariant::fromValue( RifEclipseSummaryAddress() ) ) );
}

4
ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleStatisticsCase.cpp
View File

@@ -203,13 +203,13 @@ void RimEnsembleStatisticsCase::calculate( const std::vector<RimSummaryCase*> su
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiaEclipseUnitTools::UnitSystem RimEnsembleStatisticsCase::unitSystem() const
RiaDefines::EclipseUnitSystem RimEnsembleStatisticsCase::unitSystem() const
{
if ( m_curveSet )
{
return m_curveSet->summaryCaseCollection()->unitSystem();
}
return RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN;
return RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN;
}
//--------------------------------------------------------------------------------------------------

4
ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleStatisticsCase.h
View File

@@ -18,7 +18,7 @@
#pragma once
#include "RiaEclipseUnitTools.h"
#include "RiaDefines.h"
#include "RifEclipseSummaryAddress.h"
#include "RimSummaryCase.h"
@@ -54,7 +54,7 @@ public:
const RimEnsembleCurveSet* curveSet() const;
void calculate( const std::vector<RimSummaryCase*>& sumCases, bool includeIncompleteCurves );
RiaEclipseUnitTools::UnitSystem unitSystem() const;
RiaDefines::EclipseUnitSystem unitSystem() const;
private:
void calculate( const std::vector<RimSummaryCase*> sumCases,

4
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCase.cpp
View File

@@ -234,14 +234,14 @@ QString RimSummaryCase::nativeCaseName() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiaEclipseUnitTools::UnitSystemType RimSummaryCase::unitsSystem()
caf::AppEnum<RiaDefines::EclipseUnitSystem> RimSummaryCase::unitsSystem()
{
RifSummaryReaderInterface* reader = summaryReader();
if ( reader )
{
return reader->unitSystem();
}
return RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN;
return RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN;
}
//--------------------------------------------------------------------------------------------------

4
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCase.h
View File

@@ -17,7 +17,7 @@
/////////////////////////////////////////////////////////////////////////////////
#pragma once
#include "RiaEclipseUnitTools.h"
#include "RiaDefines.h"
#include "RigCaseRealizationParameters.h"
#include "RimCaseDisplayNameTools.h"
@@ -57,7 +57,7 @@ public:
void setCaseId( int caseId );
int caseId() const;
RiaEclipseUnitTools::UnitSystemType unitsSystem();
caf::AppEnum<RiaDefines::EclipseUnitSystem> unitsSystem();
void setDisplayNameOption( RimCaseDisplayNameTools::DisplayName displayNameOption );
void updateAutoShortName();

4
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseCollection.cpp
View File

@@ -961,11 +961,11 @@ bool RimSummaryCaseCollection::operator<( const RimSummaryCaseCollection& rhs )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiaEclipseUnitTools::UnitSystem RimSummaryCaseCollection::unitSystem() const
RiaDefines::EclipseUnitSystem RimSummaryCaseCollection::unitSystem() const
{
if ( m_cases.empty() )
{
return RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN;
return RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN;
}
return m_cases[0]->unitsSystem();
}

4
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseCollection.h
View File

@@ -18,7 +18,7 @@
#pragma once
#include "RiaEclipseUnitTools.h"
#include "RiaDefines.h"
#include "RifEclipseRftAddress.h"
#include "RifEclipseSummaryAddress.h"
#include "RifReaderEnsembleStatisticsRft.h"
@@ -144,7 +144,7 @@ public:
static bool validateEnsembleCases( const std::vector<RimSummaryCase*> cases );
bool operator<( const RimSummaryCaseCollection& rhs ) const;
RiaEclipseUnitTools::UnitSystem unitSystem() const;
RiaDefines::EclipseUnitSystem unitSystem() const;
private:
EnsembleParameter createEnsembleParameter( const QString& paramName ) const;

2
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurve.cpp
View File

@@ -817,7 +817,7 @@ void RimSummaryCurve::appendOptionItemsForSummaryAddresses( QList<caf::PdmOption
}
}
options->push_front( caf::PdmOptionItemInfo( RiaDefines::undefinedResultName(),
options->push_front( caf::PdmOptionItemInfo( RiaResultNames::undefinedResultName(),
QVariant::fromValue( RifEclipseSummaryAddress() ) ) );
}
}