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

#2658 Curve creator. Update curve tree view to display ensembles as well

Browse Source
This commit is contained in:
Bjørn Erik Jensen 2018-05-11 11:46:50 +02:00
parent 9b16d55ddf
commit fcea3ec40f
4 changed files with 41 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,6 +59,11 @@
CAF_PDM_SOURCE_INIT(RicSummaryCurveCreator, "RicSummaryCurveCreator"); CAF_PDM_SOURCE_INIT(RicSummaryCurveCreator, "RicSummaryCurveCreator");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const QString RicSummaryCurveCreator::CONFIGURATION_NAME = "CurveCreatorCfg";
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

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

@ -51,6 +51,9 @@ class RicSummaryCurveCreator : public caf::PdmObject
{ {
CAF_PDM_HEADER_INIT; CAF_PDM_HEADER_INIT;
public:
static const QString CONFIGURATION_NAME;
private: private:
typedef caf::AppEnum<RimSummaryCurveAppearanceCalculator::CurveAppearanceType> AppearanceTypeAppEnum; typedef caf::AppEnum<RimSummaryCurveAppearanceCalculator::CurveAppearanceType> AppearanceTypeAppEnum;

8
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreatorSplitterUi.cpp
View File

@ -19,6 +19,7 @@
#include "RicSummaryCurveCreatorSplitterUi.h" #include "RicSummaryCurveCreatorSplitterUi.h"
#include "RicSummaryCurveCreator.h" #include "RicSummaryCurveCreator.h"
#include "RimEnsembleCurveSetCollection.h"
#include "RimSummaryCurveCollection.h" #include "RimSummaryCurveCollection.h"
#include "RimSummaryPlot.h" #include "RimSummaryPlot.h"
@ -194,8 +195,11 @@ QWidget* RicSummaryCurveCreatorSplitterUi::getOrCreateCurveTreeWidget()
if (m_summaryCurveCreator) if (m_summaryCurveCreator)
{ {
RimSummaryCurveCollection* sumColl = m_summaryCurveCreator->previewPlot()->summaryCurveCollection(); RimSummaryPlot* previewPlot = m_summaryCurveCreator->previewPlot();
m_curveTreeView->setPdmItem(sumColl); m_curveTreeView->setPdmItem(previewPlot);
m_curveTreeView->setUiConfigurationName(RicSummaryCurveCreator::CONFIGURATION_NAME);
m_curveTreeView->setExpanded(previewPlot->summaryCurveCollection(), true);
m_curveTreeView->setExpanded(previewPlot->ensembleCurveSetCollection(), true);
} }
return m_curvesPanel; return m_curvesPanel;

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

@ -21,6 +21,8 @@
#include "RiaApplication.h" #include "RiaApplication.h"
#include "RiaSummaryCurveAnalyzer.h" #include "RiaSummaryCurveAnalyzer.h"
#include "SummaryPlotCommands/RicSummaryCurveCreator.h"
#include "RimAsciiDataCurve.h" #include "RimAsciiDataCurve.h"
#include "RimEnsembleCurveSet.h" #include "RimEnsembleCurveSet.h"
#include "RimGridTimeHistoryCurve.h" #include "RimGridTimeHistoryCurve.h"
@ -1186,26 +1188,37 @@ QImage RimSummaryPlot::snapshotWindowContent()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimSummaryPlot::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/) void RimSummaryPlot::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/)
{ {
caf::PdmUiTreeOrdering* axisFolder = uiTreeOrdering.add("Axes", ":/Axes16x16.png"); if (uiConfigName == RicSummaryCurveCreator::CONFIGURATION_NAME)
if (m_isCrossPlot)
{ {
axisFolder->add(&m_bottomAxisProperties); uiTreeOrdering.add(&m_summaryCurveCollection);
if (!m_isCrossPlot && !m_ensembleCurveSetCollection->curveSets().empty())
{
uiTreeOrdering.add(&m_ensembleCurveSetCollection);
}
} }
else else
{ {
axisFolder->add(&m_timeAxisProperties); caf::PdmUiTreeOrdering* axisFolder = uiTreeOrdering.add("Axes", ":/Axes16x16.png");
}
axisFolder->add(&m_leftYAxisProperties);
axisFolder->add(&m_rightYAxisProperties);
uiTreeOrdering.add(&m_summaryCurveCollection); if (m_isCrossPlot)
if (!m_isCrossPlot && !m_ensembleCurveSetCollection->curveSets().empty()) {
{ axisFolder->add(&m_bottomAxisProperties);
uiTreeOrdering.add(&m_ensembleCurveSetCollection); }
else
{
axisFolder->add(&m_timeAxisProperties);
}
axisFolder->add(&m_leftYAxisProperties);
axisFolder->add(&m_rightYAxisProperties);
uiTreeOrdering.add(&m_summaryCurveCollection);
if (!m_isCrossPlot && !m_ensembleCurveSetCollection->curveSets().empty())
{
uiTreeOrdering.add(&m_ensembleCurveSetCollection);
}
uiTreeOrdering.add(&m_gridTimeHistoryCurves);
uiTreeOrdering.add(&m_asciiDataCurves);
} }
uiTreeOrdering.add(&m_gridTimeHistoryCurves);
uiTreeOrdering.add(&m_asciiDataCurves);
uiTreeOrdering.skipRemainingChildren(true); uiTreeOrdering.skipRemainingChildren(true);
} }