#739 First crude but working version of Summary plotting

This commit is contained in:
Jacob Støren
2016-05-25 13:15:17 +02:00
parent a33929505d
commit 31e8009a6e
10 changed files with 214 additions and 28 deletions

View File

@@ -44,8 +44,8 @@ RimSummaryPlot::RimSummaryPlot()
CAF_PDM_InitField(&m_userName, "PlotDescription", QString("Summary Plot"), "Name", "", "", "");
CAF_PDM_InitFieldNoDefault(&curves, "SummaryCurves", "", "", "", "");
curves.uiCapability()->setUiHidden(true);
CAF_PDM_InitFieldNoDefault(&m_curves, "SummaryCurves", "", "", "", "");
m_curves.uiCapability()->setUiHidden(true);
}
//--------------------------------------------------------------------------------------------------
@@ -55,19 +55,7 @@ RimSummaryPlot::~RimSummaryPlot()
{
deletePlotWidget();
curves.deleteAllChildObjects();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QWidget* RimSummaryPlot::createPlotWidget(QWidget* parent)
{
assert(m_viewer.isNull());
m_viewer = new RiuResultQwtPlot(parent);
return m_viewer;
m_curves.deleteAllChildObjects();
}
//--------------------------------------------------------------------------------------------------
@@ -90,19 +78,56 @@ RiuResultQwtPlot* RimSummaryPlot::viewer()
return m_viewer;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryPlot::addCurve(RimSummaryCurve* curve)
{
if (curve)
{
m_curves.push_back(curve);
if (m_viewer)
{
curve->setParentQwtPlot(m_viewer);
}
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryPlot::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
{
if (changedField == &m_showWindow)
{
if (m_showWindow)
{
loadDataAndUpdate();
}
else
{
updateViewerWidget();
}
uiCapability()->updateUiIconFromToggleField();
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryPlot::loadDataAndUpdate()
{
m_viewer->deleteAllCurves();
updateViewerWidget();
for (size_t i = 0; i < curves.size(); i++)
for (size_t i = 0; i < m_curves.size(); i++)
{
RimSummaryCurve* curve = curves[i];
RimSummaryCurve* curve = m_curves[i];
curve->loadDataAndUpdate();
}
// Todo: Update zoom
}
//--------------------------------------------------------------------------------------------------
@@ -123,10 +148,15 @@ void RimSummaryPlot::updateViewerWidget()
if (!m_viewer)
{
m_viewer = new RiuResultQwtPlot(RiuMainWindow::instance());
for (size_t cIdx = 0; cIdx < m_curves.size(); ++cIdx )
{
m_curves[cIdx]->setParentQwtPlot(m_viewer);
}
RiuMainWindow::instance()->addViewer(m_viewer, std::vector<int>());
RiuMainWindow::instance()->setActiveViewer(m_viewer);
}
//updateViewerWidgetWindowTitle();
@@ -152,8 +182,8 @@ void RimSummaryPlot::updateViewerWidget()
//--------------------------------------------------------------------------------------------------
void RimSummaryPlot::detachAllCurves()
{
for (size_t cIdx = 0; cIdx < curves.size(); ++cIdx)
for (size_t cIdx = 0; cIdx < m_curves.size(); ++cIdx)
{
curves[cIdx]->detachQwtCurve();
m_curves[cIdx]->detachQwtCurve();
}
}