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

#4683 clang-format on all files in ApplicationCode

Browse Source
This commit is contained in:
Magne Sjaastad
2019-09-06 10:40:57 +02:00
parent 3a317504bb
commit fe9e567825
2092 changed files with 117952 additions and 111846 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
ApplicationCode/ReservoirDataModel/RigWellPathFormations.h
View File

@@ -18,7 +18,6 @@
#pragma once
#include "cvfMath.h"
#include "cvfObject.h"
@@ -65,10 +64,15 @@ public:
};
public:
RigWellPathFormations(const std::vector<RigWellPathFormation>& formations, const QString& filePath, const QString& key);
RigWellPathFormations( const std::vector<RigWellPathFormation>& formations,
const QString& filePath,
const QString& key );
void depthAndFormationNamesUpToLevel(FormationLevel level, std::vector<QString>* names, std::vector<double>* depths,
bool includeFluids, RimWellLogPlot::DepthTypeEnum depthType) const;
void depthAndFormationNamesUpToLevel( FormationLevel level,
std::vector<QString>* names,
std::vector<double>* depths,
bool includeFluids,
RimWellLogPlot::DepthTypeEnum depthType ) const;
std::vector<FormationLevel> formationsLevelsPresent() const;
@@ -80,9 +84,9 @@ public:
private:
struct DepthComp
{
bool operator()(const double& depth1, const double& depth2) const
bool operator()( const double& depth1, const double& depth2 ) const
{
if (cvf::Math::abs(depth1 - depth2) < 0.1)
if ( cvf::Math::abs( depth1 - depth2 ) < 0.1 )
{
return false;
}
@@ -93,7 +97,11 @@ private:
struct LevelAndName
{
LevelAndName() = default;
LevelAndName(RigWellPathFormations::FormationLevel level, QString name) : level(level), name(name) {}
LevelAndName( RigWellPathFormations::FormationLevel level, QString name )
: level( level )
, name( name )
{
}
RigWellPathFormations::FormationLevel level;
QString name;
@@ -106,23 +114,29 @@ private:
};
private:
void evaluateFormations(const std::vector<std::pair<RigWellPathFormation, FormationLevel>>& formations,
const FormationLevel& maxLevel, std::vector<QString>* names, std::vector<double>* depths,
RimWellLogPlot::DepthTypeEnum depthType) const;
void evaluateFormations( const std::vector<std::pair<RigWellPathFormation, FormationLevel>>& formations,
const FormationLevel& maxLevel,
std::vector<QString>* names,
std::vector<double>* depths,
RimWellLogPlot::DepthTypeEnum depthType ) const;
void evaluateFluids(const std::vector<RigWellPathFormation>& fluidFormations, std::vector<QString>* names,
std::vector<double>* depths, RimWellLogPlot::DepthTypeEnum depthType) const;
void evaluateFluids( const std::vector<RigWellPathFormation>& fluidFormations,
std::vector<QString>* names,
std::vector<double>* depths,
RimWellLogPlot::DepthTypeEnum depthType ) const;
void evaluateFormationsForOnePosition(const std::vector<std::pair<RigWellPathFormation, FormationLevel>>& formations,
const FormationLevel& maxLevel, const PickPosition& position,
std::map<double, LevelAndName, DepthComp>* uniqueListMaker,
RimWellLogPlot::DepthTypeEnum depthType) const;
void evaluateFormationsForOnePosition( const std::vector<std::pair<RigWellPathFormation, FormationLevel>>& formations,
const FormationLevel& maxLevel,
const PickPosition& position,
std::map<double, LevelAndName, DepthComp>* uniqueListMaker,
RimWellLogPlot::DepthTypeEnum depthType ) const;
void depthAndFormationNamesWithoutDuplicatesOnDepth(std::vector<QString>* names, std::vector<double>* measuredDepths,
RimWellLogPlot::DepthTypeEnum depthType) const;
void depthAndFormationNamesWithoutDuplicatesOnDepth( std::vector<QString>* names,
std::vector<double>* measuredDepths,
RimWellLogPlot::DepthTypeEnum depthType ) const;
bool isFluid(QString formationName);
FormationLevel detectLevel(QString formationName);
bool isFluid( QString formationName );
FormationLevel detectLevel( QString formationName );
private:
QString m_filePath;