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

#987 Summary Auto Title : Add support for auto plot title and improve curve names

Browse Source
This commit is contained in:
Magne Sjaastad
2017-12-13 07:40:37 +01:00
parent 7d39d29ca5
commit 5566acdcda
12 changed files with 437 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,14 +23,15 @@
#include "RimAsciiDataCurve.h"
#include "RimGridTimeHistoryCurve.h"
#include "RimSummaryAxisProperties.h"
#include "RimSummaryCase.h"
#include "RimSummaryCurve.h"
#include "RimSummaryCurveCollection.h"
#include "RimSummaryCurveFilter.h"
#include "RimSummaryCurvesCalculator.h"
#include "RimSummaryPlotCollection.h"
#include "RimSummaryPlotNameHelper.h"
#include "RimSummaryTimeAxisProperties.h"
#include "RimSummaryAxisProperties.h"
#include "RiuMainPlotWindow.h"
#include "RiuSummaryQwtPlot.h"
@@ -115,6 +116,8 @@ RimSummaryPlot::RimSummaryPlot()
setAsPlotMdiWindow();
m_isCrossPlot = false;
m_nameHelper.reset(new RimSummaryPlotNameHelper);
}
//--------------------------------------------------------------------------------------------------
@@ -149,6 +152,8 @@ void RimSummaryPlot::updateAxes()
{
updateTimeAxis();
}
updatePlotTitle();
}
//--------------------------------------------------------------------------------------------------
@@ -493,12 +498,29 @@ void RimSummaryPlot::updatePlotTitle()
{
if (m_isUsingAutoName)
{
m_userDefinedPlotTitle = m_summaryCurveCollection->compileAutoPlotTitle();
m_userDefinedPlotTitle = generatePlotTitle();
updateAutoNameOfCurves();
this->updateConnectedEditors();
}
updateMdiWindowTitle();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const RimSummaryPlotNameHelper* RimSummaryPlot::activePlotTitleHelper() const
{
if (m_isUsingAutoName())
{
return m_nameHelper.get();
}
return nullptr;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -1013,8 +1035,17 @@ void RimSummaryPlot::fieldChangedByUi(const caf::PdmFieldHandle* changedField, c
{
updatePlotTitle();
}
}
if (changedField == &m_isUsingAutoName && !m_isUsingAutoName)
{
// When auto name of plot is turned off, update the auto name for all curves
for (auto c : summaryCurves())
{
c->updateCurveNameNoLegendUpdate();
}
}
}
//--------------------------------------------------------------------------------------------------
///
@@ -1068,10 +1099,7 @@ void RimSummaryPlot::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering
//--------------------------------------------------------------------------------------------------
void RimSummaryPlot::onLoadDataAndUpdate()
{
if (m_isUsingAutoName)
{
m_userDefinedPlotTitle = m_summaryCurveCollection->compileAutoPlotTitle();
}
updatePlotTitle();
updateMdiWindowVisibility();
@@ -1216,11 +1244,6 @@ void RimSummaryPlot::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
m_userDefinedPlotTitle.uiCapability()->setUiReadOnly(m_isUsingAutoName);
if (m_isUsingAutoName)
{
m_userDefinedPlotTitle = m_summaryCurveCollection->compileAutoPlotTitle();
}
uiOrdering.skipRemainingFields(true);
}
@@ -1328,6 +1351,50 @@ void RimSummaryPlot::updateMdiWindowTitle()
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimSummaryPlot::generatePlotTitle()
{
std::vector<RifEclipseSummaryAddress> addresses;
std::vector<RimSummaryCase*> sumCases;
if (m_summaryCurveCollection && m_summaryCurveCollection->isCurvesVisible())
{
for (RimSummaryCurve* curve : m_summaryCurveCollection->curves())
{
if (curve->isCurveVisible())
{
addresses.push_back(curve->summaryAddressY());
sumCases.push_back(curve->summaryCaseY());
}
}
}
m_nameHelper->clear();
m_nameHelper->appendAddresses(addresses);
m_nameHelper->appendSummaryCases(sumCases);
return m_nameHelper->plotTitle();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryPlot::updateAutoNameOfCurves()
{
if (m_summaryCurveCollection->isCurvesVisible())
{
for (auto c : summaryCurves())
{
if (c->isCurveVisible())
{
c->updateCurveNameNoLegendUpdate();
}
}
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------