#4683 clang-format on all files in ApplicationCode

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

View File

@@ -2,17 +2,17 @@
//
// Copyright (C) 2015- Statoil ASA
// Copyright (C) 2015- Ceetron Solutions AS
//
//
// ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
//
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
@@ -32,38 +32,42 @@
#include "Rim2dIntersectionView.h"
#include "Rim2dIntersectionViewCollection.h"
#include "RimIntersection.h"
#include "RimGridView.h"
#include "RimIntersection.h"
CAF_PDM_XML_ABSTRACT_SOURCE_INIT(RimCase, "RimCase");
CAF_PDM_XML_ABSTRACT_SOURCE_INIT( RimCase, "RimCase" );
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
RimCase::RimCase() : m_isInActiveDestruction(false)
RimCase::RimCase()
: m_isInActiveDestruction( false )
{
RICF_InitField(&caseUserDescription, "CaseUserDescription", QString(), "Case Name", "", "" ,"");
RICF_InitField( &caseUserDescription, "CaseUserDescription", QString(), "Case Name", "", "", "" );
RICF_InitField(&caseId, "CaseId", -1, "Case ID", "", "" ,"");
caseId.uiCapability()->setUiReadOnly(true);
caseId.capability<RicfFieldHandle>()->setIOWriteable(false);
RICF_InitField( &caseId, "CaseId", -1, "Case ID", "", "", "" );
caseId.uiCapability()->setUiReadOnly( true );
caseId.capability<RicfFieldHandle>()->setIOWriteable( false );
CAF_PDM_InitFieldNoDefault(&activeFormationNames, "DefaultFormationNames", "Formation Names File", "", "", "");
CAF_PDM_InitFieldNoDefault( &activeFormationNames, "DefaultFormationNames", "Formation Names File", "", "", "" );
CAF_PDM_InitFieldNoDefault(&m_timeStepFilter, "TimeStepFilter", "Time Step Filter", "", "", "");
m_timeStepFilter.uiCapability()->setUiHidden(true);
m_timeStepFilter.uiCapability()->setUiTreeChildrenHidden(true);
CAF_PDM_InitFieldNoDefault( &m_timeStepFilter, "TimeStepFilter", "Time Step Filter", "", "", "" );
m_timeStepFilter.uiCapability()->setUiHidden( true );
m_timeStepFilter.uiCapability()->setUiTreeChildrenHidden( true );
m_timeStepFilter = new RimTimeStepFilter;
CAF_PDM_InitFieldNoDefault(&m_2dIntersectionViewCollection, "IntersectionViewCollection", "2D Intersection Views", ":/CrossSections16x16.png", "", "");
m_2dIntersectionViewCollection.uiCapability()->setUiTreeHidden(true);
CAF_PDM_InitFieldNoDefault( &m_2dIntersectionViewCollection,
"IntersectionViewCollection",
"2D Intersection Views",
":/CrossSections16x16.png",
"",
"" );
m_2dIntersectionViewCollection.uiCapability()->setUiTreeHidden( true );
m_2dIntersectionViewCollection = new Rim2dIntersectionViewCollection();
}
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
RimCase::~RimCase()
{
@@ -71,40 +75,40 @@ RimCase::~RimCase()
}
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
std::vector<Rim3dView*> RimCase::views() const
{
if (m_isInActiveDestruction) return std::vector<Rim3dView*>();
if ( m_isInActiveDestruction ) return std::vector<Rim3dView*>();
std::vector<Rim3dView*> allViews = this->allSpecialViews();
std::vector<Rim3dView*> allViews = this->allSpecialViews();
std::vector<Rim2dIntersectionView*> isectViews = m_2dIntersectionViewCollection->views();
for (auto view: isectViews)
for ( auto view : isectViews )
{
allViews.push_back(view);
allViews.push_back( view );
}
return allViews;
}
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
std::vector<RimGridView*> RimCase::gridViews() const
{
std::vector<RimGridView*> grViews;
for (Rim3dView* const view : views())
for ( Rim3dView* const view : views() )
{
RimGridView* grView = dynamic_cast<RimGridView*>(view);
if (grView) grViews.push_back(grView);
RimGridView* grView = dynamic_cast<RimGridView*>( view );
if ( grView ) grViews.push_back( grView );
}
return grViews;
}
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
cvf::Vec3d RimCase::displayModelOffset() const
{
@@ -112,30 +116,30 @@ cvf::Vec3d RimCase::displayModelOffset() const
}
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
void RimCase::setFormationNames(RimFormationNames* formationNames)
void RimCase::setFormationNames( RimFormationNames* formationNames )
{
activeFormationNames = formationNames;
}
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
size_t RimCase::uiToNativeTimeStepIndex(size_t uiTimeStepIndex)
size_t RimCase::uiToNativeTimeStepIndex( size_t uiTimeStepIndex )
{
std::vector<size_t> nativeTimeIndices = m_timeStepFilter->filteredTimeSteps();
if (nativeTimeIndices.size() > 0)
if ( nativeTimeIndices.size() > 0 )
{
return nativeTimeIndices.at(uiTimeStepIndex);
return nativeTimeIndices.at( uiTimeStepIndex );
}
return uiTimeStepIndex;
}
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
Rim2dIntersectionViewCollection* RimCase::intersectionViewCollection()
{
@@ -143,24 +147,28 @@ Rim2dIntersectionViewCollection* RimCase::intersectionViewCollection()
}
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo> RimCase::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly)
QList<caf::PdmOptionItemInfo> RimCase::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly )
{
QList<caf::PdmOptionItemInfo> options;
if(fieldNeedingOptions == &activeFormationNames)
if ( fieldNeedingOptions == &activeFormationNames )
{
RimProject* proj = RiaApplication::instance()->project();
if (proj && proj->activeOilField() && proj->activeOilField()->formationNamesCollection())
if ( proj && proj->activeOilField() && proj->activeOilField()->formationNamesCollection() )
{
for(RimFormationNames* fnames : proj->activeOilField()->formationNamesCollection()->formationNamesList())
for ( RimFormationNames* fnames : proj->activeOilField()->formationNamesCollection()->formationNamesList() )
{
options.push_back(caf::PdmOptionItemInfo(fnames->fileNameWoPath(), fnames, false, fnames->uiCapability()->uiIconProvider()));
options.push_back( caf::PdmOptionItemInfo( fnames->fileNameWoPath(),
fnames,
false,
fnames->uiCapability()->uiIconProvider() ) );
}
}
options.push_front(caf::PdmOptionItemInfo("None", nullptr));
options.push_front( caf::PdmOptionItemInfo( "None", nullptr ) );
}
return options;