#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

@@ -21,8 +21,8 @@
#include "RiaApplication.h"
#include "RigMainGrid.h"
#include "RigFemResultAddress.h"
#include "RigMainGrid.h"
#include "Rim3dView.h"
#include "RimCase.h"
@@ -51,7 +51,7 @@
#include "cvfMatrix4.h"
#include "cvfScene.h"
CAF_PDM_SOURCE_INIT(RimViewLinker, "ViewLinker");
CAF_PDM_SOURCE_INIT( RimViewLinker, "ViewLinker" );
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -86,35 +86,35 @@ RimViewLinker::~RimViewLinker()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimViewLinker::updateTimeStep(RimGridView* sourceView, int timeStep)
void RimViewLinker::updateTimeStep( RimGridView* sourceView, int timeStep )
{
CVF_ASSERT(sourceView);
CVF_ASSERT( sourceView );
if (!isActive()) return;
if ( !isActive() ) return;
if (masterView() != sourceView)
if ( masterView() != sourceView )
{
RimViewController* sourceViewLink = sourceView->viewController();
CVF_ASSERT(sourceViewLink);
CVF_ASSERT( sourceViewLink );
if (!sourceViewLink->isTimeStepLinked())
if ( !sourceViewLink->isTimeStepLinked() )
{
return;
}
}
if (m_masterView && m_masterView->viewer() && sourceView != m_masterView)
if ( m_masterView && m_masterView->viewer() && sourceView != m_masterView )
{
m_masterView->viewer()->setCurrentFrame(timeStep);
m_masterView->viewer()->setCurrentFrame( timeStep );
}
for (RimViewController* viewLink : m_viewControllers)
for ( RimViewController* viewLink : m_viewControllers )
{
if (!viewLink->isTimeStepLinked()) continue;
if ( !viewLink->isTimeStepLinked() ) continue;
if (viewLink->managedView() && viewLink->managedView() != sourceView && viewLink->managedView()->viewer())
if ( viewLink->managedView() && viewLink->managedView() != sourceView && viewLink->managedView()->viewer() )
{
viewLink->managedView()->viewer()->setCurrentFrame(timeStep);
viewLink->managedView()->viewer()->setCurrentFrame( timeStep );
}
}
}
@@ -125,32 +125,32 @@ void RimViewLinker::updateTimeStep(RimGridView* sourceView, int timeStep)
void RimViewLinker::updateCellResult()
{
Rim3dView* rimView = m_masterView;
RimEclipseView* masterEclipseView = dynamic_cast<RimEclipseView*>(rimView);
if (masterEclipseView && masterEclipseView->cellResult())
RimEclipseView* masterEclipseView = dynamic_cast<RimEclipseView*>( rimView );
if ( masterEclipseView && masterEclipseView->cellResult() )
{
RimEclipseResultDefinition* eclipseCellResultDefinition = masterEclipseView->cellResult();
for (RimViewController* viewLink : m_viewControllers)
for ( RimViewController* viewLink : m_viewControllers )
{
if (viewLink->managedView())
if ( viewLink->managedView() )
{
Rim3dView* managedView = viewLink->managedView();
RimEclipseView* eclipseView = dynamic_cast<RimEclipseView*>(managedView);
if (eclipseView)
RimEclipseView* eclipseView = dynamic_cast<RimEclipseView*>( managedView );
if ( eclipseView )
{
if (viewLink->isResultColorControlled())
if ( viewLink->isResultColorControlled() )
{
eclipseView->cellResult()->simpleCopy(eclipseCellResultDefinition);
eclipseView->cellResult()->simpleCopy( eclipseCellResultDefinition );
eclipseView->cellResult()->loadResult();
if (viewLink->isLegendDefinitionsControlled())
if ( viewLink->isLegendDefinitionsControlled() )
{
eclipseView->cellResult()->legendConfig()->setUiValuesFromLegendConfig(
masterEclipseView->cellResult()->legendConfig());
masterEclipseView->cellResult()->legendConfig() );
eclipseView->cellResult()->legendConfig()->updateLegend();
eclipseView->cellResult()->ternaryLegendConfig()->setUiValuesFromLegendConfig(
masterEclipseView->cellResult()->ternaryLegendConfig());
masterEclipseView->cellResult()->ternaryLegendConfig() );
}
eclipseView->scheduleCreateDisplayModelAndRedraw();
@@ -163,27 +163,27 @@ void RimViewLinker::updateCellResult()
}
}
RimGeoMechView* masterGeoView = dynamic_cast<RimGeoMechView*>(rimView);
if (masterGeoView && masterGeoView->cellResult())
RimGeoMechView* masterGeoView = dynamic_cast<RimGeoMechView*>( rimView );
if ( masterGeoView && masterGeoView->cellResult() )
{
RimGeoMechResultDefinition* geoMechResultDefinition = masterGeoView->cellResult();
for (RimViewController* viewLink : m_viewControllers)
for ( RimViewController* viewLink : m_viewControllers )
{
if (viewLink->managedView())
if ( viewLink->managedView() )
{
Rim3dView* managedView = viewLink->managedView();
RimGeoMechView* geoView = dynamic_cast<RimGeoMechView*>(managedView);
if (geoView)
RimGeoMechView* geoView = dynamic_cast<RimGeoMechView*>( managedView );
if ( geoView )
{
if (viewLink->isResultColorControlled())
if ( viewLink->isResultColorControlled() )
{
geoView->cellResult()->setResultAddress(geoMechResultDefinition->resultAddress());
geoView->cellResult()->setResultAddress( geoMechResultDefinition->resultAddress() );
if (viewLink->isLegendDefinitionsControlled())
if ( viewLink->isLegendDefinitionsControlled() )
{
geoView->cellResult()->legendConfig()->setUiValuesFromLegendConfig(
masterGeoView->cellResult()->legendConfig());
masterGeoView->cellResult()->legendConfig() );
geoView->cellResult()->legendConfig()->updateLegend();
}
@@ -201,11 +201,11 @@ void RimViewLinker::updateCellResult()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimViewLinker::updateRangeFilters(RimCellRangeFilter* changedRangeFilter)
void RimViewLinker::updateRangeFilters( RimCellRangeFilter* changedRangeFilter )
{
for (RimViewController* viewLink : m_viewControllers)
for ( RimViewController* viewLink : m_viewControllers )
{
viewLink->updateRangeFilterOverrides(changedRangeFilter);
viewLink->updateRangeFilterOverrides( changedRangeFilter );
}
}
@@ -214,9 +214,9 @@ void RimViewLinker::updateRangeFilters(RimCellRangeFilter* changedRangeFilter)
//--------------------------------------------------------------------------------------------------
void RimViewLinker::updateOverrides()
{
for (RimViewController* viewLink : m_viewControllers)
for ( RimViewController* viewLink : m_viewControllers )
{
if (viewLink->isActive())
if ( viewLink->isActive() )
{
viewLink->updateOverrides();
}
@@ -232,9 +232,9 @@ void RimViewLinker::updateOverrides()
//--------------------------------------------------------------------------------------------------
void RimViewLinker::removeOverrides()
{
for (const auto& viewController : m_viewControllers)
for ( const auto& viewController : m_viewControllers )
{
if (viewController->managedView())
if ( viewController->managedView() )
{
viewController->removeOverrides();
}
@@ -244,22 +244,22 @@ void RimViewLinker::removeOverrides()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimViewLinker::allViewsForCameraSync(const RimGridView* source, std::vector<RimGridView*>& views) const
void RimViewLinker::allViewsForCameraSync( const RimGridView* source, std::vector<RimGridView*>& views ) const
{
if (!isActive()) return;
if ( !isActive() ) return;
if (source != m_masterView())
if ( source != m_masterView() )
{
views.push_back(m_masterView());
views.push_back( m_masterView() );
}
for (const auto& viewController : m_viewControllers)
for ( const auto& viewController : m_viewControllers )
{
if (viewController->managedView() && source != viewController->managedView())
if ( viewController->managedView() && source != viewController->managedView() )
{
if (viewController->isCameraLinked())
if ( viewController->isCameraLinked() )
{
views.push_back(viewController->managedView());
views.push_back( viewController->managedView() );
}
}
}
@@ -272,23 +272,23 @@ void RimViewLinker::updateDependentViews()
{
updateOverrides();
updateCellResult();
updateScaleZ(m_masterView, m_masterView->scaleZ());
updateCamera(m_masterView);
updateTimeStep(m_masterView, m_masterView->currentTimeStep());
updateScaleZ( m_masterView, m_masterView->scaleZ() );
updateCamera( m_masterView );
updateTimeStep( m_masterView, m_masterView->currentTimeStep() );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimViewLinker::displayNameForView(RimGridView* view)
QString RimViewLinker::displayNameForView( RimGridView* view )
{
QString displayName = "None";
if (view)
if ( view )
{
RimCase* rimCase = nullptr;
view->firstAncestorOrThisOfType(rimCase);
if (rimCase)
view->firstAncestorOrThisOfType( rimCase );
if ( rimCase )
{
displayName = rimCase->caseUserDescription() + ": " + view->name();
}
@@ -300,15 +300,15 @@ QString RimViewLinker::displayNameForView(RimGridView* view)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimViewLinker::setMasterView(RimGridView* view)
void RimViewLinker::setMasterView( RimGridView* view )
{
RimViewController* previousViewController = view->viewController();
// Remove the view as dependent view
if (previousViewController)
if ( previousViewController )
{
delete previousViewController;
this->m_viewControllers.removeChildObject(nullptr);
this->m_viewControllers.removeChildObject( nullptr );
}
this->removeOverrides();
@@ -329,15 +329,15 @@ RimGridView* RimViewLinker::masterView() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimViewLinker::allViews(std::vector<RimGridView*>& views) const
void RimViewLinker::allViews( std::vector<RimGridView*>& views ) const
{
views.push_back(m_masterView());
views.push_back( m_masterView() );
for (const auto& viewController : m_viewControllers)
for ( const auto& viewController : m_viewControllers )
{
if (viewController->managedView())
if ( viewController->managedView() )
{
views.push_back(viewController->managedView());
views.push_back( viewController->managedView() );
}
}
}
@@ -353,28 +353,28 @@ void RimViewLinker::initAfterRead()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimViewLinker::updateScaleZ(RimGridView* sourceView, double scaleZ)
void RimViewLinker::updateScaleZ( RimGridView* sourceView, double scaleZ )
{
if (!isActive()) return;
if ( !isActive() ) return;
if (masterView() != sourceView)
if ( masterView() != sourceView )
{
RimViewController* sourceViewLink = sourceView->viewController();
CVF_ASSERT(sourceViewLink);
CVF_ASSERT( sourceViewLink );
if (!sourceViewLink->isCameraLinked())
if ( !sourceViewLink->isCameraLinked() )
{
return;
}
}
std::vector<RimGridView*> views;
allViewsForCameraSync(sourceView, views);
allViewsForCameraSync( sourceView, views );
// Make sure scale factors are identical
for (auto& view : views)
for ( auto& view : views )
{
view->setScaleZAndUpdate(scaleZ);
view->setScaleZAndUpdate( scaleZ );
}
}
@@ -384,9 +384,9 @@ void RimViewLinker::updateScaleZ(RimGridView* sourceView, double scaleZ)
bool RimViewLinker::isActive() const
{
RimViewLinkerCollection* viewLinkerCollection = nullptr;
this->firstAncestorOrThisOfType(viewLinkerCollection);
this->firstAncestorOrThisOfType( viewLinkerCollection );
if (!viewLinkerCollection)
if ( !viewLinkerCollection )
{
// This will happen when the all linked views are about to be deleted
// The viewLinker is taken out of the viewLinkerCollection, and no parent can be found
@@ -403,18 +403,18 @@ bool RimViewLinker::isActive() const
void RimViewLinker::updateUiNameAndIcon()
{
caf::QIconProvider iconProvider;
RimViewLinker::findNameAndIconFromView(&m_name.v(), &iconProvider, m_masterView);
setUiIcon(iconProvider);
RimViewLinker::findNameAndIconFromView( &m_name.v(), &iconProvider, m_masterView );
setUiIcon( iconProvider );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimViewLinker::scheduleGeometryRegenForDepViews(RivCellSetEnum geometryType)
void RimViewLinker::scheduleGeometryRegenForDepViews( RivCellSetEnum geometryType )
{
for (const auto& viewController : m_viewControllers)
for ( const auto& viewController : m_viewControllers )
{
viewController->scheduleGeometryRegenForDepViews(geometryType);
viewController->scheduleGeometryRegenForDepViews( geometryType );
}
}
@@ -423,7 +423,7 @@ void RimViewLinker::scheduleGeometryRegenForDepViews(RivCellSetEnum geometryType
//--------------------------------------------------------------------------------------------------
void RimViewLinker::scheduleCreateDisplayModelAndRedrawForDependentViews()
{
for (const auto& viewController : m_viewControllers)
for ( const auto& viewController : m_viewControllers )
{
viewController->scheduleCreateDisplayModelAndRedrawForDependentView();
}
@@ -432,28 +432,28 @@ void RimViewLinker::scheduleCreateDisplayModelAndRedrawForDependentViews()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimViewLinker::findNameAndIconFromView(QString* name, caf::QIconProvider* icon, RimGridView* view)
void RimViewLinker::findNameAndIconFromView( QString* name, caf::QIconProvider* icon, RimGridView* view )
{
CVF_ASSERT(name && icon);
CVF_ASSERT( name && icon );
*name = displayNameForView(view);
*name = displayNameForView( view );
if (view)
if ( view )
{
RimCase* rimCase = nullptr;
view->firstAncestorOrThisOfType(rimCase);
view->firstAncestorOrThisOfType( rimCase );
if (dynamic_cast<RimGeoMechCase*>(rimCase))
if ( dynamic_cast<RimGeoMechCase*>( rimCase ) )
{
*icon = caf::QIconProvider(":/GeoMechCase48x48.png");
*icon = caf::QIconProvider( ":/GeoMechCase48x48.png" );
}
else if (dynamic_cast<RimEclipseResultCase*>(rimCase))
else if ( dynamic_cast<RimEclipseResultCase*>( rimCase ) )
{
*icon = caf::QIconProvider(":/Case48x48.png");
*icon = caf::QIconProvider( ":/Case48x48.png" );
}
else if (dynamic_cast<RimEclipseInputCase*>(rimCase))
else if ( dynamic_cast<RimEclipseInputCase*>( rimCase ) )
{
*icon = caf::QIconProvider(":/EclipseInput48x48.png");
*icon = caf::QIconProvider( ":/EclipseInput48x48.png" );
}
}
else
@@ -465,33 +465,33 @@ void RimViewLinker::findNameAndIconFromView(QString* name, caf::QIconProvider* i
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimViewLinker::updateCursorPosition(const RimGridView* sourceView, const cvf::Vec3d& domainCoord)
void RimViewLinker::updateCursorPosition( const RimGridView* sourceView, const cvf::Vec3d& domainCoord )
{
RimViewController* sourceViewLink = sourceView->viewController();
if (sourceViewLink && !sourceViewLink->showCursor())
if ( sourceViewLink && !sourceViewLink->showCursor() )
{
return;
}
std::vector<RimGridView*> viewsToUpdate;
allViewsForCameraSync(sourceView, viewsToUpdate);
allViewsForCameraSync( sourceView, viewsToUpdate );
for (Rim3dView* destinationView : viewsToUpdate)
for ( Rim3dView* destinationView : viewsToUpdate )
{
if (destinationView == sourceView) continue;
if ( destinationView == sourceView ) continue;
if (destinationView != m_masterView)
if ( destinationView != m_masterView )
{
RimViewController* viewLink = destinationView->viewController();
if (!viewLink) continue;
if ( !viewLink ) continue;
if (!viewLink->showCursor()) continue;
if ( !viewLink->showCursor() ) continue;
}
RiuViewer* destinationViewer = destinationView->viewer();
if (destinationViewer)
if ( destinationViewer )
{
destinationViewer->setCursorPosition(domainCoord);
destinationViewer->setCursorPosition( domainCoord );
}
}
}
@@ -499,48 +499,48 @@ void RimViewLinker::updateCursorPosition(const RimGridView* sourceView, const cv
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimViewLinker::updateCamera(RimGridView* sourceView)
void RimViewLinker::updateCamera( RimGridView* sourceView )
{
if (!sourceView->viewer()) return;
if ( !sourceView->viewer() ) return;
if (!isActive()) return;
if ( !isActive() ) return;
RimViewController* viewLink = sourceView->viewController();
if (viewLink)
if ( viewLink )
{
if (!viewLink->isCameraLinked())
if ( !viewLink->isCameraLinked() )
{
return;
}
}
std::vector<RimGridView*> viewsToUpdate;
allViewsForCameraSync(sourceView, viewsToUpdate);
allViewsForCameraSync( sourceView, viewsToUpdate );
RimViewManipulator::applySourceViewCameraOnDestinationViews(sourceView, viewsToUpdate);
RimViewManipulator::applySourceViewCameraOnDestinationViews( sourceView, viewsToUpdate );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimViewLinker::addDependentView(RimGridView* view)
void RimViewLinker::addDependentView( RimGridView* view )
{
CVF_ASSERT(view && view != m_masterView);
CVF_ASSERT( view && view != m_masterView );
RimViewController* viewContr = new RimViewController;
this->m_viewControllers.push_back(viewContr);
this->m_viewControllers.push_back( viewContr );
viewContr->setManagedView(view);
viewContr->setManagedView( view );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimViewLinker::isFirstViewDependentOnSecondView(const RimGridView* firstView, const RimGridView* secondView) const
bool RimViewLinker::isFirstViewDependentOnSecondView( const RimGridView* firstView, const RimGridView* secondView ) const
{
for (const RimViewController* controller : m_viewControllers())
for ( const RimViewController* controller : m_viewControllers() )
{
if (controller->masterView() == secondView && controller->managedView() == firstView)
if ( controller->masterView() == secondView && controller->managedView() == firstView )
{
return true;
}
@@ -551,11 +551,11 @@ bool RimViewLinker::isFirstViewDependentOnSecondView(const RimGridView* firstVie
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimViewLinker::addViewControllers(caf::PdmUiTreeOrdering& uiTreeOrdering) const
void RimViewLinker::addViewControllers( caf::PdmUiTreeOrdering& uiTreeOrdering ) const
{
for (const auto& viewController : m_viewControllers)
for ( const auto& viewController : m_viewControllers )
{
uiTreeOrdering.add(viewController);
uiTreeOrdering.add( viewController );
}
}
@@ -564,7 +564,7 @@ void RimViewLinker::addViewControllers(caf::PdmUiTreeOrdering& uiTreeOrdering) c
//--------------------------------------------------------------------------------------------------
void RimViewLinker::applyRangeFilterCollectionByUserChoice()
{
for (const auto& viewController : m_viewControllers)
for ( const auto& viewController : m_viewControllers )
{
viewController->applyRangeFilterCollectionByUserChoice();
}
@@ -573,18 +573,18 @@ void RimViewLinker::applyRangeFilterCollectionByUserChoice()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimViewLinker::updatePropertyFilters(RimPropertyFilter* changedPropertyFilter)
void RimViewLinker::updatePropertyFilters( RimPropertyFilter* changedPropertyFilter )
{
for (RimViewController* viewLink : m_viewControllers)
for ( RimViewController* viewLink : m_viewControllers )
{
viewLink->updatePropertyFilterOverrides(changedPropertyFilter);
viewLink->updatePropertyFilterOverrides( changedPropertyFilter );
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimViewLinker::removeViewController(RimViewController* viewController)
void RimViewLinker::removeViewController( RimViewController* viewController )
{
m_viewControllers.removeChildObject(viewController);
m_viewControllers.removeChildObject( viewController );
}