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

#5207 Curve Calculator : Move dialog to RiuPlotMainWindow

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ApplicationCode/Commands/SummaryPlotCommands/RicShowSummaryCurveCalculatorFeature.cpp
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;
}
//--------------------------------------------------------------------------------------------------

14
ApplicationCode/UserInterface/RiuPlotMainWindow.cpp
View File

@ -37,6 +37,7 @@
#include "RimWellLogPlot.h"
#include "RimWellRftPlot.h"
#include "SummaryPlotCommands/RicSummaryCurveCalculatorDialog.h"
#include "SummaryPlotCommands/RicSummaryCurveCreatorDialog.h"
#include "RiuDockWidgetTools.h"
@ -654,6 +655,19 @@ RicSummaryCurveCreatorDialog* RiuPlotMainWindow::summaryCurveCreatorDialog()
return m_summaryCurveCreatorDialog;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicSummaryCurveCalculatorDialog* RiuPlotMainWindow::summaryCurveCalculatorDialog()
{
if ( m_summaryCurveCalculatorDialog.isNull() )
{
m_summaryCurveCalculatorDialog = new RicSummaryCurveCalculatorDialog( this );
}
return m_summaryCurveCalculatorDialog;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

7
ApplicationCode/UserInterface/RiuPlotMainWindow.h
View File

@ -35,6 +35,7 @@ class RiuViewer;
struct RimMdiWindowGeometry;
class RimViewWindow;
class RicSummaryCurveCreatorDialog;
class RicSummaryCurveCalculatorDialog;
namespace caf
{
@ -87,7 +88,8 @@ public:
void updateSummaryPlotToolBar( bool forceUpdateUi = false );
void setFocusToLineEditInSummaryToolBar();
RicSummaryCurveCreatorDialog* summaryCurveCreatorDialog();
RicSummaryCurveCreatorDialog* summaryCurveCreatorDialog();
RicSummaryCurveCalculatorDialog* summaryCurveCalculatorDialog();
protected:
void closeEvent( QCloseEvent* event ) override;
@ -132,7 +134,8 @@ private:
caf::PdmUiPropertyView* m_pdmUiPropertyView;
QPointer<RicSummaryCurveCreatorDialog> m_summaryCurveCreatorDialog;
QPointer<RicSummaryCurveCreatorDialog> m_summaryCurveCreatorDialog;
QPointer<RicSummaryCurveCalculatorDialog> m_summaryCurveCalculatorDialog;
std::vector<QWidget*> m_temporaryWidgets;
};