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

Curve creator. Set line style NONE for observed data curves

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2017-09-27 14:57:37 +02:00
parent 31133f31c0
commit 4f238a74b0
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreator.cpp
View File

@@ -650,7 +650,7 @@ std::set<RifEclipseSummaryAddress> RicSummaryCurveCreator::findPossibleSummaryAd
std::vector<RimSummaryCase*> cases;
for (const auto& sumCase: m_selectedCases)
{
if(dynamic_cast<RimObservedData*>(sumCase.p()) != nullptr) continue;
if(isObservedData(sumCase)) continue;
cases.push_back(sumCase);
}
return findPossibleSummaryAddresses(cases, identifierAndField);
@@ -664,7 +664,7 @@ std::set<RifEclipseSummaryAddress> RicSummaryCurveCreator::findPossibleSummaryAd
std::vector<RimSummaryCase*> obsData;
for (const auto& sumCase : m_selectedCases)
{
if (dynamic_cast<RimObservedData*>(sumCase.p()) != nullptr)
if (isObservedData(sumCase))
{
obsData.push_back(sumCase);
}
@@ -946,7 +946,6 @@ void RicSummaryCurveCreator::updatePreviewCurvesFromCurveDefinitions(const std::
const std::set<RimSummaryCurve*>& curvesToDelete)
{
RimSummaryCase* prevCase = nullptr;
RimPlotCurve::LineStyleEnum lineStyle = RimPlotCurve::STYLE_SOLID;
RimSummaryCurveAppearanceCalculator curveLookCalc(allCurveDefsToDisplay, getAllSummaryCaseNames(), getAllSummaryWellNames());
initCurveAppearanceCalculator(curveLookCalc);
@@ -967,6 +966,8 @@ void RicSummaryCurveCreator::updatePreviewCurvesFromCurveDefinitions(const std::
curve->applyCurveAutoNameSettings(*m_curveNameConfig());
m_previewPlot->addCurveNoUpdate(curve);
curveLookCalc.setupCurveLook(curve);
if(isObservedData(currentCase))
curve->setLineStyle(RimPlotCurve::STYLE_NONE);
}
m_previewPlot->loadDataAndUpdate();
@@ -1348,3 +1349,11 @@ void RicSummaryCurveCreator::updateCurveNames()
if (m_previewPlot && m_previewPlot->qwtPlot()) m_previewPlot->qwtPlot()->updateLegend();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RicSummaryCurveCreator::isObservedData(RimSummaryCase *sumCase) const
{
return dynamic_cast<RimObservedData*>(sumCase) != nullptr;
}

1
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreator.h
View File

@@ -128,6 +128,7 @@ private:
std::set<std::pair<RimSummaryCase*, RifEclipseSummaryAddress>>
allPreviewCurveDefs() const;
void createNewPlot();
bool isObservedData(RimSummaryCase *sumCase) const;
private:
caf::PdmPtrArrayField<RimSummaryCase*> m_selectedCases;