#5100 Regression Test : Move summary dialog to main plot window

This commit is contained in:
Magne Sjaastad
2019-12-05 13:32:48 +01:00
parent d6bdc53ee5
commit 2f2a2188fe
3 changed files with 28 additions and 4 deletions

View File

@@ -27,6 +27,8 @@
#include "RimSummaryPlot.h"
#include "RiuPlotMainWindow.h"
#include "cafPdmUiPropertyViewDialog.h"
#include "cafSelectionManager.h"
#include "cvfAssert.h"
@@ -62,14 +64,14 @@ void RicEditSummaryPlotFeature::closeDialogAndResetTargetPlot()
//--------------------------------------------------------------------------------------------------
RicSummaryCurveCreatorDialog* RicEditSummaryPlotFeature::curveCreatorDialog()
{
static std::unique_ptr<RicSummaryCurveCreatorDialog> singletonDialog;
RiuPlotMainWindow* mainPlotWindow = RiaGuiApplication::instance()->mainPlotWindow();
if ( !singletonDialog )
if ( mainPlotWindow )
{
singletonDialog.reset( new RicSummaryCurveCreatorDialog( nullptr ) );
return mainPlotWindow->summaryCurveCreatorDialog();
}
return singletonDialog.get();
return nullptr;
}
//--------------------------------------------------------------------------------------------------