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

#5101 clang-format: Adjusted penalties

Browse Source 
Use lower absolute values to improve control of behavior
This commit is contained in:
Magne Sjaastad
2020-02-12 11:43:15 +01:00
parent 10f0abc9b5
commit c82df63e10
710 changed files with 3167 additions and 4721 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ApplicationCode/GrpcInterface/RiaGrpcAppService.cpp
View File

@@ -45,9 +45,8 @@ grpc::Status RiaGrpcAppService::Exit( grpc::ServerContext* context, const rips::
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
grpc::Status RiaGrpcAppService::GetRuntimeInfo( grpc::ServerContext* context,
const rips::Empty* request,
rips::RuntimeInfo* reply )
grpc::Status
RiaGrpcAppService::GetRuntimeInfo( grpc::ServerContext* context, const rips::Empty* request, rips::RuntimeInfo* reply )
{
rips::ApplicationTypeEnum appType = rips::CONSOLE_APPLICATION;
if ( RiaGuiApplication::isRunning() )
@@ -72,5 +71,5 @@ std::vector<RiaGrpcCallbackInterface*> RiaGrpcAppService::createCallbacks()
&Self::RequestGetRuntimeInfo )};
}
static bool RiaGrpcAppInfoService_init = RiaGrpcServiceFactory::instance()->registerCreator<RiaGrpcAppService>(
typeid( RiaGrpcAppService ).hash_code() );
static bool RiaGrpcAppInfoService_init =
RiaGrpcServiceFactory::instance()->registerCreator<RiaGrpcAppService>( typeid( RiaGrpcAppService ).hash_code() );

3
ApplicationCode/GrpcInterface/RiaGrpcAppService.h
View File

@@ -44,7 +44,6 @@ class RiaGrpcAppService : public rips::App::AsyncService, public RiaGrpcServiceI
public:
grpc::Status GetVersion( grpc::ServerContext* context, const rips::Empty* request, rips::Version* reply ) override;
grpc::Status Exit( grpc::ServerContext* context, const rips::Empty* request, rips::Empty* reply ) override;
grpc::Status
GetRuntimeInfo( grpc::ServerContext* context, const rips::Empty* request, rips::RuntimeInfo* reply ) override;
grpc::Status GetRuntimeInfo( grpc::ServerContext* context, const rips::Empty* request, rips::RuntimeInfo* reply ) override;
std::vector<RiaGrpcCallbackInterface*> createCallbacks() override;
};

4
ApplicationCode/GrpcInterface/RiaGrpcCallbacks.inl
View File

@@ -107,9 +107,7 @@ RiaGrpcUnaryCallback<ServiceT, RequestT, ReplyT>::RiaGrpcUnaryCallback( ServiceT
template <typename ServiceT, typename RequestT, typename ReplyT>
RiaGrpcCallbackInterface* RiaGrpcUnaryCallback<ServiceT, RequestT, ReplyT>::createNewFromThis() const
{
return new RiaGrpcUnaryCallback<ServiceT, RequestT, ReplyT>( this->m_service,
this->m_methodImpl,
this->m_methodRequest );
return new RiaGrpcUnaryCallback<ServiceT, RequestT, ReplyT>( this->m_service, this->m_methodImpl, this->m_methodRequest );
}
//--------------------------------------------------------------------------------------------------

21
ApplicationCode/GrpcInterface/RiaGrpcCaseService.cpp
View File

@@ -295,9 +295,7 @@ grpc::Status RiaGrpcCaseService::GetDaysSinceStart( grpc::ServerContext* con
RigEclipseResultAddress addrToMaxTimeStepCountResult;
if ( eclipseCase && eclipseCase->eclipseCaseData() )
{
eclipseCase->eclipseCaseData()
->results( RiaDefines::MATRIX_MODEL )
->maxTimeStepCount( &addrToMaxTimeStepCountResult );
eclipseCase->eclipseCaseData()->results( RiaDefines::MATRIX_MODEL )->maxTimeStepCount( &addrToMaxTimeStepCountResult );
if ( !addrToMaxTimeStepCountResult.isValid() )
{
return grpc::Status( grpc::NOT_FOUND, "Invalid result. No time steps found." );
@@ -320,9 +318,8 @@ grpc::Status RiaGrpcCaseService::GetDaysSinceStart( grpc::ServerContext* con
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
grpc::Status RiaGrpcCaseService::GetCaseInfo( grpc::ServerContext* context,
const rips::CaseRequest* request,
rips::CaseInfo* reply )
grpc::Status
RiaGrpcCaseService::GetCaseInfo( grpc::ServerContext* context, const rips::CaseRequest* request, rips::CaseInfo* reply )
{
RimCase* rimCase = findCase( request->id() );
if ( rimCase )
@@ -397,12 +394,8 @@ std::vector<RiaGrpcCallbackInterface*> RiaGrpcCaseService::createCallbacks()
typedef RiaGrpcCaseService Self;
return {new RiaGrpcUnaryCallback<Self, CaseRequest, GridCount>( this, &Self::GetGridCount, &Self::RequestGetGridCount ),
new RiaGrpcUnaryCallback<Self, CellInfoRequest, CellCount>( this,
&Self::GetCellCount,
&Self::RequestGetCellCount ),
new RiaGrpcUnaryCallback<Self, CaseRequest, TimeStepDates>( this,
&Self::GetTimeSteps,
&Self::RequestGetTimeSteps ),
new RiaGrpcUnaryCallback<Self, CellInfoRequest, CellCount>( this, &Self::GetCellCount, &Self::RequestGetCellCount ),
new RiaGrpcUnaryCallback<Self, CaseRequest, TimeStepDates>( this, &Self::GetTimeSteps, &Self::RequestGetTimeSteps ),
new RiaGrpcUnaryCallback<Self, CaseRequest, DaysSinceStart>( this,
&Self::GetDaysSinceStart,
&Self::RequestGetDaysSinceStart ),
@@ -420,5 +413,5 @@ std::vector<RiaGrpcCallbackInterface*> RiaGrpcCaseService::createCallbacks()
&Self::RequestGetReservoirBoundingBox )};
}
static bool RiaGrpcCaseService_init = RiaGrpcServiceFactory::instance()->registerCreator<RiaGrpcCaseService>(
typeid( RiaGrpcCaseService ).hash_code() );
static bool RiaGrpcCaseService_init =
RiaGrpcServiceFactory::instance()->registerCreator<RiaGrpcCaseService>( typeid( RiaGrpcCaseService ).hash_code() );

3
ApplicationCode/GrpcInterface/RiaGrpcCaseService.h
View File

@@ -82,8 +82,7 @@ public:
grpc::Status GetDaysSinceStart( grpc::ServerContext* context,
const rips::CaseRequest* request,
rips::DaysSinceStart* reply ) override;
grpc::Status
GetCaseInfo( grpc::ServerContext* context, const rips::CaseRequest* request, rips::CaseInfo* reply ) override;
grpc::Status GetCaseInfo( grpc::ServerContext* context, const rips::CaseRequest* request, rips::CaseInfo* reply ) override;
grpc::Status
GetPdmObject( grpc::ServerContext* context, const rips::CaseRequest* request, rips::PdmObject* reply ) override;
grpc::Status GetCellInfoForActiveCells( grpc::ServerContext* context,

9
ApplicationCode/GrpcInterface/RiaGrpcCommandService.cpp
View File

@@ -43,8 +43,7 @@ using namespace google::protobuf;
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
grpc::Status
RiaGrpcCommandService::Execute( grpc::ServerContext* context, const CommandParams* request, CommandReply* reply )
grpc::Status RiaGrpcCommandService::Execute( grpc::ServerContext* context, const CommandParams* request, CommandReply* reply )
{
auto requestDescriptor = request->GetDescriptor();
@@ -253,9 +252,9 @@ void RiaGrpcCommandService::assignPdmObjectValues( caf::PdmObjectHandle*
auto parameter = messageDescriptor->field( i );
if ( parameter )
{
QString parameterName = QString::fromStdString( parameter->name() );
auto pdmChildFieldHandle = dynamic_cast<caf::PdmChildFieldHandle*>(
pdmObjectHandle->findField( parameterName ) );
QString parameterName = QString::fromStdString( parameter->name() );
auto pdmChildFieldHandle =
dynamic_cast<caf::PdmChildFieldHandle*>( pdmObjectHandle->findField( parameterName ) );
auto pdmValueFieldHandle = dynamic_cast<caf::PdmValueField*>( pdmObjectHandle->findField( parameterName ) );
if ( pdmChildFieldHandle )
{

4
ApplicationCode/GrpcInterface/RiaGrpcGridService.cpp
View File

@@ -67,5 +67,5 @@ std::vector<RiaGrpcCallbackInterface*> RiaGrpcGridService::createCallbacks()
&Self::RequestGetDimensions )};
}
static bool RiaGrpcGridService_init = RiaGrpcServiceFactory::instance()->registerCreator<RiaGrpcGridService>(
typeid( RiaGrpcGridService ).hash_code() );
static bool RiaGrpcGridService_init =
RiaGrpcServiceFactory::instance()->registerCreator<RiaGrpcGridService>( typeid( RiaGrpcGridService ).hash_code() );

4
ApplicationCode/GrpcInterface/RiaGrpcPdmObjectService.cpp
View File

@@ -212,8 +212,8 @@ grpc::Status RiaGrpcPdmObjectService::CreateChildPdmObject( grpc::ServerContext*
{
CAF_ASSERT( request );
caf::PdmObjectHandle* pdmObject = emplaceChildField( matchingObject,
QString::fromStdString( request->child_field() ) );
caf::PdmObjectHandle* pdmObject =
emplaceChildField( matchingObject, QString::fromStdString( request->child_field() ) );
if ( pdmObject )
{
copyPdmObjectFromCafToRips( pdmObject, reply );

31
ApplicationCode/GrpcInterface/RiaGrpcProjectService.cpp
View File

@@ -45,9 +45,7 @@ Status RiaGrpcProjectService::GetCurrentCase( ServerContext* context, const rips
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
Status RiaGrpcProjectService::GetSelectedCases( ServerContext* context,
const rips::Empty* request,
rips::CaseInfoArray* reply )
Status RiaGrpcProjectService::GetSelectedCases( ServerContext* context, const rips::Empty* request, rips::CaseInfoArray* reply )
{
std::vector<RimCase*> cases;
caf::SelectionManager::instance()->objectsByType( &cases );
@@ -80,10 +78,9 @@ grpc::Status RiaGrpcProjectService::GetAllCaseGroups( grpc::ServerContext* conte
const rips::Empty* request,
rips::CaseGroups* reply )
{
RimProject* proj = RiaApplication::instance()->project();
RimEclipseCaseCollection* analysisModels = ( proj && proj->activeOilField() )
? proj->activeOilField()->analysisModels()
: nullptr;
RimProject* proj = RiaApplication::instance()->project();
RimEclipseCaseCollection* analysisModels =
( proj && proj->activeOilField() ) ? proj->activeOilField()->analysisModels() : nullptr;
if ( analysisModels )
{
for ( RimIdenticalGridCaseGroup* cg : analysisModels->caseGroups() )
@@ -135,10 +132,9 @@ grpc::Status RiaGrpcProjectService::GetCasesInGroup( grpc::ServerContext* cont
const rips::CaseGroup* request,
rips::CaseInfoArray* reply )
{
RimProject* proj = RiaApplication::instance()->project();
RimEclipseCaseCollection* analysisModels = ( proj && proj->activeOilField() )
? proj->activeOilField()->analysisModels()
: nullptr;
RimProject* proj = RiaApplication::instance()->project();
RimEclipseCaseCollection* analysisModels =
( proj && proj->activeOilField() ) ? proj->activeOilField()->analysisModels() : nullptr;
if ( analysisModels )
{
int groupId = request->id();
@@ -190,9 +186,8 @@ grpc::Status RiaGrpcProjectService::GetCasesInGroup( grpc::ServerContext* cont
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
grpc::Status RiaGrpcProjectService::GetPdmObject( grpc::ServerContext* context,
const rips::Empty* request,
rips::PdmObject* reply )
grpc::Status
RiaGrpcProjectService::GetPdmObject( grpc::ServerContext* context, const rips::Empty* request, rips::PdmObject* reply )
{
RimProject* project = RiaApplication::instance()->project();
if ( project )
@@ -210,12 +205,8 @@ std::vector<RiaGrpcCallbackInterface*> RiaGrpcProjectService::createCallbacks()
typedef RiaGrpcProjectService Self;
return {new RiaGrpcUnaryCallback<Self, Empty, CaseRequest>( this, &Self::GetCurrentCase, &Self::RequestGetCurrentCase ),
new RiaGrpcUnaryCallback<Self, Empty, CaseInfoArray>( this,
&Self::GetSelectedCases,
&Self::RequestGetSelectedCases ),
new RiaGrpcUnaryCallback<Self, Empty, CaseGroups>( this,
&Self::GetAllCaseGroups,
&Self::RequestGetAllCaseGroups ),
new RiaGrpcUnaryCallback<Self, Empty, CaseInfoArray>( this, &Self::GetSelectedCases, &Self::RequestGetSelectedCases ),
new RiaGrpcUnaryCallback<Self, Empty, CaseGroups>( this, &Self::GetAllCaseGroups, &Self::RequestGetAllCaseGroups ),
new RiaGrpcUnaryCallback<Self, Empty, CaseInfoArray>( this, &Self::GetAllCases, &Self::RequestGetAllCases ),
new RiaGrpcUnaryCallback<Self, CaseGroup, CaseInfoArray>( this,
&Self::GetCasesInGroup,

11
ApplicationCode/GrpcInterface/RiaGrpcProjectService.h
View File

@@ -38,15 +38,12 @@ class RiaGrpcCallbackInterface;
class RiaGrpcProjectService final : public rips::Project::AsyncService, public RiaGrpcServiceInterface
{
public:
grpc::Status GetCurrentCase( grpc::ServerContext* context, const rips::Empty* request, rips::CaseRequest* reply ) override;
grpc::Status
GetCurrentCase( grpc::ServerContext* context, const rips::Empty* request, rips::CaseRequest* reply ) override;
grpc::Status GetSelectedCases( grpc::ServerContext* context,
const rips::Empty* request,
rips::CaseInfoArray* reply ) override;
GetSelectedCases( grpc::ServerContext* context, const rips::Empty* request, rips::CaseInfoArray* reply ) override;
grpc::Status
GetAllCaseGroups( grpc::ServerContext* context, const rips::Empty* request, rips::CaseGroups* reply ) override;
grpc::Status
GetAllCases( grpc::ServerContext* context, const rips::Empty* request, rips::CaseInfoArray* reply ) override;
GetAllCaseGroups( grpc::ServerContext* context, const rips::Empty* request, rips::CaseGroups* reply ) override;
grpc::Status GetAllCases( grpc::ServerContext* context, const rips::Empty* request, rips::CaseInfoArray* reply ) override;
grpc::Status GetCasesInGroup( grpc::ServerContext* context,
const rips::CaseGroup* request,
rips::CaseInfoArray* reply ) override;

23
ApplicationCode/GrpcInterface/RiaGrpcPropertiesService.cpp
View File

@@ -106,11 +106,10 @@ public:
resultData->createResultEntry( m_resultAddress, true );
RigEclipseResultAddress addrToMaxTimeStepCountResult;
size_t timeStepCount = std::max( (size_t)1,
resultData->maxTimeStepCount( &addrToMaxTimeStepCountResult ) );
size_t timeStepCount = std::max( (size_t)1, resultData->maxTimeStepCount( &addrToMaxTimeStepCountResult ) );
const std::vector<RigEclipseTimeStepInfo> timeStepInfos = resultData->timeStepInfos(
addrToMaxTimeStepCountResult );
const std::vector<RigEclipseTimeStepInfo> timeStepInfos =
resultData->timeStepInfos( addrToMaxTimeStepCountResult );
resultData->setTimeStepInfos( m_resultAddress, timeStepInfos );
auto scalarResultFrames = resultData->modifiableCellScalarResultTimesteps( m_resultAddress );
scalarResultFrames->resize( timeStepCount );
@@ -275,17 +274,11 @@ protected:
size_t timeStepIndex,
RigEclipseResultAddress resVarAddr ) override
{
m_resultAccessor = RigResultAccessorFactory::createFromResultAddress( caseData,
gridIndex,
porosityModel,
timeStepIndex,
resVarAddr );
m_resultModifier = RigResultModifierFactory::createResultModifier( caseData,
gridIndex,
porosityModel,
timeStepIndex,
resVarAddr );
m_cellCount = caseData->grid( gridIndex )->cellCount();
m_resultAccessor =
RigResultAccessorFactory::createFromResultAddress( caseData, gridIndex, porosityModel, timeStepIndex, resVarAddr );
m_resultModifier =
RigResultModifierFactory::createResultModifier( caseData, gridIndex, porosityModel, timeStepIndex, resVarAddr );
m_cellCount = caseData->grid( gridIndex )->cellCount();
}
double cellResult( size_t currentCellIndex ) const override

14
ApplicationCode/GrpcInterface/RiaGrpcServiceInterface.cpp
View File

@@ -66,8 +66,7 @@ size_t RiaGrpcServiceInterface::numberOfMessagesForByteCount( size_t messageSize
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiaGrpcServiceInterface::copyPdmObjectFromCafToRips( const caf::PdmObjectHandle* source,
rips::PdmObject* destination )
void RiaGrpcServiceInterface::copyPdmObjectFromCafToRips( const caf::PdmObjectHandle* source, rips::PdmObject* destination )
{
CAF_ASSERT( source && destination && source->xmlCapability() );
@@ -77,8 +76,8 @@ void RiaGrpcServiceInterface::copyPdmObjectFromCafToRips( const caf::PdmObjectHa
bool visible = true;
if ( source->uiCapability() && source->uiCapability()->objectToggleField() )
{
const caf::PdmField<bool>* boolField = dynamic_cast<const caf::PdmField<bool>*>(
source->uiCapability()->objectToggleField() );
const caf::PdmField<bool>* boolField =
dynamic_cast<const caf::PdmField<bool>*>( source->uiCapability()->objectToggleField() );
if ( boolField )
{
visible = boolField->value();
@@ -111,16 +110,15 @@ void RiaGrpcServiceInterface::copyPdmObjectFromCafToRips( const caf::PdmObjectHa
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiaGrpcServiceInterface::copyPdmObjectFromRipsToCaf( const rips::PdmObject* source,
caf::PdmObjectHandle* destination )
void RiaGrpcServiceInterface::copyPdmObjectFromRipsToCaf( const rips::PdmObject* source, caf::PdmObjectHandle* destination )
{
CAF_ASSERT( source && destination && destination->xmlCapability() );
CAF_ASSERT( source->class_keyword() == destination->xmlCapability()->classKeyword().toStdString() );
if ( destination->uiCapability() && destination->uiCapability()->objectToggleField() )
{
caf::PdmField<bool>* boolField = dynamic_cast<caf::PdmField<bool>*>(
destination->uiCapability()->objectToggleField() );
caf::PdmField<bool>* boolField =
dynamic_cast<caf::PdmField<bool>*>( destination->uiCapability()->objectToggleField() );
if ( boolField )
{
QVariant oldValue = boolField->toQVariant();