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

#1977 Curve Calculator : Remove parent pointer from constructor

Browse Source
This commit is contained in:
Magne Sjaastad 2017-10-12 20:39:02 +02:00
parent ad92b93e06
commit 2dd18cec6e
4 changed files with 15 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorDialog.cpp
View File

@ -50,8 +50,8 @@ void RicSummaryCurveCalculatorDialog::setUp()
QVBoxLayout* mainLayout = new QVBoxLayout(this);
mainLayout->setContentsMargins(0, 0, 0, 0);
m_summaryCalcWidget = std::unique_ptr<RicSummaryCurveCalculatorEditor>(new RicSummaryCurveCalculatorEditor(this));
mainLayout->addWidget(m_summaryCalcWidget->getOrCreateWidget(this));
m_summaryCalcEditor = std::unique_ptr<RicSummaryCurveCalculatorEditor>(new RicSummaryCurveCalculatorEditor());
mainLayout->addWidget(m_summaryCalcEditor->getOrCreateWidget(this));
QDialogButtonBox* buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
@ -59,6 +59,6 @@ void RicSummaryCurveCalculatorDialog::setUp()
mainLayout->addWidget(buttonBox);
m_summaryCalcWidget->updateUi();
m_summaryCalcEditor->updateUi();
}

2
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorDialog.h
View File

@ -37,5 +37,5 @@ private:
void setUp();
private:
std::unique_ptr<RicSummaryCurveCalculatorEditor> m_summaryCalcWidget;
std::unique_ptr<RicSummaryCurveCalculatorEditor> m_summaryCalcEditor;
};

28
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorEditor.cpp
View File

@ -19,19 +19,13 @@
#include "RicSummaryCurveCalculatorEditor.h"
#include "RicSummaryCurveCalculator.h"
#include "RiaApplication.h"
#include "RimCalculationCollection.h"
#include "RimCalculation.h"
#include "RimProject.h"
#include "cafPdmUiTableView.h"
#include "QMinimizePanel.h"
#include <QAbstractItemView>
#include <QBoxLayout>
#include <QFrame>
#include <QHeaderView>
#include <QSplitter>
#include <QTableView>
@ -40,22 +34,11 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicSummaryCurveCalculatorEditor::RicSummaryCurveCalculatorEditor(QWidget* parent)
RicSummaryCurveCalculatorEditor::RicSummaryCurveCalculatorEditor()
{
m_calculator = std::unique_ptr<RicSummaryCurveCalculator>(new RicSummaryCurveCalculator);
this->setPdmObject(m_calculator.get());
m_pdmTableView = new caf::PdmUiTableView(parent);
m_pdmTableView->tableView()->setSelectionMode(QAbstractItemView::ExtendedSelection);
m_pdmTableView->enableHeaderText(false);
RimProject* proj = RiaApplication::instance()->project();
QHeaderView* verticalHeader = m_pdmTableView->tableView()->verticalHeader();
verticalHeader->setResizeMode(QHeaderView::Interactive);
m_pdmTableView->tableView()->resizeColumnsToContents();
}
//--------------------------------------------------------------------------------------------------
@ -116,6 +99,15 @@ void RicSummaryCurveCalculatorEditor::recursivelyConfigureAndUpdateTopLevelUiIte
//--------------------------------------------------------------------------------------------------
QWidget* RicSummaryCurveCalculatorEditor::createWidget(QWidget* parent)
{
m_pdmTableView = new caf::PdmUiTableView(parent);
m_pdmTableView->tableView()->setSelectionMode(QAbstractItemView::ExtendedSelection);
m_pdmTableView->enableHeaderText(false);
QHeaderView* verticalHeader = m_pdmTableView->tableView()->verticalHeader();
verticalHeader->setResizeMode(QHeaderView::Interactive);
m_pdmTableView->tableView()->resizeColumnsToContents();
QWidget* widget = new QWidget(parent);
QVBoxLayout* mainLayout = new QVBoxLayout();

4
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorEditor.h
View File

@ -26,11 +26,9 @@
class RicSummaryCurveCalculator;
class QMinimizePanel;
class QSplitter;
class QString;
class QVBoxLayout;
class QHBoxLayout;
class QBoxLayout;
namespace caf {
class PdmUiItem;
@ -45,7 +43,7 @@ namespace caf {
class RicSummaryCurveCalculatorEditor : public caf::PdmUiWidgetBasedObjectEditor
{
public:
RicSummaryCurveCalculatorEditor(QWidget* parent);
RicSummaryCurveCalculatorEditor();
~RicSummaryCurveCalculatorEditor();
private: