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

#2289 Source Stepping : Rename to make it clear what summary case is used

Browse Source
This commit is contained in:
Magne Sjaastad
2017-12-21 15:25:05 +01:00
parent f3975c8986
commit 5fab8357ee
2 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -229,7 +229,7 @@ QList<caf::PdmOptionItemInfo> RimSummaryPlotSourceStepping::calculateValueOption
std::set<QString> identifierTexts; std::set<QString> identifierTexts;
RifSummaryReaderInterface* reader = summaryReader(); RifSummaryReaderInterface* reader = firstSummaryReaderForVisibleCurves();
if (reader) if (reader)
{ {
RiaSummaryCurveAnalyzer* analyzer = analyzerForReader(reader); RiaSummaryCurveAnalyzer* analyzer = analyzerForReader(reader);
@@ -457,9 +457,9 @@ void RimSummaryPlotSourceStepping::fieldChangedByUi(const caf::PdmFieldHandle* c
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RifSummaryReaderInterface* RimSummaryPlotSourceStepping::summaryReader() const RifSummaryReaderInterface* RimSummaryPlotSourceStepping::firstSummaryReaderForVisibleCurves() const
{ {
RimSummaryCase* sumCase = singleSummaryCase(); RimSummaryCase* sumCase = firstSummaryCaseForVisibleCurves();
if (sumCase) if (sumCase)
{ {
return sumCase->summaryReader(); return sumCase->summaryReader();
@@ -471,30 +471,24 @@ RifSummaryReaderInterface* RimSummaryPlotSourceStepping::summaryReader() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimSummaryCase* RimSummaryPlotSourceStepping::singleSummaryCase() const RimSummaryCase* RimSummaryPlotSourceStepping::firstSummaryCaseForVisibleCurves() const
{ {
RimSummaryCurveCollection* curveCollection = nullptr; RimSummaryCurveCollection* curveCollection = nullptr;
this->firstAncestorOrThisOfTypeAsserted(curveCollection); this->firstAncestorOrThisOfTypeAsserted(curveCollection);
std::set<RimSummaryCase*> cases;
for (auto curve : curveCollection->visibleCurves()) for (auto curve : curveCollection->visibleCurves())
{ {
if (isYAxisStepping()) if (isYAxisStepping() && curve->summaryCaseY())
{ {
cases.insert(curve->summaryCaseY()); return curve->summaryCaseY();
} }
if (isXAxisStepping()) if (isXAxisStepping() && curve->summaryCaseX())
{ {
cases.insert(curve->summaryCaseX()); return curve->summaryCaseX();
} }
} }
if (cases.size() > 0)
{
return *(cases.begin());
}
return nullptr; return nullptr;
} }

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

@@ -77,8 +77,8 @@ private:
caf::PdmUiEditorAttribute* attribute) override; caf::PdmUiEditorAttribute* attribute) override;
private: private:
RifSummaryReaderInterface* summaryReader() const; RifSummaryReaderInterface* firstSummaryReaderForVisibleCurves() const;
RimSummaryCase* singleSummaryCase() const; RimSummaryCase* firstSummaryCaseForVisibleCurves() const;
caf::PdmValueField* fieldToModify(); caf::PdmValueField* fieldToModify();
std::set<RifEclipseSummaryAddress> visibleAddressesCurveCollection() const; std::set<RifEclipseSummaryAddress> visibleAddressesCurveCollection() const;