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

#5281 Summary Plot: Ensemble curve highlight is missing in 2019.12

Browse Source
This commit is contained in:
Magne Sjaastad 2020-01-03 12:50:53 +01:00
parent 576dfa80ac
commit 10649fa444
3 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSetCollection.cpp
View File

@ -130,6 +130,25 @@ void RimEnsembleCurveSetCollection::reattachQwtCurves()
} }
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryCurve* RimEnsembleCurveSetCollection::findRimCurveFromQwtCurve( const QwtPlotCurve* qwtCurve ) const
{
for ( RimEnsembleCurveSet* curveSet : m_curveSets )
{
for ( RimSummaryCurve* rimCurve : curveSet->curves() )
{
if ( rimCurve->qwtPlotCurve() == qwtCurve )
{
return rimCurve;
}
}
}
return nullptr;
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -285,16 +304,6 @@ void RimEnsembleCurveSetCollection::deleteAllCurveSets()
m_curveSets.deleteAllChildObjects(); m_curveSets.deleteAllChildObjects();
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEnsembleCurveSetCollection::setCurrentSummaryCurveSet( RimEnsembleCurveSet* curveSet )
{
m_currentEnsembleCurveSet = curveSet;
updateConnectedEditors();
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

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

@ -47,6 +47,7 @@ public:
void detachQwtCurves(); void detachQwtCurves();
void reattachQwtCurves(); void reattachQwtCurves();
RimSummaryCurve* findRimCurveFromQwtCurve( const QwtPlotCurve* qwtCurve ) const;
RimEnsembleCurveSet* findRimCurveSetFromQwtCurve( const QwtPlotCurve* qwtCurve ) const; RimEnsembleCurveSet* findRimCurveSetFromQwtCurve( const QwtPlotCurve* qwtCurve ) const;
void addCurveSet( RimEnsembleCurveSet* curveSet ); void addCurveSet( RimEnsembleCurveSet* curveSet );
@ -58,8 +59,6 @@ public:
void deleteAllCurveSets(); void deleteAllCurveSets();
void setCurrentSummaryCurveSet( RimEnsembleCurveSet* curveSet );
// Functions related to source stepping // Functions related to source stepping
std::vector<caf::PdmFieldHandle*> fieldsToShowInToolbar(); std::vector<caf::PdmFieldHandle*> fieldsToShowInToolbar();
void setCurveSetForSourceStepping( RimEnsembleCurveSet* curve ); void setCurveSetForSourceStepping( RimEnsembleCurveSet* curve );
@ -82,6 +81,5 @@ private:
caf::PdmChildField<RimSummaryPlotSourceStepping*> m_ySourceStepping; caf::PdmChildField<RimSummaryPlotSourceStepping*> m_ySourceStepping;
caf::PdmPointer<RimEnsembleCurveSet> m_currentEnsembleCurveSet;
caf::PdmPointer<RimEnsembleCurveSet> m_curveSetForSourceStepping; caf::PdmPointer<RimEnsembleCurveSet> m_curveSetForSourceStepping;
}; };

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

@ -418,13 +418,11 @@ caf::PdmObject* RimSummaryPlot::findPdmObjectFromQwtCurve( const QwtPlotCurve* q
if ( m_ensembleCurveSetCollection ) if ( m_ensembleCurveSetCollection )
{ {
RimEnsembleCurveSet* foundCurveSet = m_ensembleCurveSetCollection->findRimCurveSetFromQwtCurve( qwtCurve ); RimSummaryCurve* foundCurve = m_ensembleCurveSetCollection->findRimCurveFromQwtCurve( qwtCurve );
if ( foundCurveSet ) if ( foundCurve )
{ {
m_ensembleCurveSetCollection->setCurrentSummaryCurveSet( foundCurveSet ); return foundCurve;
return foundCurveSet;
} }
} }
return nullptr; return nullptr;