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

clang-format : Set AllowAllParametersOfDeclarationOnNextLine to false

Browse Source
This commit is contained in:
Magne Sjaastad
2019-11-04 14:35:41 +01:00
parent 946f9e7f91
commit 7c8cf60dba
83 changed files with 495 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ApplicationCode/ProjectDataModel/Completions/RimStimPlanFractureTemplate.cpp
View File

@@ -924,8 +924,11 @@ bool RimStimPlanFractureTemplate::hasConductivity() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RimStimPlanFractureTemplate::resultValueAtIJ(
const QString& uiResultName, const QString& unitName, size_t timeStepIndex, size_t i, size_t j )
double RimStimPlanFractureTemplate::resultValueAtIJ( const QString& uiResultName,
const QString& unitName,
size_t timeStepIndex,
size_t i,
size_t j )
{
auto values = resultValues( uiResultName, unitName, timeStepIndex );

5
ApplicationCode/ProjectDataModel/PlotTemplates/RimPlotTemplateFolderItem.cpp
View File

@@ -191,8 +191,9 @@ void RimPlotTemplateFolderItem::defineEditorAttribute( const caf::PdmFieldHandle
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimPlotTemplateFolderItem::appendOptionItemsForPlotTemplatesRecursively(
QList<caf::PdmOptionItemInfo>& options, RimPlotTemplateFolderItem* templateFolderItem, int menuLevel )
void RimPlotTemplateFolderItem::appendOptionItemsForPlotTemplatesRecursively( QList<caf::PdmOptionItemInfo>& options,
RimPlotTemplateFolderItem* templateFolderItem,
int menuLevel )
{
{
auto subFolders = templateFolderItem->subFolders();

3
ApplicationCode/ProjectDataModel/RimContourMapProjection.cpp
View File

@@ -1160,7 +1160,8 @@ void RimContourMapProjection::generateContourPolygons()
///
//--------------------------------------------------------------------------------------------------
RimContourMapProjection::ContourPolygons RimContourMapProjection::createContourPolygonsFromLineSegments(
caf::ContourLines::ListOfLineSegments& unorderedLineSegments, double contourValue )
caf::ContourLines::ListOfLineSegments& unorderedLineSegments,
double contourValue )
{
const double areaThreshold = 1.5 * ( m_sampleSpacing * m_sampleSpacing ) /
( sampleSpacingFactor() * sampleSpacingFactor() );

7
ApplicationCode/ProjectDataModel/RimEclipseGeometrySelectionItem.cpp
View File

@@ -67,8 +67,11 @@ void RimEclipseGeometrySelectionItem::setFromSelectionItem( const RiuEclipseSele
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEclipseGeometrySelectionItem::setFromCaseGridAndIJK(
RimEclipseCase* eclipseCase, size_t gridIndex, size_t i, size_t j, size_t k )
void RimEclipseGeometrySelectionItem::setFromCaseGridAndIJK( RimEclipseCase* eclipseCase,
size_t gridIndex,
size_t i,
size_t j,
size_t k )
{
m_eclipseCase = eclipseCase;
m_gridIndex = gridIndex;

4
ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.cpp
View File

@@ -405,7 +405,9 @@ std::map<std::string, std::vector<std::string>> RimGeoMechResultDefinition::getR
///
//--------------------------------------------------------------------------------------------------
void RimGeoMechResultDefinition::getUiAndResultVariableStringList(
QStringList* uiNames, QStringList* variableNames, const std::map<std::string, std::vector<std::string>>& fieldCompNames )
QStringList* uiNames,
QStringList* variableNames,
const std::map<std::string, std::vector<std::string>>& fieldCompNames )
{
CVF_ASSERT( uiNames && variableNames );

8
ApplicationCode/ProjectDataModel/RimGridTimeHistoryCurve.cpp
View File

@@ -154,8 +154,12 @@ void RimGridTimeHistoryCurve::setFromSelectionItem( const RiuSelectionItem* sele
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimGridTimeHistoryCurve::setFromEclipseCellAndResult(
RimEclipseCase* eclCase, size_t gridIdx, size_t i, size_t j, size_t k, const RigEclipseResultAddress& resAddr )
void RimGridTimeHistoryCurve::setFromEclipseCellAndResult( RimEclipseCase* eclCase,
size_t gridIdx,
size_t i,
size_t j,
size_t k,
const RigEclipseResultAddress& resAddr )
{
delete m_geometrySelectionItem();
delete m_eclipseResultDefinition();

10
ApplicationCode/ProjectDataModel/RimGridTimeHistoryCurve.h
View File

@@ -53,9 +53,13 @@ public:
RimGridTimeHistoryCurve();
~RimGridTimeHistoryCurve() override;
void setFromSelectionItem( const RiuSelectionItem* selectionItem );
void setFromEclipseCellAndResult(
RimEclipseCase* eclCase, size_t gridIdx, size_t i, size_t j, size_t k, const RigEclipseResultAddress& resAddr );
void setFromSelectionItem( const RiuSelectionItem* selectionItem );
void setFromEclipseCellAndResult( RimEclipseCase* eclCase,
size_t gridIdx,
size_t i,
size_t j,
size_t k,
const RigEclipseResultAddress& resAddr );
RiaDefines::PlotAxis yAxis() const;
void setYAxis( RiaDefines::PlotAxis plotAxis );

6
ApplicationCode/ProjectDataModel/RimObservedDataCollection.cpp
View File

@@ -165,8 +165,10 @@ RimObservedSummaryData*
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimObservedSummaryData* RimObservedDataCollection::createAndAddCvsObservedSummaryDataFromFile(
const QString& fileName, bool useSavedFieldsValuesInDialog, QString* errorText /*= nullptr*/ )
RimObservedSummaryData*
RimObservedDataCollection::createAndAddCvsObservedSummaryDataFromFile( const QString& fileName,
bool useSavedFieldsValuesInDialog,
QString* errorText /*= nullptr*/ )
{
if ( !fileExists( fileName, errorText ) ) return nullptr;

15
ApplicationCode/ProjectDataModel/RimTernaryLegendConfig.cpp
View File

@@ -214,8 +214,11 @@ void RimTernaryLegendConfig::updateLegend()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimTernaryLegendConfig::setAutomaticRanges(
TernaryArrayIndex ternaryIndex, double globalMin, double globalMax, double localMin, double localMax )
void RimTernaryLegendConfig::setAutomaticRanges( TernaryArrayIndex ternaryIndex,
double globalMin,
double globalMax,
double localMin,
double localMax )
{
double candidateGlobalAutoMin = roundToNumSignificantDigits( globalMin, precision );
double candidateGlobalAutoMax = roundToNumSignificantDigits( globalMax, precision );
@@ -379,8 +382,12 @@ void RimTernaryLegendConfig::defineEditorAttribute( const caf::PdmFieldHandle* f
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimTernaryLegendConfig::ternaryRanges(
double& soilLower, double& soilUpper, double& sgasLower, double& sgasUpper, double& swatLower, double& swatUpper ) const
void RimTernaryLegendConfig::ternaryRanges( double& soilLower,
double& soilUpper,
double& sgasLower,
double& sgasUpper,
double& swatLower,
double& swatUpper ) const
{
if ( rangeMode() == AUTOMATIC_CURRENT_TIMESTEP )
{

7
ApplicationCode/ProjectDataModel/RimTernaryLegendConfig.h
View File

@@ -55,8 +55,11 @@ public:
~RimTernaryLegendConfig() override;
void setUiValuesFromLegendConfig( const RimTernaryLegendConfig* otherLegendConfig );
void setAutomaticRanges(
TernaryArrayIndex ternaryIndex, double globalMin, double globalMax, double localMin, double localMax );
void setAutomaticRanges( TernaryArrayIndex ternaryIndex,
double globalMin,
double globalMax,
double localMin,
double localMax );
void recreateLegend();
bool showLegend() const;

7
ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp
View File

@@ -576,8 +576,11 @@ void RimWellLogExtractionCurve::findAndLoadWbsParametersFromLasFiles( const RimW
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellLogExtractionCurve::setAutoNameComponents(
bool addCaseName, bool addProperty, bool addWellname, bool addTimeStep, bool addDate )
void RimWellLogExtractionCurve::setAutoNameComponents( bool addCaseName,
bool addProperty,
bool addWellname,
bool addTimeStep,
bool addDate )
{
m_addCaseNameToCurveName = addCaseName;
m_addPropertyToCurveName = addProperty;

3
ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp
View File

@@ -376,7 +376,8 @@ RimSummaryCaseCollection* RimSummaryCaseMainCollection::defaultAllocator()
///
//--------------------------------------------------------------------------------------------------
std::vector<RimSummaryCase*> RimSummaryCaseMainCollection::createSummaryCasesFromFileInfos(
const std::vector<RifSummaryCaseFileResultInfo>& summaryHeaderFileInfos, bool showProgress )
const std::vector<RifSummaryCaseFileResultInfo>& summaryHeaderFileInfos,
bool showProgress )
{
RimProject* project = RiaApplication::instance()->project();