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

clang-format : Set AllowAllParametersOfDeclarationOnNextLine to false

Browse Source
This commit is contained in:
Magne Sjaastad
2019-11-04 14:35:41 +01:00
parent 946f9e7f91
commit 7c8cf60dba
83 changed files with 495 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ApplicationCode/UserInterface/RiuFlowCharacteristicsPlot.cpp
View File

@@ -187,8 +187,11 @@ void RiuFlowCharacteristicsPlot::setLorenzCurve( const QStringList& d
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuFlowCharacteristicsPlot::addCurveWithLargeSymbol(
QwtPlot* plot, const QString& curveName, const QColor& color, const QDateTime& dateTime, double timeHistoryValue )
void RiuFlowCharacteristicsPlot::addCurveWithLargeSymbol( QwtPlot* plot,
const QString& curveName,
const QColor& color,
const QDateTime& dateTime,
double timeHistoryValue )
{
auto curve = createEmptyCurve( plot, curveName, color );

9
ApplicationCode/UserInterface/RiuQwtPlotCurve.cpp
View File

@@ -196,8 +196,13 @@ void RiuQwtPlotCurve::setSamplesFromTimeTAndYValues( const std::vector<time_t>&
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuQwtPlotCurve::drawCurve(
QPainter* p, int style, const QwtScaleMap& xMap, const QwtScaleMap& yMap, const QRectF& canvasRect, int from, int to ) const
void RiuQwtPlotCurve::drawCurve( QPainter* p,
int style,
const QwtScaleMap& xMap,
const QwtScaleMap& yMap,
const QRectF& canvasRect,
int from,
int to ) const
{
size_t intervalCount = m_polyLineStartStopIndices.size();
if ( intervalCount > 0 )

14
ApplicationCode/UserInterface/RiuQwtPlotWidget.cpp
View File

@@ -125,8 +125,11 @@ int RiuQwtPlotWidget::axisValueFontSize( QwtPlot::Axis axis ) const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuQwtPlotWidget::setAxisFontsAndAlignment(
QwtPlot::Axis axis, int titleFontSize, int valueFontSize, bool titleBold, Qt::AlignmentFlag alignment )
void RiuQwtPlotWidget::setAxisFontsAndAlignment( QwtPlot::Axis axis,
int titleFontSize,
int valueFontSize,
bool titleBold,
Qt::AlignmentFlag alignment )
{
// Axis number font
QFont axisFont = this->axisFont( axis );
@@ -279,8 +282,11 @@ void RiuQwtPlotWidget::enableGridLines( QwtPlot::Axis axis, bool majorGridLines,
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuQwtPlotWidget::setMajorAndMinorTickIntervals(
QwtPlot::Axis axis, double majorTickInterval, double minorTickInterval, double minValue, double maxValue )
void RiuQwtPlotWidget::setMajorAndMinorTickIntervals( QwtPlot::Axis axis,
double majorTickInterval,
double minorTickInterval,
double minValue,
double maxValue )
{
RiuQwtLinearScaleEngine* scaleEngine = dynamic_cast<RiuQwtLinearScaleEngine*>( this->axisScaleEngine( axis ) );
if ( scaleEngine )

7
ApplicationCode/UserInterface/RiuQwtPlotWidget.h
View File

@@ -83,8 +83,11 @@ public:
void enableGridLines( QwtPlot::Axis axis, bool majorGridLines, bool minorGridLines );
void setMajorAndMinorTickIntervals(
QwtPlot::Axis axis, double majorTickInterval, double minorTickInterval, double minValue, double maxValue );
void setMajorAndMinorTickIntervals( QwtPlot::Axis axis,
double majorTickInterval,
double minorTickInterval,
double minValue,
double maxValue );
void setAutoTickIntervalCounts( QwtPlot::Axis axis, int maxMajorTickIntervalCount, int maxMinorTickIntervalCount );
double majorTickInterval( QwtPlot::Axis axis ) const;
double minorTickInterval( QwtPlot::Axis axis ) const;

7
ApplicationCode/UserInterface/RiuRelativePermeabilityPlotPanel.cpp
View File

@@ -576,8 +576,11 @@ QString RiuRelativePermeabilityPlotPanel::determineXAxisTitleFromCurveCollection
//--------------------------------------------------------------------------------------------------
/// Add a vertical labeled marker line at the specified saturation value
//--------------------------------------------------------------------------------------------------
void RiuRelativePermeabilityPlotPanel::addVerticalSaturationMarkerLine(
double saturationValue, QString label, QColor color, QwtPlot* plot, std::vector<QwtPlotMarker*>* myPlotMarkers )
void RiuRelativePermeabilityPlotPanel::addVerticalSaturationMarkerLine( double saturationValue,
QString label,
QColor color,
QwtPlot* plot,
std::vector<QwtPlotMarker*>* myPlotMarkers )
{
QwtPlotMarker* lineMarker = new QwtPlotMarker;
lineMarker->setXValue( saturationValue );

7
ApplicationCode/UserInterface/RiuRelativePermeabilityPlotPanel.h
View File

@@ -92,8 +92,11 @@ private:
static QString
determineXAxisTitleFromCurveCollection( const std::vector<RigFlowDiagSolverInterface::RelPermCurve>& curveArr );
static void addVerticalSaturationMarkerLine(
double saturationValue, QString label, QColor color, QwtPlot* plot, std::vector<QwtPlotMarker*>* myPlotMarkers );
static void addVerticalSaturationMarkerLine( double saturationValue,
QString label,
QColor color,
QwtPlot* plot,
std::vector<QwtPlotMarker*>* myPlotMarkers );
static void addCurveConstSaturationIntersectionMarker( const RigFlowDiagSolverInterface::RelPermCurve& curve,
double saturationValue,

11
ApplicationCode/UserInterface/RiuSummaryCurveDefSelection.cpp
View File

@@ -1003,8 +1003,9 @@ std::set<RifEclipseSummaryAddress> RiuSummaryCurveDefSelection::findPossibleSumm
//--------------------------------------------------------------------------------------------------
/// Returns the summary addresses that match the selected item type and input selections made in GUI
//--------------------------------------------------------------------------------------------------
std::set<RifEclipseSummaryAddress> RiuSummaryCurveDefSelection::findPossibleSummaryAddresses(
const std::vector<SummarySource*>& selectedSources, const SummaryIdentifierAndField* identifierAndField ) const
std::set<RifEclipseSummaryAddress>
RiuSummaryCurveDefSelection::findPossibleSummaryAddresses( const std::vector<SummarySource*>& selectedSources,
const SummaryIdentifierAndField* identifierAndField ) const
{
std::set<RifEclipseSummaryAddress> addrUnion;
@@ -1126,7 +1127,8 @@ SummaryIdentifierAndField*
///
//--------------------------------------------------------------------------------------------------
bool RiuSummaryCurveDefSelection::isAddressCompatibleWithControllingFieldSelection(
const RifEclipseSummaryAddress& address, const std::vector<SummaryIdentifierAndField*>& identifierAndFieldList ) const
const RifEclipseSummaryAddress& address,
const std::vector<SummaryIdentifierAndField*>& identifierAndFieldList ) const
{
for ( const auto& identifierAndField : identifierAndFieldList )
{
@@ -1404,7 +1406,8 @@ void RiuSummaryCurveDefSelection::appendOptionItemsForCategories( QList<caf::Pdm
///
//--------------------------------------------------------------------------------------------------
void RiuSummaryCurveDefSelection::appendOptionItemsForSubCategoriesAndVectors(
QList<caf::PdmOptionItemInfo>& options, SummaryIdentifierAndField* identifierAndField ) const
QList<caf::PdmOptionItemInfo>& options,
SummaryIdentifierAndField* identifierAndField ) const
{
if ( identifierAndField == nullptr ) return;

3
ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionEditor.cpp
View File

@@ -60,7 +60,8 @@ RiuSummaryCurveDefSelection* RiuSummaryCurveDefSelectionEditor::summaryAddressSe
///
//--------------------------------------------------------------------------------------------------
void RiuSummaryCurveDefSelectionEditor::recursivelyConfigureAndUpdateTopLevelUiOrdering(
const caf::PdmUiOrdering& topLevelUiOrdering, const QString& uiConfigName )
const caf::PdmUiOrdering& topLevelUiOrdering,
const QString& uiConfigName )
{
if ( !m_firstRowLeftLayout || !m_firstRowRightLayout ) return;

4
ApplicationCode/UserInterface/RiuTofAccumulatedPhaseFractionsPlot.cpp
View File

@@ -43,8 +43,8 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuTofAccumulatedPhaseFractionsPlot::RiuTofAccumulatedPhaseFractionsPlot(
RimTofAccumulatedPhaseFractionsPlot* plotDefinition, QWidget* parent )
RiuTofAccumulatedPhaseFractionsPlot::RiuTofAccumulatedPhaseFractionsPlot( RimTofAccumulatedPhaseFractionsPlot* plotDefinition,
QWidget* parent )
: QwtPlot( parent )
, m_watCurve( nullptr )
, m_oilCurve( nullptr )

8
ApplicationCode/UserInterface/RiuViewerCommands.cpp
View File

@@ -1271,8 +1271,12 @@ void RiuViewerCommands::findFirstItems( Rim3dView* main
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuViewerCommands::ijkFromCellIndex(
Rim3dView* mainOrComparisonView, size_t gridIdx, size_t cellIndex, size_t* i, size_t* j, size_t* k )
void RiuViewerCommands::ijkFromCellIndex( Rim3dView* mainOrComparisonView,
size_t gridIdx,
size_t cellIndex,
size_t* i,
size_t* j,
size_t* k )
{
RimEclipseView* eclipseView = dynamic_cast<RimEclipseView*>( mainOrComparisonView );
RimGeoMechView* geomView = dynamic_cast<RimGeoMechView*>( mainOrComparisonView );

8
ApplicationCode/UserInterface/RiuViewerCommands.h
View File

@@ -80,8 +80,12 @@ private:
cvf::uint firstPartTriangleIndex,
size_t* cellIndex,
size_t* gridIndex );
void ijkFromCellIndex(
Rim3dView* mainOrComparisonView, size_t gridIdx, size_t cellIndex, size_t* i, size_t* j, size_t* k );
void ijkFromCellIndex( Rim3dView* mainOrComparisonView,
size_t gridIdx,
size_t cellIndex,
size_t* i,
size_t* j,
size_t* k );
void findFirstItems( Rim3dView* mainOrComparisonView,
const std::vector<RiuPickItemInfo>& pickItemInfos,

8
ApplicationCode/UserInterface/RiuWellPathComponentPlotItem.cpp
View File

@@ -474,8 +474,12 @@ void RiuWellPathComponentPlotItem::addColumnFeature( double startX,
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QwtPlotItem* RiuWellPathComponentPlotItem::createColumnShape(
double startX, double endX, double startDepth, double endDepth, cvf::Color4f baseColor, Qt::BrushStyle brushStyle )
QwtPlotItem* RiuWellPathComponentPlotItem::createColumnShape( double startX,
double endX,
double startDepth,
double endDepth,
cvf::Color4f baseColor,
Qt::BrushStyle brushStyle )
{
QwtPlotShapeItem* columnShape = new QwtPlotShapeItem( label() );
QPolygonF polygon;