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:
magnesj
2023-09-18 07:29:37 +00:00
committed by Magne Sjaastad
parent 806f367566
commit 0cd6cdd67e
24 changed files with 133 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationLibCode/ProjectDataModel/RimDataSourceSteppingTools.cpp
View File

@@ -74,10 +74,10 @@ void RimDataSourceSteppingTools::modifyCurrentIndex( caf::PdmValueField*
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimDataSourceSteppingTools::updateAddressIfMatching( const QVariant& oldValue,
const QVariant& newValue,
bool RimDataSourceSteppingTools::updateAddressIfMatching( const QVariant& oldValue,
const QVariant& newValue,
RifEclipseSummaryAddressDefines::SummaryCategory category,
RifEclipseSummaryAddress* adr )
RifEclipseSummaryAddress* adr )
{
if ( !adr ) return false;

6
ApplicationLibCode/ProjectDataModel/RimDataSourceSteppingTools.h
View File

@@ -36,10 +36,10 @@ public:
int indexOffset,
bool notifyChange = true );
static bool updateAddressIfMatching( const QVariant& oldValue,
const QVariant& newValue,
static bool updateAddressIfMatching( const QVariant& oldValue,
const QVariant& newValue,
RifEclipseSummaryAddressDefines::SummaryCategory category,
RifEclipseSummaryAddress* adr );
RifEclipseSummaryAddress* adr );
static bool updateHistoryAndSummaryQuantityIfMatching( const QVariant& oldValue, const QVariant& newValue, RifEclipseSummaryAddress* adr );

2
ApplicationLibCode/ProjectDataModel/RimPlotAxisPropertiesInterface.h
View File

@@ -56,7 +56,7 @@ public:
virtual std::vector<RimPlotAxisAnnotation*> annotations() const = 0;
virtual void appendAnnotation( RimPlotAxisAnnotation* annotation ) = 0;
virtual void removeAllAnnotations() = 0;
virtual RiuPlotAxis plotAxis() const = 0;
virtual RiuPlotAxis plotAxis() const = 0;
virtual double visibleRangeMin() const = 0;
virtual double visibleRangeMax() const = 0;

2
ApplicationLibCode/ProjectDataModel/RimSummaryCalculation.cpp
View File

@@ -494,7 +494,7 @@ std::vector<RimSummaryCalculationAddress> RimSummaryCalculation::allAddressesFor
//--------------------------------------------------------------------------------------------------
std::vector<RimSummaryCalculationAddress>
RimSummaryCalculation::allAddressesForCategory( RifEclipseSummaryAddressDefines::SummaryCategory category,
const std::set<RifEclipseSummaryAddress>& allResultAddresses ) const
const std::set<RifEclipseSummaryAddress>& allResultAddresses ) const
{
std::vector<RimSummaryCalculationAddress> addresses;

6
ApplicationLibCode/ProjectDataModel/Summary/RimObservedSummaryData.h
View File

@@ -38,7 +38,7 @@ public:
QString caseName() const override;
QString identifierName() const;
QString identifierName() const;
RifEclipseSummaryAddressDefines::SummaryCategory summaryCategory() const;
void updateMetaData();
@@ -52,8 +52,8 @@ private:
private:
caf::PdmField<caf::AppEnum<RifEclipseSummaryAddressDefines::SummaryCategory>> m_summaryCategory;
caf::PdmField<QString> m_identifierName;
caf::PdmField<bool> m_useCustomIdentifier;
caf::PdmField<QString> m_identifierName;
caf::PdmField<bool> m_useCustomIdentifier;
caf::PdmField<QString> m_importedSummaryData;
};

4
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.cpp
View File

@@ -1100,7 +1100,7 @@ void RimSummaryMultiPlot::computeAggregatedAxisRange()
else
{
auto& [currentMin, currentMax] = axisRanges[axis->plotAxis()];
axisRanges[axis->plotAxis()] = std::make_pair( std::min( currentMin, minimum ), std::max( currentMax, maximum ) );
axisRanges[axis->plotAxis()] = std::make_pair( std::min( currentMin, minimum ), std::max( currentMax, maximum ) );
}
}
}
@@ -1139,7 +1139,7 @@ void RimSummaryMultiPlot::computeAggregatedAxisRange()
else
{
auto& [currentMin, currentMax] = axisRanges[axis->plotAxis()];
axisRanges[axis->plotAxis()] = std::make_pair( std::min( currentMin, minimum ), std::max( currentMax, maximum ) );
axisRanges[axis->plotAxis()] = std::make_pair( std::min( currentMin, minimum ), std::max( currentMax, maximum ) );
}
}
}

6
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp
View File

@@ -2980,8 +2980,7 @@ void RimSummaryPlot::setAutoScaleXEnabled( bool enabled )
{
for ( const auto& ap : m_axisPropertiesArray )
{
if ( ap->plotAxis().axis() == RiaDefines::PlotAxis::PLOT_AXIS_TOP ||
ap->plotAxis().axis() == RiaDefines::PlotAxis::PLOT_AXIS_BOTTOM )
if ( ap->plotAxis().axis() == RiaDefines::PlotAxis::PLOT_AXIS_TOP || ap->plotAxis().axis() == RiaDefines::PlotAxis::PLOT_AXIS_BOTTOM )
{
ap->setAutoZoom( enabled );
}
@@ -2995,8 +2994,7 @@ void RimSummaryPlot::setAutoScaleYEnabled( bool enabled )
{
for ( const auto& ap : m_axisPropertiesArray )
{
if ( ap->plotAxis().axis() == RiaDefines::PlotAxis::PLOT_AXIS_LEFT ||
ap->plotAxis().axis() == RiaDefines::PlotAxis::PLOT_AXIS_RIGHT )
if ( ap->plotAxis().axis() == RiaDefines::PlotAxis::PLOT_AXIS_LEFT || ap->plotAxis().axis() == RiaDefines::PlotAxis::PLOT_AXIS_RIGHT )
{
ap->setAutoZoom( enabled );
}

2
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.cpp
View File

@@ -256,7 +256,7 @@ QList<caf::PdmOptionItemInfo> RimSummaryPlotSourceStepping::calculateValueOption
else
{
SummaryCategory category = SummaryCategory::SUMMARY_INVALID;
std::string secondaryIdentifier;
std::string secondaryIdentifier;
if ( fieldNeedingOptions == &m_wellName )
{

6
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTable.cpp
View File

@@ -150,9 +150,9 @@ void RimSummaryTable::setDefaultCaseAndCategoryAndVectorName()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryTable::setFromCaseAndCategoryAndVectorName( RimSummaryCase* summaryCase,
void RimSummaryTable::setFromCaseAndCategoryAndVectorName( RimSummaryCase* summaryCase,
RifEclipseSummaryAddressDefines::SummaryCategory category,
const QString& vectorName )
const QString& vectorName )
{
m_case = summaryCase;
m_category = category;
@@ -622,7 +622,7 @@ std::set<RifEclipseSummaryAddress> RimSummaryTable::getSummaryAddressesFromReade
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::set<QString> RimSummaryTable::getCategoryVectorFromSummaryReader( const RifSummaryReaderInterface* summaryReader,
std::set<QString> RimSummaryTable::getCategoryVectorFromSummaryReader( const RifSummaryReaderInterface* summaryReader,
RifEclipseSummaryAddressDefines::SummaryCategory category ) const
{
if ( !summaryReader ) return {};

16
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTable.h
View File

@@ -59,9 +59,9 @@ public:
~RimSummaryTable() override;
void setDefaultCaseAndCategoryAndVectorName();
void setFromCaseAndCategoryAndVectorName( RimSummaryCase* summaryCase,
void setFromCaseAndCategoryAndVectorName( RimSummaryCase* summaryCase,
RifEclipseSummaryAddressDefines::SummaryCategory category,
const QString& vectorName );
const QString& vectorName );
void setDescription( const QString& description );
QString description() const override;
@@ -98,10 +98,10 @@ private:
std::pair<double, double> createLegendMinMaxValues( const double maxTableValue ) const;
QString dateFormatString() const;
std::set<RifEclipseSummaryAddress> getSummaryAddressesFromReader( const RifSummaryReaderInterface* summaryReader,
std::set<RifEclipseSummaryAddress> getSummaryAddressesFromReader( const RifSummaryReaderInterface* summaryReader,
RifEclipseSummaryAddressDefines::SummaryCategory category,
const QString& vector ) const;
std::set<QString> getCategoryVectorFromSummaryReader( const RifSummaryReaderInterface* summaryReader,
const QString& vector ) const;
std::set<QString> getCategoryVectorFromSummaryReader( const RifSummaryReaderInterface* summaryReader,
RifEclipseSummaryAddressDefines::SummaryCategory category ) const;
QString getCategoryNameFromAddress( const RifEclipseSummaryAddress& address ) const;
@@ -116,9 +116,9 @@ private:
caf::PdmPtrField<RimSummaryCase*> m_case;
caf::PdmField<caf::AppEnum<RifEclipseSummaryAddressDefines::SummaryCategory>> m_category;
caf::PdmField<QString> m_vector;
caf::PdmField<caf::AppEnum<RiaDefines::DateTimePeriod>> m_resamplingSelection;
caf::PdmField<double> m_thresholdValue;
caf::PdmField<QString> m_vector;
caf::PdmField<caf::AppEnum<RiaDefines::DateTimePeriod>> m_resamplingSelection;
caf::PdmField<double> m_thresholdValue;
caf::PdmField<std::vector<QString>> m_excludedRowsUiField;

7
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTableCollection.cpp
View File

@@ -128,10 +128,9 @@ RimSummaryTable* RimSummaryTableCollection::createDefaultSummaryTable()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryTable*
RimSummaryTableCollection::createSummaryTableFromCategoryAndVectorName( RimSummaryCase* summaryCase,
RifEclipseSummaryAddressDefines::SummaryCategory category,
const QString& vectorName )
RimSummaryTable* RimSummaryTableCollection::createSummaryTableFromCategoryAndVectorName( RimSummaryCase* summaryCase,
RifEclipseSummaryAddressDefines::SummaryCategory category,
const QString& vectorName )
{
RimSummaryTable* table = new RimSummaryTable();
table->setFromCaseAndCategoryAndVectorName( summaryCase, category, vectorName );

4
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryTableCollection.h
View File

@@ -51,9 +51,9 @@ public:
void removeTable( RimSummaryTable* table );
RimSummaryTable* createDefaultSummaryTable();
RimSummaryTable* createSummaryTableFromCategoryAndVectorName( RimSummaryCase* summaryCase,
RimSummaryTable* createSummaryTableFromCategoryAndVectorName( RimSummaryCase* summaryCase,
RifEclipseSummaryAddressDefines::SummaryCategory category,
const QString& vectorName );
const QString& vectorName );
private:
caf::PdmChildArrayField<RimSummaryTable*> m_summaryTables;