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

Missing clang-formatting

Browse Source
This commit is contained in:
Jacob Støren 2019-09-13 15:04:16 +02:00
parent de17127a08
commit 41f0cd9a67
1 changed files with 42 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,7 +58,7 @@ CAF_PDM_SOURCE_INIT( RimSummaryPlotFilterTextCurveSetEditor, "SummaryPlotFilterT
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimSummaryPlotFilterTextCurveSetEditor::RimSummaryPlotFilterTextCurveSetEditor() RimSummaryPlotFilterTextCurveSetEditor::RimSummaryPlotFilterTextCurveSetEditor()
: m_isFieldRecentlyChangedFromGui(false) : m_isFieldRecentlyChangedFromGui( false )
{ {
CAF_PDM_InitObject( "Curve Set Filter Text", "", "", "" ); CAF_PDM_InitObject( "Curve Set Filter Text", "", "", "" );
@ -79,7 +79,6 @@ RimSummaryPlotFilterTextCurveSetEditor::RimSummaryPlotFilterTextCurveSetEditor()
m_selectedSources.uiCapability()->setAutoAddingOptionFromValue( false ); m_selectedSources.uiCapability()->setAutoAddingOptionFromValue( false );
m_selectedSources.uiCapability()->setUiEditorTypeName( caf::PdmUiTreeSelectionEditor::uiEditorTypeName() ); m_selectedSources.uiCapability()->setUiEditorTypeName( caf::PdmUiTreeSelectionEditor::uiEditorTypeName() );
m_selectedSources.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP ); m_selectedSources.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP );
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -107,7 +106,8 @@ void RimSummaryPlotFilterTextCurveSetEditor::fieldChangedByUi( const caf::PdmFie
std::set<RiaSummaryCurveDefinition> curveDefinitions; 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 ); std::vector<bool> accumulatedUsedFilters( allCurveAddressFilters.size(), false );
for ( SummarySource* currSource : selectedSummarySources() ) for ( SummarySource* currSource : selectedSummarySources() )
@ -127,7 +127,8 @@ void RimSummaryPlotFilterTextCurveSetEditor::fieldChangedByUi( const caf::PdmFie
RifSummaryReaderInterface* reader = sumCase ? sumCase->summaryReader() : nullptr; RifSummaryReaderInterface* reader = sumCase ? sumCase->summaryReader() : nullptr;
if ( reader ) if ( reader )
{ {
allAddressesFromSource.insert( reader->allResultAddresses().begin(), reader->allResultAddresses().end() ); allAddressesFromSource.insert( reader->allResultAddresses().begin(),
reader->allResultAddresses().end() );
} }
} }
@ -152,7 +153,7 @@ void RimSummaryPlotFilterTextCurveSetEditor::fieldChangedByUi( const caf::PdmFie
// Find potensial grid result addresses // Find potensial grid result addresses
QRegularExpression gridAddressPattern( "^[A-Z]+:[0-9]+,[0-9]+,[0-9]+$" ); QRegularExpression gridAddressPattern( "^[A-Z]+:[0-9]+,[0-9]+,[0-9]+$" );
QStringList gridResultAddressFilters; QStringList gridResultAddressFilters;
for ( int filterIdx = 0; filterIdx < allCurveAddressFilters.size(); ++filterIdx ) for ( int filterIdx = 0; filterIdx < allCurveAddressFilters.size(); ++filterIdx )
{ {
@ -172,7 +173,7 @@ void RimSummaryPlotFilterTextCurveSetEditor::fieldChangedByUi( const caf::PdmFie
// Create Summary curves and Ensemble curvesets: // Create Summary curves and Ensemble curvesets:
for (const RiaSummaryCurveDefinition& curveDef: curveDefinitions) for ( const RiaSummaryCurveDefinition& curveDef : curveDefinitions )
{ {
if ( curveDef.isEnsembleCurve() ) if ( curveDef.isEnsembleCurve() )
{ {
@ -183,15 +184,15 @@ void RimSummaryPlotFilterTextCurveSetEditor::fieldChangedByUi( const caf::PdmFie
parentPlot->ensembleCurveSetCollection()->addCurveSet( curveSet ); parentPlot->ensembleCurveSetCollection()->addCurveSet( curveSet );
} }
else else
{ {
RimSummaryCurve* newCurve = new RimSummaryCurve(); RimSummaryCurve* newCurve = new RimSummaryCurve();
parentPlot->addCurveNoUpdate( newCurve ); parentPlot->addCurveNoUpdate( newCurve );
if ( curveDef.summaryCase() ) if ( curveDef.summaryCase() )
{ {
newCurve->setSummaryCaseY( curveDef.summaryCase() ); newCurve->setSummaryCaseY( curveDef.summaryCase() );
} }
newCurve->setSummaryAddressYAndApplyInterpolation( curveDef.summaryAddress() ); newCurve->setSummaryAddressYAndApplyInterpolation( curveDef.summaryAddress() );
} }
} }
@ -225,7 +226,8 @@ void RimSummaryPlotFilterTextCurveSetEditor::fieldChangedByUi( const caf::PdmFie
{ {
for ( RimEclipseCase* eclCase : gridCasesToPlotFrom ) 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 ) ) ) if ( !( gridCellResults && gridCellResults->resultInfo( cellResAddr.eclipseResultAddress ) ) )
{ {
RiaLogging::warning( "Could not find a restart result property with name: \"" + RiaLogging::warning( "Could not find a restart result property with name: \"" +
@ -260,7 +262,7 @@ void RimSummaryPlotFilterTextCurveSetEditor::fieldChangedByUi( const caf::PdmFie
parentPlot->updateConnectedEditors(); parentPlot->updateConnectedEditors();
} }
if (changedField == &m_curveFilterText) if ( changedField == &m_curveFilterText )
{ {
m_curveFilterText = curveFilterTextWithoutOutdatedLabel(); m_curveFilterText = curveFilterTextWithoutOutdatedLabel();
} }
@ -269,69 +271,69 @@ void RimSummaryPlotFilterTextCurveSetEditor::fieldChangedByUi( const caf::PdmFie
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimSummaryPlotFilterTextCurveSetEditor::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) void RimSummaryPlotFilterTextCurveSetEditor::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
{ {
if(!m_isFieldRecentlyChangedFromGui) if ( !m_isFieldRecentlyChangedFromGui )
{ {
// Sync gui from existing curves // Sync gui from existing curves
RimSummaryPlot* parentPlot; RimSummaryPlot* parentPlot;
this->firstAncestorOrThisOfType( parentPlot ); this->firstAncestorOrThisOfType( parentPlot );
std::set<SummarySource*> sourcesFromExistingCurves; std::set<SummarySource*> sourcesFromExistingCurves;
std::set<RifEclipseSummaryAddress> addressesInUse; std::set<RifEclipseSummaryAddress> addressesInUse;
std::vector<RigGridCellResultAddress> gridaddressesInUse; std::vector<RigGridCellResultAddress> gridaddressesInUse;
if ( parentPlot ) if ( parentPlot )
{ {
std::vector<RimEnsembleCurveSet*> ensembleCurveSets = parentPlot->ensembleCurveSetCollection()->curveSets(); std::vector<RimEnsembleCurveSet*> ensembleCurveSets = parentPlot->ensembleCurveSetCollection()->curveSets();
for (auto ensCurvSet: ensembleCurveSets) for ( auto ensCurvSet : ensembleCurveSets )
{ {
sourcesFromExistingCurves.insert(ensCurvSet->summaryCaseCollection()); sourcesFromExistingCurves.insert( ensCurvSet->summaryCaseCollection() );
addressesInUse.insert(ensCurvSet->summaryAddress()); addressesInUse.insert( ensCurvSet->summaryAddress() );
} }
std::vector<RimSummaryCurve*> sumCurves = parentPlot->summaryCurveCollection()->curves(); std::vector<RimSummaryCurve*> sumCurves = parentPlot->summaryCurveCollection()->curves();
for (auto sumCurve: sumCurves) for ( auto sumCurve : sumCurves )
{ {
sourcesFromExistingCurves.insert(sumCurve->summaryCaseY()); sourcesFromExistingCurves.insert( sumCurve->summaryCaseY() );
addressesInUse.insert(sumCurve->summaryAddressY()); addressesInUse.insert( sumCurve->summaryAddressY() );
} }
std::vector<RimGridTimeHistoryCurve*> gridTimeHistoryCurves = parentPlot->gridTimeHistoryCurves(); std::vector<RimGridTimeHistoryCurve*> gridTimeHistoryCurves = parentPlot->gridTimeHistoryCurves();
for (auto grCurve: gridTimeHistoryCurves) for ( auto grCurve : gridTimeHistoryCurves )
{ {
RimEclipseCase* eclCase = dynamic_cast<RimEclipseCase*>(grCurve->gridCase()); RimEclipseCase* eclCase = dynamic_cast<RimEclipseCase*>( grCurve->gridCase() );
if (eclCase) if ( eclCase )
{ {
sourcesFromExistingCurves.insert(eclCase); sourcesFromExistingCurves.insert( eclCase );
gridaddressesInUse.push_back(grCurve->resultAddress()); gridaddressesInUse.push_back( grCurve->resultAddress() );
} }
} }
} }
std::vector<caf::PdmPointer<SummarySource>> usedSources(sourcesFromExistingCurves.begin(), sourcesFromExistingCurves.end());
m_selectedSources.clear(); std::vector<caf::PdmPointer<SummarySource>> usedSources( sourcesFromExistingCurves.begin(),
m_selectedSources.setValue(usedSources); sourcesFromExistingCurves.end() );
// Check if existing filtertext matches all the curves m_selectedSources.clear();
m_selectedSources.setValue( usedSources );
// Check if existing filtertext matches all the curves
// Todo: possibly check grid time history curves also // 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> accumulatedUsedFilters( allCurveAddressFilters.size(), false ); std::vector<bool> accumulatedUsedFilters( allCurveAddressFilters.size(), false );
std::vector<bool> usedFilters; std::vector<bool> usedFilters;
std::set<RifEclipseSummaryAddress> filteredAddressesFromSource; std::set<RifEclipseSummaryAddress> filteredAddressesFromSource;
RicSummaryPlotFeatureImpl::filteredSummaryAdressesFromCase( allCurveAddressFilters, RicSummaryPlotFeatureImpl::filteredSummaryAdressesFromCase( allCurveAddressFilters,
addressesInUse, addressesInUse,
&filteredAddressesFromSource, &filteredAddressesFromSource,
&usedFilters ); &usedFilters );
if (filteredAddressesFromSource != addressesInUse) if ( filteredAddressesFromSource != addressesInUse )
{ {
m_curveFilterText = FILTER_TEXT_OUTDATED_TEXT + curveFilterTextWithoutOutdatedLabel(); m_curveFilterText = FILTER_TEXT_OUTDATED_TEXT + curveFilterTextWithoutOutdatedLabel();
} }
@ -345,7 +347,7 @@ void RimSummaryPlotFilterTextCurveSetEditor::defineUiOrdering(QString uiConfigNa
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimSummaryPlotFilterTextCurveSetEditor::setupBeforeSave() void RimSummaryPlotFilterTextCurveSetEditor::setupBeforeSave()
{ {