#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) Statoil ASA
// Copyright (C) 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.
//
/////////////////////////////////////////////////////////////////////////////////
@@ -27,28 +27,31 @@
#include "cafPdmUiTreeOrdering.h"
CAF_PDM_SOURCE_INIT(RimEclipseFaultColors, "RimFaultResultSlot");
CAF_PDM_SOURCE_INIT( RimEclipseFaultColors, "RimFaultResultSlot" );
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
RimEclipseFaultColors::RimEclipseFaultColors()
{
CAF_PDM_InitObject("Separate Fault Result", ":/draw_style_faults_24x24.png", "", "");
CAF_PDM_InitObject( "Separate Fault Result", ":/draw_style_faults_24x24.png", "", "" );
CAF_PDM_InitField(&showCustomFaultResult, "ShowCustomFaultResult", false, "Show Custom Fault Result", "", "", "");
showCustomFaultResult.uiCapability()->setUiHidden(true);
CAF_PDM_InitField( &showCustomFaultResult, "ShowCustomFaultResult", false, "Show Custom Fault Result", "", "", "" );
showCustomFaultResult.uiCapability()->setUiHidden( true );
CAF_PDM_InitFieldNoDefault(&m_customFaultResultColors, "CustomResultSlot", "Custom Fault Result", ":/CellResult.png", "", "");
CAF_PDM_InitFieldNoDefault( &m_customFaultResultColors,
"CustomResultSlot",
"Custom Fault Result",
":/CellResult.png",
"",
"" );
m_customFaultResultColors = new RimEclipseCellColors();
m_customFaultResultColors.uiCapability()->setUiHidden(true);
m_customFaultResultColors->setDiffResultOptionsEnabled(true);
m_customFaultResultColors.uiCapability()->setUiHidden( true );
m_customFaultResultColors->setDiffResultOptionsEnabled( true );
}
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
RimEclipseFaultColors::~RimEclipseFaultColors()
{
@@ -57,26 +60,28 @@ RimEclipseFaultColors::~RimEclipseFaultColors()
}
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
void RimEclipseFaultColors::setReservoirView(RimEclipseView* ownerReservoirView)
void RimEclipseFaultColors::setReservoirView( RimEclipseView* ownerReservoirView )
{
m_reservoirView = ownerReservoirView;
m_customFaultResultColors->setReservoirView(ownerReservoirView);
m_customFaultResultColors->setReservoirView( ownerReservoirView );
}
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
void RimEclipseFaultColors::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
void RimEclipseFaultColors::fieldChangedByUi( const caf::PdmFieldHandle* changedField,
const QVariant& oldValue,
const QVariant& newValue )
{
this->updateUiIconFromToggleField();
if (m_reservoirView) m_reservoirView->scheduleCreateDisplayModelAndRedraw();
if ( m_reservoirView ) m_reservoirView->scheduleCreateDisplayModelAndRedraw();
}
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
void RimEclipseFaultColors::initAfterRead()
{
@@ -85,9 +90,8 @@ void RimEclipseFaultColors::initAfterRead()
this->updateUiIconFromToggleField();
}
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
RimEclipseCellColors* RimEclipseFaultColors::customFaultResult()
{
@@ -95,7 +99,7 @@ RimEclipseCellColors* RimEclipseFaultColors::customFaultResult()
}
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
void RimEclipseFaultColors::updateUiFieldsFromActiveResult()
{
@@ -103,7 +107,7 @@ void RimEclipseFaultColors::updateUiFieldsFromActiveResult()
}
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
caf::PdmFieldHandle* RimEclipseFaultColors::objectToggleField()
{
@@ -111,22 +115,22 @@ caf::PdmFieldHandle* RimEclipseFaultColors::objectToggleField()
}
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
void RimEclipseFaultColors::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
void RimEclipseFaultColors::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
{
caf::PdmUiGroup* group1 = uiOrdering.addNewGroup("Result");
m_customFaultResultColors->uiOrdering(uiConfigName, *group1);
}
caf::PdmUiGroup* group1 = uiOrdering.addNewGroup( "Result" );
m_customFaultResultColors->uiOrdering( uiConfigName, *group1 );
}
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
bool RimEclipseFaultColors::hasValidCustomResult()
{
if (this->showCustomFaultResult())
if ( this->showCustomFaultResult() )
{
if (m_customFaultResultColors->hasResult() || m_customFaultResultColors->isTernarySaturationSelected())
if ( m_customFaultResultColors->hasResult() || m_customFaultResultColors->isTernarySaturationSelected() )
{
return true;
}
@@ -136,9 +140,9 @@ bool RimEclipseFaultColors::hasValidCustomResult()
}
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
void RimEclipseFaultColors::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/)
void RimEclipseFaultColors::defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/ )
{
m_customFaultResultColors()->defineUiTreeOrdering(uiTreeOrdering, uiConfigName);
m_customFaultResultColors()->defineUiTreeOrdering( uiTreeOrdering, uiConfigName );
}