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

Summary Plot : Do not create object editor in command feature constructor

Browse Source
This commit is contained in:
Magne Sjaastad 2017-10-26 08:07:53 +02:00
parent 5844657a47
commit dab23164df
4 changed files with 6 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryPlotFeature.cpp
View File

@ -41,7 +41,6 @@ CAF_CMD_SOURCE_INIT(RicEditSummaryPlotFeature, "RicEditSummaryPlotFeature");
//--------------------------------------------------------------------------------------------------
RicEditSummaryPlotFeature::RicEditSummaryPlotFeature()
{
m_curveCreatorFactory = RicSummaryCurveCreatorFactoryImpl::instance();
}
//--------------------------------------------------------------------------------------------------
@ -49,8 +48,8 @@ RicEditSummaryPlotFeature::RicEditSummaryPlotFeature()
//--------------------------------------------------------------------------------------------------
void RicEditSummaryPlotFeature::closeDialogAndResetTargetPlot()
{
auto dialog = m_curveCreatorFactory->dialog();
auto curveCreator = m_curveCreatorFactory->curveCreator();
auto dialog = RicSummaryCurveCreatorFactoryImpl::instance()->dialog();
auto curveCreator = RicSummaryCurveCreatorFactoryImpl::instance()->curveCreator();
if (dialog && dialog->isVisible())
{
@ -81,8 +80,8 @@ void RicEditSummaryPlotFeature::onActionTriggered(bool isChecked)
RimProject* project = RiaApplication::instance()->project();
CVF_ASSERT(project);
auto dialog = m_curveCreatorFactory->dialog();
auto curveCreator = m_curveCreatorFactory->curveCreator();
auto dialog = RicSummaryCurveCreatorFactoryImpl::instance()->dialog();
auto curveCreator = RicSummaryCurveCreatorFactoryImpl::instance()->curveCreator();
if (!dialog->isVisible())
{

9
ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryPlotFeature.h
View File

@ -19,15 +19,9 @@
#pragma once
#include "cafCmdFeature.h"
#include <QPointer>
class RicSummaryCurveCreatorFactoryImpl;
class RimSummaryPlot;
namespace caf {
class PdmUiPropertyViewDialog;
}
//==================================================================================================
///
//==================================================================================================
@ -47,7 +41,4 @@ protected:
private:
RimSummaryPlot* selectedSummaryPlot() const;
private:
RicSummaryCurveCreatorFactoryImpl* m_curveCreatorFactory;
};

12
ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryPlotFeature.cpp
View File

@ -38,14 +38,6 @@
CAF_CMD_SOURCE_INIT(RicNewSummaryPlotFeature, "RicNewSummaryPlotFeature");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicNewSummaryPlotFeature::RicNewSummaryPlotFeature()
{
m_curveCreatorFactory = RicSummaryCurveCreatorFactoryImpl::instance();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@ -62,8 +54,8 @@ void RicNewSummaryPlotFeature::onActionTriggered(bool isChecked)
RimProject* project = RiaApplication::instance()->project();
CVF_ASSERT(project);
auto dialog = m_curveCreatorFactory->dialog();
auto curveCreator = m_curveCreatorFactory->curveCreator();
auto dialog = RicSummaryCurveCreatorFactoryImpl::instance()->dialog();
auto curveCreator = RicSummaryCurveCreatorFactoryImpl::instance()->curveCreator();
if (!dialog->isVisible())
{

5
ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryPlotFeature.h
View File

@ -20,7 +20,6 @@
#include "cafCmdFeature.h"
class RicSummaryCurveCreatorFactoryImpl;
class RimSummaryPlotCollection;
class RimSummaryCase;
class RimSummaryPlot;
@ -33,7 +32,6 @@ class RicNewSummaryPlotFeature : public caf::CmdFeature
CAF_CMD_HEADER_INIT;
public:
RicNewSummaryPlotFeature();
static RimSummaryPlot* createNewSummaryPlot(RimSummaryPlotCollection* summaryPlotColl, RimSummaryCase* summaryCase);
protected:
@ -41,7 +39,4 @@ protected:
virtual bool isCommandEnabled();
virtual void onActionTriggered( bool isChecked );
virtual void setupActionLook(QAction* actionToSetup);
private:
RicSummaryCurveCreatorFactoryImpl* m_curveCreatorFactory;
};