#5207 Curve Calculator : Move dialog to RiuPlotMainWindow

This commit is contained in:
Magne Sjaastad
2019-12-10 15:35:00 +01:00
parent 8e540efa37
commit 8a88208f65
3 changed files with 30 additions and 4 deletions

View File

@@ -21,9 +21,13 @@
#include "RicSummaryCurveCalculatorDialog.h"
#include "RiaApplication.h"
#include "RiaGuiApplication.h"
#include "RimProject.h"
#include "RimSummaryCalculationCollection.h"
#include "RiuPlotMainWindow.h"
#include <QAction>
CAF_CMD_SOURCE_INIT( RicShowSummaryCurveCalculatorFeature, "RicShowSummaryCurveCalculatorFeature" );
@@ -33,9 +37,14 @@ CAF_CMD_SOURCE_INIT( RicShowSummaryCurveCalculatorFeature, "RicShowSummaryCurveC
//--------------------------------------------------------------------------------------------------
RicSummaryCurveCalculatorDialog* RicShowSummaryCurveCalculatorFeature::curveCalculatorDialog()
{
static RicSummaryCurveCalculatorDialog* singleton = new RicSummaryCurveCalculatorDialog( nullptr );
RiuPlotMainWindow* mainPlotWindow = RiaGuiApplication::instance()->mainPlotWindow();
return singleton;
if ( mainPlotWindow )
{
return mainPlotWindow->summaryCurveCalculatorDialog();
}
return nullptr;
}
//--------------------------------------------------------------------------------------------------