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

4
ApplicationCode/ProjectDataModel/Summary/RimAsciiDataCurve.h
View File

@@ -71,9 +71,7 @@ protected:
private:
bool curveData( std::vector<QDateTime>* timeSteps, std::vector<double>* values ) const;
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;
private:
// Fields

3
ApplicationCode/ProjectDataModel/Summary/RimCalculatedSummaryCase.cpp
View File

@@ -78,8 +78,7 @@ RifSummaryReaderInterface* RimCalculatedSummaryCase::summaryReader()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimCalculatedSummaryCase::updateFilePathsFromProjectPath( const QString& newProjectPath,
const QString& oldProjectPath )
void RimCalculatedSummaryCase::updateFilePathsFromProjectPath( const QString& newProjectPath, const QString& oldProjectPath )
{
// Nothing to do here
}

3
ApplicationCode/ProjectDataModel/Summary/RimCalculatedSummaryCurveReader.cpp
View File

@@ -48,8 +48,7 @@ const std::vector<time_t>& RifCalculatedSummaryCurveReader::timeSteps( const Rif
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RifCalculatedSummaryCurveReader::values( const RifEclipseSummaryAddress& resultAddress,
std::vector<double>* values ) const
bool RifCalculatedSummaryCurveReader::values( const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values ) const
{
RimSummaryCalculation* calc = findCalculationByName( resultAddress );
if ( calc )

4
ApplicationCode/ProjectDataModel/Summary/RimDerivedEnsembleCaseCollection.h
View File

@@ -63,9 +63,7 @@ private:
QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly ) 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;
void defineEditorAttribute( const caf::PdmFieldHandle* field,
QString uiConfigName,
caf::PdmUiEditorAttribute* attribute ) override;

4
ApplicationCode/ProjectDataModel/Summary/RimDerivedSummaryCase.h
View File

@@ -68,9 +68,7 @@ protected:
QString caseName() const override;
private:
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;
QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly ) override;

3
ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveFilter.cpp
View File

@@ -286,8 +286,7 @@ std::vector<RimSummaryCase*> RimEnsembleCurveFilter::applyFilter( const std::vec
if ( eParam.isNumeric() )
{
if ( !crpValue.isNumeric() || crpValue.numericValue() < m_minValue() ||
crpValue.numericValue() > m_maxValue() )
if ( !crpValue.isNumeric() || crpValue.numericValue() < m_minValue() || crpValue.numericValue() > m_maxValue() )
{
casesToRemove.insert( sumCase );
}

4
ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveFilter.h
View File

@@ -47,9 +47,7 @@ public:
QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly ) 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;
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
void defineEditorAttribute( const caf::PdmFieldHandle* field,
QString uiConfigName,

4
ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveFilterCollection.cpp
View File

@@ -193,8 +193,8 @@ void RimEnsembleCurveFilterCollection::defineUiOrdering( QString uiConfigName, c
}
}
caf::PdmUiGroup* filterGroup = group->addNewGroupWithKeyword( groupTitle,
QString( "EnsembleFilter_" ) + filter->filterId() );
caf::PdmUiGroup* filterGroup =
group->addNewGroupWithKeyword( groupTitle, QString( "EnsembleFilter_" ) + filter->filterId() );
filter->defineUiOrdering( uiConfigName, *filterGroup );
}

4
ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveFilterCollection.h
View File

@@ -44,9 +44,7 @@ public:
private:
QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly ) 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;
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /* = "" */ ) override;
void defineEditorAttribute( const caf::PdmFieldHandle* field,

19
ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp
View File

@@ -114,13 +114,7 @@ RimEnsembleCurveSet::RimEnsembleCurveSet()
m_yPushButtonSelectSummaryAddress.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN );
m_yPushButtonSelectSummaryAddress = false;
CAF_PDM_InitField( &m_colorMode,
"ColorMode",
caf::AppEnum<ColorMode>( ColorMode::SINGLE_COLOR ),
"Coloring Mode",
"",
"",
"" );
CAF_PDM_InitField( &m_colorMode, "ColorMode", caf::AppEnum<ColorMode>( ColorMode::SINGLE_COLOR ), "Coloring Mode", "", "", "" );
CAF_PDM_InitField( &m_color, "Color", cvf::Color3f( cvf::Color3::BLACK ), "Color", "", "", "" );
@@ -862,10 +856,9 @@ void RimEnsembleCurveSet::updateCurveColors()
{
if ( curve->summaryAddressY().category() == RifEclipseSummaryAddress::SUMMARY_ENSEMBLE_STATISTICS )
continue;
RimSummaryCase* rimCase = curve->summaryCaseY();
cvf::Color3f curveColor = RimEnsembleCurveSetColorManager::caseColor( m_legendConfig,
rimCase,
ensembleParam );
RimSummaryCase* rimCase = curve->summaryCaseY();
cvf::Color3f curveColor =
RimEnsembleCurveSetColorManager::caseColor( m_legendConfig, rimCase, ensembleParam );
curve->setColor( curveColor );
curve->updateCurveAppearance();
}
@@ -893,8 +886,8 @@ void RimEnsembleCurveSet::updateCurveColors()
{
if ( !m_legendOverlayFrame )
{
m_legendOverlayFrame = new RiuDraggableOverlayFrame( plot->viewer()->canvas(),
plot->viewer()->overlayMargins() );
m_legendOverlayFrame =
new RiuDraggableOverlayFrame( plot->viewer()->canvas(), plot->viewer()->overlayMargins() );
}
m_legendOverlayFrame->setContentFrame( m_legendConfig->makeLegendFrame() );
plot->viewer()->addOverlayFrame( m_legendOverlayFrame );

4
ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.h
View File

@@ -149,9 +149,7 @@ private:
void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "" ) 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;
void appendOptionItemsForSummaryAddresses( QList<caf::PdmOptionItemInfo>* options,
RimSummaryCaseCollection* summaryCaseGroup );

4
ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSetCollection.h
View File

@@ -69,9 +69,7 @@ public:
private:
caf::PdmFieldHandle* objectToggleField() 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;
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;

3
ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSetColorManager.h
View File

@@ -62,6 +62,5 @@ private:
static const std::map<RimRegularLegendConfig::ColorRangesType, cvf::Color3ubArray> m_ensembleColorRanges;
static std::map<RimEnsembleCurveSetCollection*, int> m_nextColorIndexes;
static std::map<RimEnsembleCurveSetCollection*, std::map<RimEnsembleCurveSet*, RimRegularLegendConfig::ColorRangesType>>
m_colorCache;
static std::map<RimEnsembleCurveSetCollection*, std::map<RimEnsembleCurveSet*, RimRegularLegendConfig::ColorRangesType>> m_colorCache;
};

4
ApplicationCode/ProjectDataModel/Summary/RimEnsembleStatistics.h
View File

@@ -55,9 +55,7 @@ public:
void disableP90Curve( bool disable );
void disableMeanCurve( bool disable );
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;
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
private:

5
ApplicationCode/ProjectDataModel/Summary/RimEnsembleStatisticsCase.cpp
View File

@@ -124,9 +124,8 @@ void RimEnsembleStatisticsCase::calculate( const std::vector<RimSummaryCase*>& s
auto inputAddress = m_curveSet->summaryAddress();
if ( m_statisticsReader && inputAddress.isValid() )
{
const std::vector<RimSummaryCase*>& validCases = validSummaryCases( sumCases,
inputAddress,
includeIncompleteCurves );
const std::vector<RimSummaryCase*>& validCases =
validSummaryCases( sumCases, inputAddress, includeIncompleteCurves );
calculate( validCases, inputAddress, includeIncompleteCurves );
}

4
ApplicationCode/ProjectDataModel/Summary/RimFileSummaryCase.cpp
View File

@@ -85,8 +85,8 @@ void RimFileSummaryCase::updateFilePathsFromProjectPath( const QString& newProje
//--------------------------------------------------------------------------------------------------
void RimFileSummaryCase::createSummaryReaderInterface()
{
m_summaryFileReader = RimFileSummaryCase::findRelatedFilesAndCreateReader( this->summaryHeaderFilename(),
m_includeRestartFiles );
m_summaryFileReader =
RimFileSummaryCase::findRelatedFilesAndCreateReader( this->summaryHeaderFilename(), m_includeRestartFiles );
}
//--------------------------------------------------------------------------------------------------

4
ApplicationCode/ProjectDataModel/Summary/RimGridSummaryCase.cpp
View File

@@ -175,8 +175,8 @@ void RimGridSummaryCase::updateFilePathsFromProjectPath( const QString& newProje
//--------------------------------------------------------------------------------------------------
void RimGridSummaryCase::createSummaryReaderInterface()
{
m_summaryFileReader = RimFileSummaryCase::findRelatedFilesAndCreateReader( this->summaryHeaderFilename(),
m_includeRestartFiles );
m_summaryFileReader =
RimFileSummaryCase::findRelatedFilesAndCreateReader( this->summaryHeaderFilename(), m_includeRestartFiles );
}
//--------------------------------------------------------------------------------------------------

3
ApplicationCode/ProjectDataModel/Summary/RimObservedSummaryData.cpp
View File

@@ -150,8 +150,7 @@ void RimObservedSummaryData::fieldChangedByUi( const caf::PdmFieldHandle* change
const QVariant& oldValue,
const QVariant& newValue )
{
if ( changedField == &m_useCustomIdentifier || changedField == &m_summaryCategory ||
changedField == &m_identifierName )
if ( changedField == &m_useCustomIdentifier || changedField == &m_summaryCategory || changedField == &m_identifierName )
{
createSummaryReaderInterface();

4
ApplicationCode/ProjectDataModel/Summary/RimObservedSummaryData.h
View File

@@ -50,9 +50,7 @@ protected:
private:
QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly ) 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;
private:
caf::PdmField<caf::AppEnum<RifEclipseSummaryAddress::SummaryVarCategory>> m_summaryCategory;

4
ApplicationCode/ProjectDataModel/Summary/RimSummaryCase.h
View File

@@ -74,9 +74,7 @@ public:
bool operator<( const RimSummaryCase& rhs ) const;
protected:
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;
void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "" ) override;
void updateTreeItemName();

3
ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseCollection.cpp
View File

@@ -120,7 +120,8 @@ void EnsembleParameter::sortByBinnedVariation( std::vector<NameParameterPair>& p
nameParamPair.second.variationBin = binNumber;
}
// Sort by variation bin (highest first) but keep name as sorting parameter when parameters have the same variation index
// Sort by variation bin (highest first) but keep name as sorting parameter when parameters have the same variation
// index
std::stable_sort( parameterVector.begin(),
parameterVector.end(),
[&bins]( const NameParameterPair& lhs, const NameParameterPair& rhs ) {

4
ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseCollection.h
View File

@@ -126,9 +126,7 @@ private:
void updateIcon();
void initAfterRead() 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;
protected:
virtual void onLoadDataAndUpdate();

10
ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp
View File

@@ -494,16 +494,16 @@ std::vector<RimSummaryCase*> RimSummaryCaseMainCollection::createSummaryCasesFro
for ( const RifSummaryCaseFileResultInfo& fileInfo : summaryHeaderFileInfos )
{
RimEclipseCase* eclCase = nullptr;
QString gridCaseFile = RifEclipseSummaryTools::findGridCaseFileFromSummaryHeaderFile(
fileInfo.summaryFileName() );
RimEclipseCase* eclCase = nullptr;
QString gridCaseFile =
RifEclipseSummaryTools::findGridCaseFileFromSummaryHeaderFile( fileInfo.summaryFileName() );
if ( !gridCaseFile.isEmpty() )
{
eclCase = project->eclipseCaseFromGridFileName( gridCaseFile );
}
RimGridSummaryCase* existingGridSummaryCase = dynamic_cast<RimGridSummaryCase*>(
findSummaryCaseFromFileName( fileInfo.summaryFileName() ) );
RimGridSummaryCase* existingGridSummaryCase =
dynamic_cast<RimGridSummaryCase*>( findSummaryCaseFromFileName( fileInfo.summaryFileName() ) );
if ( eclCase && !existingGridSummaryCase )
{

4
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp
View File

@@ -373,8 +373,8 @@ RiaDefines::PlotAxis RimSummaryCurve::axisY() const
QList<caf::PdmOptionItemInfo> RimSummaryCurve::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly )
{
QList<caf::PdmOptionItemInfo> options = this->RimPlotCurve::calculateValueOptions( fieldNeedingOptions,
useOptionsOnly );
QList<caf::PdmOptionItemInfo> options =
this->RimPlotCurve::calculateValueOptions( fieldNeedingOptions, useOptionsOnly );
if ( !options.isEmpty() ) return options;
if ( fieldNeedingOptions == &m_yValuesSummaryCase || fieldNeedingOptions == &m_xValuesSummaryCase )

7
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.h
View File

@@ -102,9 +102,7 @@ private:
void calculateCurveInterpolationFromAddress();
// Overridden PDM methods
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;
QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly ) override;
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
@@ -112,8 +110,7 @@ private:
QString uiConfigName,
caf::PdmUiEditorAttribute* attribute ) override;
static void appendOptionItemsForSummaryAddresses( QList<caf::PdmOptionItemInfo>* options,
RimSummaryCase* summaryCase );
static void appendOptionItemsForSummaryAddresses( QList<caf::PdmOptionItemInfo>* options, RimSummaryCase* summaryCase );
private:
// Y values

23
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveAppearanceCalculator.cpp
View File

@@ -66,8 +66,7 @@ bool isExcplicitHandled( char secondChar )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryCurveAppearanceCalculator::RimSummaryCurveAppearanceCalculator(
const std::set<RiaSummaryCurveDefinition>& curveDefinitions )
RimSummaryCurveAppearanceCalculator::RimSummaryCurveAppearanceCalculator( const std::set<RiaSummaryCurveDefinition>& curveDefinitions )
{
m_allSummaryCaseNames = getAllSummaryCaseNames();
m_allSummaryWellNames = getAllSummaryWellNames();
@@ -191,17 +190,17 @@ void RimSummaryCurveAppearanceCalculator::assignDimensions( CurveAppearanceType
void RimSummaryCurveAppearanceCalculator::updateApperanceIndices()
{
{
std::map<std::string, size_t> caseAppearanceIndices = mapNameToAppearanceIndex( m_caseAppearanceType,
m_allSummaryCaseNames );
std::map<std::string, size_t> caseAppearanceIndices =
mapNameToAppearanceIndex( m_caseAppearanceType, m_allSummaryCaseNames );
for ( auto& pair : m_caseToAppearanceIdxMap )
{
pair.second = static_cast<int>(
caseAppearanceIndices[pair.first->summaryHeaderFilename().toUtf8().constData()] );
pair.second =
static_cast<int>( caseAppearanceIndices[pair.first->summaryHeaderFilename().toUtf8().constData()] );
}
}
{
std::map<std::string, size_t> wellAppearanceIndices = mapNameToAppearanceIndex( m_wellAppearanceType,
m_allSummaryWellNames );
std::map<std::string, size_t> wellAppearanceIndices =
mapNameToAppearanceIndex( m_wellAppearanceType, m_allSummaryWellNames );
for ( auto& pair : m_welToAppearanceIdxMap )
{
pair.second = static_cast<int>( wellAppearanceIndices[pair.first] );
@@ -247,13 +246,13 @@ std::map<std::string, size_t>
}
else if ( appearance == CurveAppearanceType::SYMBOL )
{
numOptions = caf::AppEnum<RiuQwtSymbol::PointSymbolEnum>::size() -
1; // -1 since the No symbol option is not counted see cycledSymbol()
numOptions = caf::AppEnum<RiuQwtSymbol::PointSymbolEnum>::size() - 1; // -1 since the No symbol option is not
// counted see cycledSymbol()
}
else if ( appearance == CurveAppearanceType::LINE_STYLE )
{
numOptions = caf::AppEnum<RiuQwtPlotCurve::LineStyleEnum>::size() -
1; // -1 since the No symbol option is not counted see cycledLineStyle()
numOptions = caf::AppEnum<RiuQwtPlotCurve::LineStyleEnum>::size() - 1; // -1 since the No symbol option is not
// counted see cycledLineStyle()
}
else
{

4
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveAutoName.h
View File

@@ -39,9 +39,7 @@ public:
private:
friend class RimSummaryCurve;
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;
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
void appendAddressDetails( std::string& text,

4
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveCollection.cpp
View File

@@ -384,8 +384,8 @@ RimSummaryCurve* RimSummaryCurveCollection::curveForSourceStepping() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryPlotSourceStepping* RimSummaryCurveCollection::sourceSteppingObject(
RimSummaryPlotSourceStepping::SourceSteppingType sourceSteppingType ) const
RimSummaryPlotSourceStepping*
RimSummaryCurveCollection::sourceSteppingObject( RimSummaryPlotSourceStepping::SourceSteppingType sourceSteppingType ) const
{
if ( sourceSteppingType == RimSummaryPlotSourceStepping::X_AXIS )
{

4
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveCollection.h
View File

@@ -81,9 +81,7 @@ private:
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;
void defineEditorAttribute( const caf::PdmFieldHandle* field,
QString uiConfigName,

4
ApplicationCode/ProjectDataModel/Summary/RimSummaryFilter.cpp
View File

@@ -36,9 +36,7 @@ void caf::AppEnum<RimSummaryFilter_OBSOLETE::SummaryFilterType>::setUp()
addItem( RimSummaryFilter_OBSOLETE::SUM_FILTER_REGION, "SUM_FILTER_REGION", "Region" );
addItem( RimSummaryFilter_OBSOLETE::SUM_FILTER_REGION_2_REGION, "SUM_FILTER_REGION_2_REGION", "Region-Region" );
addItem( RimSummaryFilter_OBSOLETE::SUM_FILTER_WELL_LGR, "SUM_FILTER_WELL_LGR", "Lgr-Well" );
addItem( RimSummaryFilter_OBSOLETE::SUM_FILTER_WELL_COMPLETION_LGR,
"SUM_FILTER_WELL_COMPLETION_LGR",
"Lgr-Completion" );
addItem( RimSummaryFilter_OBSOLETE::SUM_FILTER_WELL_COMPLETION_LGR, "SUM_FILTER_WELL_COMPLETION_LGR", "Lgr-Completion" );
addItem( RimSummaryFilter_OBSOLETE::SUM_FILTER_BLOCK_LGR, "SUM_FILTER_BLOCK_LGR", "Lgr-Block" );
addItem( RimSummaryFilter_OBSOLETE::SUM_FILTER_MISC, "SUM_FILTER_MISC", "Misc" );
addItem( RimSummaryFilter_OBSOLETE::SUM_FILTER_AQUIFER, "SUM_FILTER_AQUIFER", "Aquifer" );

4
ApplicationCode/ProjectDataModel/Summary/RimSummaryFilter.h
View File

@@ -55,9 +55,7 @@ public:
bool isIncludedByFilter( const RifEclipseSummaryAddress& addr ) const;
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;
private:
friend class RimSummaryCurve;

37
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp
View File

@@ -132,9 +132,7 @@ void prepareCaseCurvesForExport( DateTimePeriod period,
const CurvesData& inputCurvesData,
CurvesData* resultCurvesData );
void appendToExportDataForCase( QString& out,
const std::vector<time_t>& timeSteps,
const std::vector<CurveData>& curveData );
void appendToExportDataForCase( QString& out, const std::vector<time_t>& timeSteps, const std::vector<CurveData>& curveData );
void appendToExportData( QString& out, const std::vector<CurvesData>& curvesData, bool showTimeAsLongString );
CurvesData concatCurvesData( const std::vector<CurvesData>& curvesData );
@@ -359,10 +357,7 @@ QString RimSummaryPlot::asciiDataForSummaryPlotExport( DateTimePeriod resampling
std::vector<CurvesData> exportData( 2 );
// Summary grid data for export
prepareCaseCurvesForExport( resamplingPeriod,
ResampleAlgorithm::DATA_DECIDES,
summaryCurvesGridData,
&exportData[0] );
prepareCaseCurvesForExport( resamplingPeriod, ResampleAlgorithm::DATA_DECIDES, summaryCurvesGridData, &exportData[0] );
// Time history data for export
prepareCaseCurvesForExport( resamplingPeriod, ResampleAlgorithm::PERIOD_END, timeHistoryCurvesData, &exportData[1] );
@@ -581,13 +576,15 @@ QString RimSummaryPlot::generatedPlotTitleFromAllCurves() const
void RimSummaryPlot::copyAxisPropertiesFromOther( const RimSummaryPlot& sourceSummaryPlot )
{
{
QString data = sourceSummaryPlot.yAxisPropertiesLeftOrRight( RiaDefines::PLOT_AXIS_LEFT )->writeObjectToXmlString();
QString data =
sourceSummaryPlot.yAxisPropertiesLeftOrRight( RiaDefines::PLOT_AXIS_LEFT )->writeObjectToXmlString();
yAxisPropertiesLeftOrRight( RiaDefines::PLOT_AXIS_LEFT )
->readObjectFromXmlString( data, caf::PdmDefaultObjectFactory::instance() );
}
{
QString data = sourceSummaryPlot.yAxisPropertiesLeftOrRight( RiaDefines::PLOT_AXIS_RIGHT )->writeObjectToXmlString();
QString data =
sourceSummaryPlot.yAxisPropertiesLeftOrRight( RiaDefines::PLOT_AXIS_RIGHT )->writeObjectToXmlString();
yAxisPropertiesLeftOrRight( RiaDefines::PLOT_AXIS_RIGHT )
->readObjectFromXmlString( data, caf::PdmDefaultObjectFactory::instance() );
}
@@ -673,14 +670,11 @@ void RimSummaryPlot::updatePlotInfoLabel()
//--------------------------------------------------------------------------------------------------
bool RimSummaryPlot::containsResamplableCurves() const
{
std::vector<RimSummaryCurve*> summaryCurves = summaryAndEnsembleCurves();
size_t resamplableSummaryCurveCount = std::count_if( summaryCurves.begin(),
summaryCurves.end(),
[]( RimSummaryCurve* curve ) {
return curve->summaryCaseY()
? !curve->summaryCaseY()->isObservedData()
: false;
} );
std::vector<RimSummaryCurve*> summaryCurves = summaryAndEnsembleCurves();
size_t resamplableSummaryCurveCount =
std::count_if( summaryCurves.begin(), summaryCurves.end(), []( RimSummaryCurve* curve ) {
return curve->summaryCaseY() ? !curve->summaryCaseY()->isObservedData() : false;
} );
return !m_gridTimeHistoryCurves.empty() || resamplableSummaryCurveCount > 0;
}
@@ -1938,8 +1932,8 @@ void RimSummaryPlot::handleKeyPressEvent( QKeyEvent* keyEvent )
//--------------------------------------------------------------------------------------------------
RimSummaryPlotSourceStepping* RimSummaryPlot::sourceSteppingObjectForKeyEventHandling() const
{
caf::PdmObjectHandle* selectedObj = dynamic_cast<caf::PdmObjectHandle*>(
caf::SelectionManager::instance()->selectedItem() );
caf::PdmObjectHandle* selectedObj =
dynamic_cast<caf::PdmObjectHandle*>( caf::SelectionManager::instance()->selectedItem() );
if ( selectedObj )
{
RimEnsembleCurveSetCollection* ensembleCurveSetColl = nullptr;
@@ -2262,9 +2256,8 @@ void appendToExportData( QString& out, const std::vector<CurvesData>& curvesData
}
}
auto allTimeSteps = RiaTimeHistoryCurveResampler::timeStepsFromTimeRange( data.resamplePeriod,
minTimeStep,
maxTimeStep );
auto allTimeSteps =
RiaTimeHistoryCurveResampler::timeStepsFromTimeRange( data.resamplePeriod, minTimeStep, maxTimeStep );
out += "\n\n";
out += "Date and time";

4
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.h
View File

@@ -188,9 +188,7 @@ private:
protected:
// Overridden PDM methods
caf::PdmFieldHandle* userDescriptionField() 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;
void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "" ) override;
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
void onLoadDataAndUpdate() override;

12
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotAxisFormatter.cpp
View File

@@ -147,8 +147,8 @@ void RimSummaryPlotAxisFormatter::applyAxisPropertiesToPlot( RiuSummaryQwtPlot*
{
if ( m_axisProperties->isLogarithmicScaleEnabled )
{
QwtLogScaleEngine* currentScaleEngine = dynamic_cast<QwtLogScaleEngine*>(
qwtPlot->axisScaleEngine( m_axisProperties->qwtPlotAxisType() ) );
QwtLogScaleEngine* currentScaleEngine =
dynamic_cast<QwtLogScaleEngine*>( qwtPlot->axisScaleEngine( m_axisProperties->qwtPlotAxisType() ) );
if ( !currentScaleEngine )
{
qwtPlot->setAxisScaleEngine( m_axisProperties->qwtPlotAxisType(), new QwtLogScaleEngine );
@@ -157,8 +157,8 @@ void RimSummaryPlotAxisFormatter::applyAxisPropertiesToPlot( RiuSummaryQwtPlot*
}
else
{
QwtLinearScaleEngine* currentScaleEngine = dynamic_cast<QwtLinearScaleEngine*>(
qwtPlot->axisScaleEngine( m_axisProperties->qwtPlotAxisType() ) );
QwtLinearScaleEngine* currentScaleEngine =
dynamic_cast<QwtLinearScaleEngine*>( qwtPlot->axisScaleEngine( m_axisProperties->qwtPlotAxisType() ) );
QwtDateScaleEngine* dateScaleEngine = dynamic_cast<QwtDateScaleEngine*>( currentScaleEngine );
if ( !currentScaleEngine || dateScaleEngine )
{
@@ -212,8 +212,8 @@ QString RimSummaryPlotAxisFormatter::autoAxisTitle() const
{
if ( m_axisProperties->showDescription() )
{
quantityNameForDisplay = RiuSummaryQuantityNameInfoProvider::instance()->longNameFromQuantityName(
quantityName );
quantityNameForDisplay =
RiuSummaryQuantityNameInfoProvider::instance()->longNameFromQuantityName( quantityName );
}
if ( m_axisProperties->showAcronym() )

3
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotCollection.cpp
View File

@@ -90,8 +90,7 @@ void RimSummaryPlotCollection::summaryPlotItemInfos( QList<caf::PdmOptionItemInf
for ( RimSummaryPlot* plot : summaryPlots() )
{
QString displayName = plot->description();
optionInfos->push_back(
caf::PdmOptionItemInfo( displayName, plot, false, plot->uiCapability()->uiIconProvider() ) );
optionInfos->push_back( caf::PdmOptionItemInfo( displayName, plot, false, plot->uiCapability()->uiIconProvider() ) );
}
}

12
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotFilterTextCurveSetEditor.cpp
View File

@@ -181,8 +181,8 @@ void RimSummaryPlotFilterTextCurveSetEditor::updateTextFilter()
// Check if existing filter text matches all the curves
// Todo: possibly check grid time history curves also
QStringList allCurveAddressFilters = curveFilterTextWithoutOutdatedLabel().split( QRegExp( "\\s+" ),
QString::SkipEmptyParts );
QStringList allCurveAddressFilters =
curveFilterTextWithoutOutdatedLabel().split( QRegExp( "\\s+" ), QString::SkipEmptyParts );
std::vector<bool> usedFilters;
std::set<RifEclipseSummaryAddress> filteredAddressesFromSource;
@@ -224,8 +224,8 @@ void RimSummaryPlotFilterTextCurveSetEditor::fieldChangedByUi( const caf::PdmFie
std::set<RiaSummaryCurveDefinition> curveDefinitions;
QStringList allCurveAddressFilters = curveFilterTextWithoutOutdatedLabel().split( QRegExp( "\\s+" ),
QString::SkipEmptyParts );
QStringList allCurveAddressFilters =
curveFilterTextWithoutOutdatedLabel().split( QRegExp( "\\s+" ), QString::SkipEmptyParts );
std::vector<bool> accumulatedUsedFilters( allCurveAddressFilters.size(), false );
for ( SummarySource* currSource : selectedSummarySources() )
@@ -344,8 +344,8 @@ void RimSummaryPlotFilterTextCurveSetEditor::fieldChangedByUi( const caf::PdmFie
{
for ( RimEclipseCase* eclCase : gridCasesToPlotFrom )
{
RigCaseCellResultsData* gridCellResults = eclCase->eclipseCaseData()->results(
RiaDefines::MATRIX_MODEL );
RigCaseCellResultsData* gridCellResults =
eclCase->eclipseCaseData()->results( RiaDefines::MATRIX_MODEL );
if ( !( gridCellResults && gridCellResults->resultInfo( cellResAddr.eclipseResultAddress ) ) )
{
RiaLogging::warning( "Could not find a restart result property with name: \"" +

9
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotFilterTextCurveSetEditor.h
View File

@@ -40,9 +40,7 @@ protected:
QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly ) 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;
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
void setupBeforeSave() override;
void defineEditorAttribute( const caf::PdmFieldHandle* field,
@@ -50,9 +48,8 @@ protected:
caf::PdmUiEditorAttribute* attribute ) override;
private:
static void appendOptionItemsForSources( QList<caf::PdmOptionItemInfo>& options,
bool hideSummaryCases,
bool hideEnsembles );
static void
appendOptionItemsForSources( QList<caf::PdmOptionItemInfo>& options, bool hideSummaryCases, bool hideEnsembles );
std::vector<SummarySource*> selectedSummarySources() const;
QString curveFilterTextWithoutOutdatedLabel() const;

3
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.cpp
View File

@@ -850,8 +850,7 @@ std::vector<caf::PdmFieldHandle*> RimSummaryPlotSourceStepping::computeVisibleFi
if ( analyzer.wellCompletions( m_wellName().toStdString() ).size() == 1 )
{
QString txt = QString::fromStdString(
*( analyzer.wellCompletions( m_wellName().toStdString() ).begin() ) );
QString txt = QString::fromStdString( *( analyzer.wellCompletions( m_wellName().toStdString() ).begin() ) );
m_completion = txt;
m_completion.uiCapability()->setUiHidden( false );

4
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.h
View File

@@ -72,9 +72,7 @@ private:
QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly ) 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;
void defineEditorAttribute( const caf::PdmFieldHandle* field,
QString uiConfigName,

4
ApplicationCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp
View File

@@ -681,8 +681,8 @@ void RimSummaryTimeAxisProperties::defineEditorAttribute( const caf::PdmFieldHan
auto dateAttrib = dynamic_cast<caf::PdmUiDateEditorAttribute*>( attribute );
if ( dateAttrib )
{
dateAttrib->dateFormat = RiaQDateTimeTools::dateFormatString( m_dateFormat(),
RiaQDateTimeTools::DATE_FORMAT_YEAR_MONTH_DAY );
dateAttrib->dateFormat =
RiaQDateTimeTools::dateFormatString( m_dateFormat(), RiaQDateTimeTools::DATE_FORMAT_YEAR_MONTH_DAY );
}
}
else if ( field == &m_visibleTimeRangeMin || field == &m_visibleTimeRangeMax )

12
ApplicationCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.h
View File

@@ -73,10 +73,10 @@ public:
double fromTimeTToDisplayUnitScale();
double fromDaysToDisplayUnitScale();
RiaQDateTimeTools::DateFormatComponents dateComponents(
RiaQDateTimeTools::DateFormatComponents fallback = RiaQDateTimeTools::DATE_FORMAT_UNSPECIFIED ) const;
RiaQDateTimeTools::TimeFormatComponents timeComponents(
RiaQDateTimeTools::TimeFormatComponents fallback = RiaQDateTimeTools::TIME_FORMAT_UNSPECIFIED ) const;
RiaQDateTimeTools::DateFormatComponents
dateComponents( RiaQDateTimeTools::DateFormatComponents fallback = RiaQDateTimeTools::DATE_FORMAT_UNSPECIFIED ) const;
RiaQDateTimeTools::TimeFormatComponents
timeComponents( RiaQDateTimeTools::TimeFormatComponents fallback = RiaQDateTimeTools::TIME_FORMAT_UNSPECIFIED ) const;
const QString& dateFormat() const;
const QString& timeFormat() const;
@@ -99,9 +99,7 @@ public:
void setVisibleDateTimeMax( const QDateTime& dateTime );
protected:
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;
QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly ) override;
caf::PdmFieldHandle* objectToggleField() override;