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

Fixes by clang-format

Browse Source
This commit is contained in:
github-actions[bot] 2020-06-08 09:09:11 +00:00 committed by Magne Sjaastad
parent 64a719b1f4
commit 6b5f4dddc9
58 changed files with 202 additions and 206 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/Application/RiaApplication.cpp
View File

@ -91,11 +91,11 @@
#include "RimWellLogFile.h" #include "RimWellLogFile.h"
#include "RimWellLogPlot.h" #include "RimWellLogPlot.h"
#include "RimWellLogPlotCollection.h" #include "RimWellLogPlotCollection.h"
#include "RimWellPath.h"
#include "RimWellPathCollection.h" #include "RimWellPathCollection.h"
#include "RimWellPathFracture.h" #include "RimWellPathFracture.h"
#include "RimWellPltPlot.h" #include "RimWellPltPlot.h"
#include "RimWellRftPlot.h" #include "RimWellRftPlot.h"
#include "RimWellPath.h"
#include "Riu3DMainWindowTools.h" #include "Riu3DMainWindowTools.h"
#include "RiuViewer.h" #include "RiuViewer.h"

3
ApplicationCode/CommandFileInterface/RicfExportFlowCharacteristics.cpp
View File

@ -88,8 +88,7 @@ caf::PdmScriptResponse RicfExportFlowCharacteristics::execute()
exportFileName = exportFolder + "/" + fi.fileName(); exportFileName = exportFolder + "/" + fi.fileName();
} }
RimFlowPlotCollection* flowPlotColl = RimFlowPlotCollection* flowPlotColl = RimProject::current()->mainPlotCollection->flowPlotCollection();
RimProject::current()->mainPlotCollection->flowPlotCollection();
if ( flowPlotColl ) if ( flowPlotColl )
{ {
RimFlowCharacteristicsPlot* plot = flowPlotColl->defaultFlowCharacteristicsPlot(); RimFlowCharacteristicsPlot* plot = flowPlotColl->defaultFlowCharacteristicsPlot();

4
ApplicationCode/Commands/ApplicationCommands/RicShowPlotDataFeature.cpp
View File

@ -106,7 +106,9 @@ private:
static std::vector<RiaQDateTimeTools::DateTimePeriod> tabs() static std::vector<RiaQDateTimeTools::DateTimePeriod> tabs()
{ {
std::vector<RiaQDateTimeTools::DateTimePeriod> dateTimePeriods = RiaQDateTimeTools::dateTimePeriods(); std::vector<RiaQDateTimeTools::DateTimePeriod> dateTimePeriods = RiaQDateTimeTools::dateTimePeriods();
dateTimePeriods.erase( std::remove( dateTimePeriods.begin(), dateTimePeriods.end(), RiaQDateTimeTools::DateTimePeriod::DECADE ), dateTimePeriods.erase( std::remove( dateTimePeriods.begin(),
dateTimePeriods.end(),
RiaQDateTimeTools::DateTimePeriod::DECADE ),
dateTimePeriods.end() ); dateTimePeriods.end() );
return dateTimePeriods; return dateTimePeriods;
} }

3
ApplicationCode/Commands/ExportCommands/RicExportEclipseSectorModelFeature.cpp
View File

@ -70,8 +70,7 @@ void RicExportEclipseSectorModelFeature::openDialogAndExecuteCommand( RimEclipse
cvf::Vec3i min, max; cvf::Vec3i min, max;
std::tie( min, max ) = getVisibleCellRange( view, cellVisibility ); std::tie( min, max ) = getVisibleCellRange( view, cellVisibility );
RicExportEclipseSectorModelUi* exportSettings = RicExportEclipseSectorModelUi* exportSettings = RimProject::current()->dialogData()->exportSectorModelUi();
RimProject::current()->dialogData()->exportSectorModelUi();
exportSettings->setCaseData( caseData, min, max ); exportSettings->setCaseData( caseData, min, max );
exportSettings->applyBoundaryDefaults(); exportSettings->applyBoundaryDefaults();

3
ApplicationCode/Commands/FlowCommands/RicShowFlowCharacteristicsPlotFeature.cpp
View File

@ -88,8 +88,7 @@ void RicShowFlowCharacteristicsPlotFeature::onActionTriggered( bool isChecked )
if ( RimProject::current() ) if ( RimProject::current() )
{ {
RimFlowPlotCollection* flowPlotColl = RimFlowPlotCollection* flowPlotColl = RimProject::current()->mainPlotCollection->flowPlotCollection();
RimProject::current()->mainPlotCollection->flowPlotCollection();
if ( flowPlotColl ) if ( flowPlotColl )
{ {
RiuPlotMainWindowTools::showPlotMainWindow(); RiuPlotMainWindowTools::showPlotMainWindow();

3
ApplicationCode/Commands/FlowCommands/RicShowWellAllocationPlotFeature.cpp
View File

@ -105,8 +105,7 @@ void RicShowWellAllocationPlotFeature::onActionTriggered( bool isChecked )
if ( RimProject::current() ) if ( RimProject::current() )
{ {
RimFlowPlotCollection* flowPlotColl = RimFlowPlotCollection* flowPlotColl = RimProject::current()->mainPlotCollection->flowPlotCollection();
RimProject::current()->mainPlotCollection->flowPlotCollection();
if ( flowPlotColl ) if ( flowPlotColl )
{ {
flowPlotColl->defaultWellAllocPlot()->setFromSimulationWell( simWell ); flowPlotColl->defaultWellAllocPlot()->setFromSimulationWell( simWell );

3
ApplicationCode/Commands/HoloLensCommands/RicHoloLensExportToFolderFeature.cpp
View File

@ -56,8 +56,7 @@ void RicHoloLensExportToFolderFeature::onActionTriggered( bool isChecked )
{ {
RimGridView* activeView = RiaApplication::instance()->activeGridView(); RimGridView* activeView = RiaApplication::instance()->activeGridView();
RicHoloLensExportToFolderUi* featureUi = RicHoloLensExportToFolderUi* featureUi = RimProject::current()->dialogData()->holoLensExportToFolderData();
RimProject::current()->dialogData()->holoLensExportToFolderData();
featureUi->setViewForExport( activeView ); featureUi->setViewForExport( activeView );
caf::PdmUiPropertyViewDialog propertyDialog( nullptr, caf::PdmUiPropertyViewDialog propertyDialog( nullptr,

3
ApplicationCode/Commands/PlotTemplateCommands/RicSummaryPlotTemplateTools.cpp
View File

@ -91,8 +91,7 @@ void RicSummaryPlotTemplateTools::appendSummaryPlotToPlotCollection(
if ( selectedSummaryCases.empty() && selectedEnsembles.empty() ) return; if ( selectedSummaryCases.empty() && selectedEnsembles.empty() ) return;
RimSummaryPlotCollection* plotColl = RimSummaryPlotCollection* plotColl = RimProject::current()->mainPlotCollection()->summaryPlotCollection();
RimProject::current()->mainPlotCollection()->summaryPlotCollection();
plotColl->summaryPlots.push_back( summaryPlot ); plotColl->summaryPlots.push_back( summaryPlot );
summaryPlot->resolveReferencesRecursively(); summaryPlot->resolveReferencesRecursively();

6
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotFeatureImpl.cpp
View File

@ -146,8 +146,7 @@ void RicSummaryPlotFeatureImpl::ensureAtLeastOnePlot( RimSummaryPlotCollection*
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
caf::PdmObject* RicSummaryPlotFeatureImpl::createDefaultSummaryPlot( RimSummaryCase* summaryCase ) caf::PdmObject* RicSummaryPlotFeatureImpl::createDefaultSummaryPlot( RimSummaryCase* summaryCase )
{ {
RimSummaryPlotCollection* summaryPlotCollection = RimSummaryPlotCollection* summaryPlotCollection = RimProject::current()->mainPlotCollection->summaryPlotCollection();
RimProject::current()->mainPlotCollection->summaryPlotCollection();
caf::PdmObject* itemToSelect = nullptr; caf::PdmObject* itemToSelect = nullptr;
@ -393,8 +392,7 @@ void RicSummaryPlotFeatureImpl::createSummaryPlotsFromArgumentLine( const QStrin
RimSummaryPlot* lastPlotCreated = nullptr; RimSummaryPlot* lastPlotCreated = nullptr;
RimSummaryPlotCollection* sumPlotColl = RimSummaryPlotCollection* sumPlotColl = RimProject::current()->mainPlotCollection()->summaryPlotCollection();
RimProject::current()->mainPlotCollection()->summaryPlotCollection();
splitAddressFiltersInGridAndSummary( summaryCasesToUse[0], splitAddressFiltersInGridAndSummary( summaryCasesToUse[0],
allCurveAddressFilters, allCurveAddressFilters,

5
ApplicationCode/FileInterface/RifColorLegendData.cpp
View File

@ -91,8 +91,9 @@ cvf::ref<RigFormationNames> RifColorLegendData::readLyrFormationNameFile( const
if ( QColor::isValidColor( colorWord ) ) if ( QColor::isValidColor( colorWord ) )
numberString.remove( colorWord ); // remove color if present as last word on line numberString.remove( colorWord ); // remove color if present as last word on line
QStringList numberWords = QStringList numberWords = numberString.split( QRegExp( "-" ), QString::SkipEmptyParts ); // extract words
numberString.split( QRegExp( "-" ), QString::SkipEmptyParts ); // extract words containing formation // containing
// formation
// number(s) // number(s)
if ( numberWords.size() == 2 ) // formation range with or without color at end of line if ( numberWords.size() == 2 ) // formation range with or without color at end of line

3
ApplicationCode/GrpcInterface/RiaGrpcNNCPropertiesService.cpp
View File

@ -520,8 +520,7 @@ std::vector<RiaGrpcCallbackInterface*> RiaGrpcNNCPropertiesService::createCallba
RiaNNCInputValuesStateHandler>( this, RiaNNCInputValuesStateHandler>( this,
&Self::SetNNCValues, &Self::SetNNCValues,
&Self::RequestSetNNCValues, &Self::RequestSetNNCValues,
new RiaNNCInputValuesStateHandler( new RiaNNCInputValuesStateHandler( true ) )};
true ) ) };
return callbacks; return callbacks;
} }

1
ApplicationCode/ProjectDataModel/Annotations/RimAnnotationInViewCollection.h
View File

@ -63,6 +63,7 @@ public:
void updateFonts(); void updateFonts();
void onChildDeleted( caf::PdmChildArrayFieldHandle* childArray, void onChildDeleted( caf::PdmChildArrayFieldHandle* childArray,
std::vector<caf::PdmObjectHandle*>& referringObjects ) override; std::vector<caf::PdmObjectHandle*>& referringObjects ) override;
protected: protected:
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override; void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override; void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;

1
ApplicationCode/ProjectDataModel/Flow/RimTofAccumulatedPhaseFractionsPlot.h
View File

@ -75,6 +75,7 @@ public:
int fontSize() const override; int fontSize() const override;
void updateFonts() override; void updateFonts() override;
protected: protected:
// RimViewWindow overrides // RimViewWindow overrides
void assignIdIfNecessary() final; void assignIdIfNecessary() final;

1
ApplicationCode/ProjectDataModel/RimPlot.h
View File

@ -99,6 +99,7 @@ protected:
QWidget* createViewWidget( QWidget* parent = nullptr ) final; QWidget* createViewWidget( QWidget* parent = nullptr ) final;
void updateFonts(); void updateFonts();
private: private:
virtual void doRemoveFromCollection() = 0; virtual void doRemoveFromCollection() = 0;
virtual void doRenderWindowContent( QPaintDevice* paintDevice ); virtual void doRenderWindowContent( QPaintDevice* paintDevice );

6
ApplicationCode/ProjectDataModel/RimSummaryCalculationVariable.cpp
View File

@ -201,8 +201,7 @@ void RimSummaryCalculationVariable::readDataFromApplicationStore( RiuSummaryVect
RiaApplication::instance()->cacheDataObject( "CalculatorSummaryCase" ).toString(); RiaApplication::instance()->cacheDataObject( "CalculatorSummaryCase" ).toString();
auto* lastUsedSummaryCase = dynamic_cast<RimSummaryCase*>( auto* lastUsedSummaryCase = dynamic_cast<RimSummaryCase*>(
caf::PdmReferenceHelper::objectFromReference( RimProject::current(), caf::PdmReferenceHelper::objectFromReference( RimProject::current(), lastUsedSummaryCaseString ) );
lastUsedSummaryCaseString ) );
if ( lastUsedSummaryCase ) if ( lastUsedSummaryCase )
{ {
sumCase = lastUsedSummaryCase; sumCase = lastUsedSummaryCase;
@ -217,8 +216,7 @@ void RimSummaryCalculationVariable::readDataFromApplicationStore( RiuSummaryVect
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimSummaryCalculationVariable::writeDataToApplicationStore() const void RimSummaryCalculationVariable::writeDataToApplicationStore() const
{ {
QString refFromProjectToObject = QString refFromProjectToObject = caf::PdmReferenceHelper::referenceFromRootToObject( RimProject::current(), m_case );
caf::PdmReferenceHelper::referenceFromRootToObject( RimProject::current(), m_case );
RiaApplication::instance()->setCacheDataObject( "CalculatorSummaryCase", refFromProjectToObject ); RiaApplication::instance()->setCacheDataObject( "CalculatorSummaryCase", refFromProjectToObject );
QVariant sumAdrVar = QVariant::fromValue( m_summaryAddress->address() ); QVariant sumAdrVar = QVariant::fromValue( m_summaryAddress->address() );

3
ApplicationCode/ReservoirDataModel/RigFishbonesGeometry.cpp
View File

@ -110,7 +110,8 @@ void RigFisbonesGeometry::computeLateralPositionAndOrientation( size_t subI
double initialRotationAngle = m_fishbonesSub->rotationAngle( subIndex ); double initialRotationAngle = m_fishbonesSub->rotationAngle( subIndex );
double lateralOffsetDegrees = 360.0 / m_fishbonesSub->lateralLengths().size(); double lateralOffsetDegrees = 360.0 / m_fishbonesSub->lateralLengths().size();
double lateralOffsetRadians = cvf::Math::toRadians( initialRotationAngle + lateralOffsetDegrees * lateralIndex ); double lateralOffsetRadians =
cvf::Math::toRadians( initialRotationAngle + lateralOffsetDegrees * lateralIndex );
cvf::Mat4d lateralOffsetMatrix = cvf::Mat4d::fromRotation( alongWellPath, lateralOffsetRadians ); cvf::Mat4d lateralOffsetMatrix = cvf::Mat4d::fromRotation( alongWellPath, lateralOffsetRadians );