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

238
ApplicationCode/ProjectDataModel/RimGridCollection.cpp
View File

@@ -28,33 +28,33 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void removeGridInfo(const QString& gridName, std::vector<RimGridInfo*>& collection)
void removeGridInfo( const QString& gridName, std::vector<RimGridInfo*>& collection )
{
for (size_t i = 0; i < collection.size(); i++)
for ( size_t i = 0; i < collection.size(); i++ )
{
if (collection[i]->name() == gridName)
if ( collection[i]->name() == gridName )
{
collection.erase(collection.begin() + i);
collection.erase( collection.begin() + i );
return;
}
}
}
CAF_PDM_SOURCE_INIT(RimGridInfo, "GridInfo");
CAF_PDM_SOURCE_INIT( RimGridInfo, "GridInfo" );
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimGridInfo::RimGridInfo()
{
CAF_PDM_InitObject("GridInfo", ":/draw_style_meshlines_24x24.png", "", "");
CAF_PDM_InitObject( "GridInfo", ":/draw_style_meshlines_24x24.png", "", "" );
CAF_PDM_InitField(&m_isActive, "IsActive", true, "Show Grid Cells", "", "", "");
CAF_PDM_InitField(&m_gridName, "GridName", QString(), "Grid Name", "", "", "");
m_gridName.uiCapability()->setUiReadOnly(true);
CAF_PDM_InitField( &m_isActive, "IsActive", true, "Show Grid Cells", "", "", "" );
CAF_PDM_InitField( &m_gridName, "GridName", QString(), "Grid Name", "", "", "" );
m_gridName.uiCapability()->setUiReadOnly( true );
CAF_PDM_InitField(&m_eclipseGridIndex, "GridIndex", 0, "Grid Index", "", "", "");
m_eclipseGridIndex.uiCapability()->setUiReadOnly(true);
CAF_PDM_InitField( &m_eclipseGridIndex, "GridIndex", 0, "Grid Index", "", "", "" );
m_eclipseGridIndex.uiCapability()->setUiReadOnly( true );
}
//--------------------------------------------------------------------------------------------------
@@ -68,16 +68,16 @@ caf::PdmFieldHandle* RimGridInfo::objectToggleField()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimGridInfo::setName(const QString& name)
void RimGridInfo::setName( const QString& name )
{
m_gridName = name;
setUiName(name);
setUiName( name );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimGridInfo::setEclipseGridIndex(int index)
void RimGridInfo::setEclipseGridIndex( int index )
{
m_eclipseGridIndex = index;
}
@@ -85,7 +85,7 @@ void RimGridInfo::setEclipseGridIndex(int index)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimGridInfo::setActive(bool active)
void RimGridInfo::setActive( bool active )
{
m_isActive = active;
}
@@ -125,10 +125,12 @@ caf::PdmFieldHandle* RimGridInfo::userDescriptionField()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimGridInfo::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
void RimGridInfo::fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue )
{
RimGridView* rimView = nullptr;
this->firstAncestorOrThisOfType(rimView);
this->firstAncestorOrThisOfType( rimView );
rimView->scheduleCreateDisplayModelAndRedraw();
}
@@ -136,29 +138,29 @@ void RimGridInfo::fieldChangedByUi(const caf::PdmFieldHandle* changedField, cons
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimGridInfo::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
void RimGridInfo::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
{
uiOrdering.add(&m_gridName);
uiOrdering.add(&m_eclipseGridIndex);
uiOrdering.add( &m_gridName );
uiOrdering.add( &m_eclipseGridIndex );
uiOrdering.skipRemainingFields();
}
CAF_PDM_SOURCE_INIT(RimGridInfoCollection, "GridInfoCollection");
CAF_PDM_SOURCE_INIT( RimGridInfoCollection, "GridInfoCollection" );
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimGridInfoCollection::RimGridInfoCollection()
{
CAF_PDM_InitObject("GridInfoCollection", ":/draw_style_meshlines_24x24.png", "", "");
CAF_PDM_InitObject( "GridInfoCollection", ":/draw_style_meshlines_24x24.png", "", "" );
CAF_PDM_InitField(&m_isActive, "IsActive", true, "Show Grid Cells", "", "", "");
m_isActive.uiCapability()->setUiHidden(true);
CAF_PDM_InitField( &m_isActive, "IsActive", true, "Show Grid Cells", "", "", "" );
m_isActive.uiCapability()->setUiHidden( true );
CAF_PDM_InitFieldNoDefault(&m_gridInfos, "GridInfos", "Grid Infos", "", "", "");
CAF_PDM_InitFieldNoDefault( &m_gridInfos, "GridInfos", "Grid Infos", "", "", "" );
m_gridInfos.uiCapability()->setUiTreeHidden(true);
m_gridInfos.uiCapability()->setUiTreeHidden( true );
}
//--------------------------------------------------------------------------------------------------
@@ -172,10 +174,9 @@ bool RimGridInfoCollection::isActive() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimGridInfoCollection::addGridInfo(RimGridInfo* gridInfo)
void RimGridInfoCollection::addGridInfo( RimGridInfo* gridInfo )
{
m_gridInfos.push_back(gridInfo);
m_gridInfos.push_back( gridInfo );
}
//--------------------------------------------------------------------------------------------------
@@ -189,11 +190,11 @@ void RimGridInfoCollection::clear()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimGridInfoCollection::containsGrid(const QString& gridName) const
bool RimGridInfoCollection::containsGrid( const QString& gridName ) const
{
for (auto gridInfo : m_gridInfos)
for ( auto gridInfo : m_gridInfos )
{
if (gridInfo->name() == gridName) return true;
if ( gridInfo->name() == gridName ) return true;
}
return false;
}
@@ -201,14 +202,14 @@ bool RimGridInfoCollection::containsGrid(const QString& gridName) const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimGridInfoCollection::deleteGridInfo(const QString& gridName)
void RimGridInfoCollection::deleteGridInfo( const QString& gridName )
{
for (size_t i = 0; i < m_gridInfos.size(); i++)
for ( size_t i = 0; i < m_gridInfos.size(); i++ )
{
auto gridInfo = m_gridInfos[i];
if (gridInfo->name() == gridName)
if ( gridInfo->name() == gridName )
{
m_gridInfos.erase(i);
m_gridInfos.erase( i );
delete gridInfo;
break;
}
@@ -234,44 +235,44 @@ caf::PdmFieldHandle* RimGridInfoCollection::objectToggleField()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimGridInfoCollection::fieldChangedByUi(const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue)
void RimGridInfoCollection::fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue )
{
RimGridView* rimView = nullptr;
this->firstAncestorOrThisOfType(rimView);
this->firstAncestorOrThisOfType( rimView );
rimView->scheduleCreateDisplayModelAndRedraw();
}
CAF_PDM_SOURCE_INIT(RimGridCollection, "GridCollection");
CAF_PDM_SOURCE_INIT( RimGridCollection, "GridCollection" );
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimGridCollection::RimGridCollection()
{
CAF_PDM_InitObject("Grids", ":/draw_style_meshlines_24x24.png", "", "");
CAF_PDM_InitObject( "Grids", ":/draw_style_meshlines_24x24.png", "", "" );
CAF_PDM_InitField(&m_isActive, "IsActive", true, "Show Grid Cells", "", "", "");
m_isActive.uiCapability()->setUiHidden(true);
CAF_PDM_InitField( &m_isActive, "IsActive", true, "Show Grid Cells", "", "", "" );
m_isActive.uiCapability()->setUiHidden( true );
CAF_PDM_InitFieldNoDefault(&m_mainGrid, "MainGrid", "Main Grid", "", "", "");
CAF_PDM_InitFieldNoDefault( &m_mainGrid, "MainGrid", "Main Grid", "", "", "" );
m_mainGrid = new RimGridInfo();
m_mainGrid->setUiName("Main Grid");
m_mainGrid->uiCapability()->setUiTreeHidden(true);
m_mainGrid->setUiIconFromResourceString(":/MainGrid16x16.png");
m_mainGrid->setUiName( "Main Grid" );
m_mainGrid->uiCapability()->setUiTreeHidden( true );
m_mainGrid->setUiIconFromResourceString( ":/MainGrid16x16.png" );
CAF_PDM_InitFieldNoDefault(&m_persistentLgrs, "PersistentLgrs", "Persistent LGRs", "", "", "");
CAF_PDM_InitFieldNoDefault( &m_persistentLgrs, "PersistentLgrs", "Persistent LGRs", "", "", "" );
m_persistentLgrs = new RimGridInfoCollection();
m_persistentLgrs->setUiName(persistentGridUiName());
m_persistentLgrs->setUiIconFromResourceString(":/LGR16x16.png");
m_persistentLgrs->setUiName( persistentGridUiName() );
m_persistentLgrs->setUiIconFromResourceString( ":/LGR16x16.png" );
CAF_PDM_InitFieldNoDefault(&m_temporaryLgrs, "TemporaryLgrs", "Temporary LGRs", "", "", "");
CAF_PDM_InitFieldNoDefault( &m_temporaryLgrs, "TemporaryLgrs", "Temporary LGRs", "", "", "" );
m_temporaryLgrs.xmlCapability()->disableIO();
m_temporaryLgrs = new RimGridInfoCollection();
m_temporaryLgrs->setUiName(temporaryGridUiName());
m_temporaryLgrs->setUiIconFromResourceString(":/TempLGR16x16.png");
m_temporaryLgrs->setUiName( temporaryGridUiName() );
m_temporaryLgrs->setUiIconFromResourceString( ":/TempLGR16x16.png" );
}
//--------------------------------------------------------------------------------------------------
@@ -302,31 +303,31 @@ std::vector<size_t> RimGridCollection::indicesToVisibleGrids() const
{
std::vector<size_t> gridIndices;
if (!isActive()) return gridIndices;
if ( !isActive() ) return gridIndices;
if (m_mainGrid()->isActive())
if ( m_mainGrid()->isActive() )
{
gridIndices.push_back(m_mainGrid->eclipseGridIndex());
gridIndices.push_back( m_mainGrid->eclipseGridIndex() );
}
if (m_persistentLgrs()->isActive())
if ( m_persistentLgrs()->isActive() )
{
for (const auto& gridInfo : m_persistentLgrs->gridInfos())
for ( const auto& gridInfo : m_persistentLgrs->gridInfos() )
{
if (gridInfo->isActive())
if ( gridInfo->isActive() )
{
gridIndices.push_back(gridInfo->eclipseGridIndex());
gridIndices.push_back( gridInfo->eclipseGridIndex() );
}
}
}
if (m_temporaryLgrs()->isActive())
if ( m_temporaryLgrs()->isActive() )
{
for (const auto& gridInfo : m_temporaryLgrs->gridInfos())
for ( const auto& gridInfo : m_temporaryLgrs->gridInfos() )
{
if (gridInfo->isActive())
if ( gridInfo->isActive() )
{
gridIndices.push_back(gridInfo->eclipseGridIndex());
gridIndices.push_back( gridInfo->eclipseGridIndex() );
}
}
}
@@ -337,7 +338,7 @@ std::vector<size_t> RimGridCollection::indicesToVisibleGrids() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimGridCollection::setActive(bool active)
void RimGridCollection::setActive( bool active )
{
m_isActive = active;
}
@@ -364,63 +365,63 @@ caf::PdmFieldHandle* RimGridCollection::objectToggleField()
void RimGridCollection::syncFromMainEclipseGrid()
{
auto mainGrid = this->mainEclipseGrid();
if (mainGrid)
if ( mainGrid )
{
m_mainGrid->setName("Main Grid");
m_mainGrid->setEclipseGridIndex(0);
m_mainGrid->setName( "Main Grid" );
m_mainGrid->setEclipseGridIndex( 0 );
auto allTemporaryGrids = m_temporaryLgrs->gridInfos();
auto allPersistentGrids = m_persistentLgrs->gridInfos();
size_t gridCount = mainGrid->gridCount();
for (size_t i = 1; i < gridCount; i++)
for ( size_t i = 1; i < gridCount; i++ )
{
auto grid = mainGrid->gridByIndex(i);
QString gridName = QString::fromStdString(grid->gridName());
auto grid = mainGrid->gridByIndex( i );
QString gridName = QString::fromStdString( grid->gridName() );
size_t gridIndex = grid->gridIndex();
if (grid->isTempGrid())
if ( grid->isTempGrid() )
{
if (m_temporaryLgrs->containsGrid(gridName))
if ( m_temporaryLgrs->containsGrid( gridName ) )
{
removeGridInfo(gridName, allTemporaryGrids);
removeGridInfo( gridName, allTemporaryGrids );
}
else
{
auto gridInfo = new RimGridInfo();
gridInfo->setName(gridName);
gridInfo->setEclipseGridIndex((int)gridIndex);
gridInfo->setUiIconFromResourceString(":/TempLGR16x16.png");
m_temporaryLgrs->addGridInfo(gridInfo);
gridInfo->setName( gridName );
gridInfo->setEclipseGridIndex( (int)gridIndex );
gridInfo->setUiIconFromResourceString( ":/TempLGR16x16.png" );
m_temporaryLgrs->addGridInfo( gridInfo );
}
}
else
{
if (m_persistentLgrs->containsGrid(gridName))
if ( m_persistentLgrs->containsGrid( gridName ) )
{
removeGridInfo(gridName, allPersistentGrids);
removeGridInfo( gridName, allPersistentGrids );
}
else
{
auto gridInfo = new RimGridInfo();
gridInfo->setName(gridName);
gridInfo->setEclipseGridIndex((int)gridIndex);
gridInfo->setUiIconFromResourceString(":/LGR16x16.png");
m_persistentLgrs->addGridInfo(gridInfo);
gridInfo->setName( gridName );
gridInfo->setEclipseGridIndex( (int)gridIndex );
gridInfo->setUiIconFromResourceString( ":/LGR16x16.png" );
m_persistentLgrs->addGridInfo( gridInfo );
}
}
}
for (const auto& grid : allPersistentGrids)
for ( const auto& grid : allPersistentGrids )
{
auto gridName = grid->name();
m_persistentLgrs->deleteGridInfo(gridName);
m_persistentLgrs->deleteGridInfo( gridName );
}
for (const auto& grid : allTemporaryGrids)
for ( const auto& grid : allTemporaryGrids )
{
auto gridName = grid->name();
m_temporaryLgrs->deleteGridInfo(gridName);
m_temporaryLgrs->deleteGridInfo( gridName );
}
}
updateConnectedEditors();
@@ -429,31 +430,31 @@ void RimGridCollection::syncFromMainEclipseGrid()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimGridCollection::setMainGridActive(bool active)
void RimGridCollection::setMainGridActive( bool active )
{
m_mainGrid()->setActive(active);
m_mainGrid()->setActive( active );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimGridCollection::fieldChangedByUi(const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue)
void RimGridCollection::fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue )
{
if (changedField == &m_isActive)
if ( changedField == &m_isActive )
{
RimGridView* rimView = nullptr;
this->firstAncestorOrThisOfType(rimView);
CVF_ASSERT(rimView);
this->firstAncestorOrThisOfType( rimView );
CVF_ASSERT( rimView );
if (rimView) rimView->showGridCells(m_isActive);
if ( rimView ) rimView->showGridCells( m_isActive );
updateUiIconFromState(m_isActive);
updateUiIconFromState( m_isActive );
}
RimGridView* rimView = nullptr;
this->firstAncestorOrThisOfType(rimView);
this->firstAncestorOrThisOfType( rimView );
rimView->scheduleCreateDisplayModelAndRedraw();
}
@@ -463,27 +464,27 @@ void RimGridCollection::fieldChangedByUi(const caf::PdmFieldHandle* changedField
//--------------------------------------------------------------------------------------------------
void RimGridCollection::initAfterRead()
{
updateUiIconFromState(m_isActive);
updateUiIconFromState( m_isActive );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimGridCollection::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/)
void RimGridCollection::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/ )
{
if (mainEclipseGrid())
if ( mainEclipseGrid() )
{
uiTreeOrdering.add(m_mainGrid());
if (hasPersistentLgrs())
uiTreeOrdering.add( m_mainGrid() );
if ( hasPersistentLgrs() )
{
uiTreeOrdering.add(m_persistentLgrs());
uiTreeOrdering.add( m_persistentLgrs() );
}
if (hasTemporaryLgrs())
if ( hasTemporaryLgrs() )
{
uiTreeOrdering.add(m_temporaryLgrs());
uiTreeOrdering.add( m_temporaryLgrs() );
}
}
uiTreeOrdering.skipRemainingChildren(true);
uiTreeOrdering.skipRemainingChildren( true );
}
//--------------------------------------------------------------------------------------------------
@@ -492,7 +493,7 @@ void RimGridCollection::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrder
const RigMainGrid* RimGridCollection::mainEclipseGrid() const
{
RimEclipseCase* eclipseCase;
firstAncestorOrThisOfType(eclipseCase);
firstAncestorOrThisOfType( eclipseCase );
return eclipseCase ? eclipseCase->mainGrid() : nullptr;
}
@@ -502,12 +503,12 @@ const RigMainGrid* RimGridCollection::mainEclipseGrid() const
bool RimGridCollection::hasPersistentLgrs() const
{
auto mainGrid = this->mainEclipseGrid();
if (!mainGrid) return false;
if ( !mainGrid ) return false;
for (size_t i = 1; i < mainGrid->gridCount(); i++)
for ( size_t i = 1; i < mainGrid->gridCount(); i++ )
{
const auto grid = mainGrid->gridByIndex(i);
if (!grid->isTempGrid()) return true;
const auto grid = mainGrid->gridByIndex( i );
if ( !grid->isTempGrid() ) return true;
}
return false;
}
@@ -518,13 +519,12 @@ bool RimGridCollection::hasPersistentLgrs() const
bool RimGridCollection::hasTemporaryLgrs() const
{
auto mainGrid = this->mainEclipseGrid();
if (!mainGrid) return false;
if ( !mainGrid ) return false;
for (size_t i = 1; i < mainGrid->gridCount(); i++)
for ( size_t i = 1; i < mainGrid->gridCount(); i++ )
{
const auto grid = mainGrid->gridByIndex(i);
if (grid->isTempGrid()) return true;
const auto grid = mainGrid->gridByIndex( i );
if ( grid->isTempGrid() ) return true;
}
return false;
}