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

#2088 Curve Calculator : Use Close button instead of Ok and Cancel

Browse Source
This commit is contained in:
Magne Sjaastad 2017-11-14 07:30:49 +01:00
parent 2c8658c5c2
commit 2e6c37c266
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ApplicationCode/Commands/SummaryPlotCommands/CMakeLists_files.cmake
View File

@ -75,6 +75,7 @@ list(APPEND QT_MOC_HEADERS
${CEE_CURRENT_LIST_DIR}RicSummaryCurveCreatorSplitterUi.h ${CEE_CURRENT_LIST_DIR}RicSummaryCurveCreatorSplitterUi.h
${CEE_CURRENT_LIST_DIR}RicSummaryCurveCreatorDialog.h ${CEE_CURRENT_LIST_DIR}RicSummaryCurveCreatorDialog.h
${CEE_CURRENT_LIST_DIR}RicSummaryCurveCalculatorEditor.h ${CEE_CURRENT_LIST_DIR}RicSummaryCurveCalculatorEditor.h
${CEE_CURRENT_LIST_DIR}RicSummaryCurveCalculatorDialog.h
) )

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

@ -53,6 +53,16 @@ void RicSummaryCurveCalculatorDialog::setCalculationAndUpdateUi(RimSummaryCalcul
m_summaryCalcEditor->updateUi(); m_summaryCalcEditor->updateUi();
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicSummaryCurveCalculatorDialog::slotTryCloseDialog()
{
// Test for dirty
accept();
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -64,9 +74,8 @@ void RicSummaryCurveCalculatorDialog::setUp()
m_summaryCalcEditor = std::unique_ptr<RicSummaryCurveCalculatorEditor>(new RicSummaryCurveCalculatorEditor()); m_summaryCalcEditor = std::unique_ptr<RicSummaryCurveCalculatorEditor>(new RicSummaryCurveCalculatorEditor());
mainLayout->addWidget(m_summaryCalcEditor->getOrCreateWidget(this)); mainLayout->addWidget(m_summaryCalcEditor->getOrCreateWidget(this));
QDialogButtonBox* buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); QDialogButtonBox* buttonBox = new QDialogButtonBox(QDialogButtonBox::Close);
connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept())); connect(buttonBox, SIGNAL(rejected()), this, SLOT(slotTryCloseDialog()));
connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
mainLayout->addWidget(buttonBox); mainLayout->addWidget(buttonBox);

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

@ -30,12 +30,17 @@ class RimSummaryCalculation;
//================================================================================================== //==================================================================================================
class RicSummaryCurveCalculatorDialog : public QDialog class RicSummaryCurveCalculatorDialog : public QDialog
{ {
Q_OBJECT
public: public:
RicSummaryCurveCalculatorDialog(QWidget* parent); RicSummaryCurveCalculatorDialog(QWidget* parent);
~RicSummaryCurveCalculatorDialog(); ~RicSummaryCurveCalculatorDialog();
void setCalculationAndUpdateUi(RimSummaryCalculation* calculation); void setCalculationAndUpdateUi(RimSummaryCalculation* calculation);
private slots:
void slotTryCloseDialog();
private: private:
void setUp(); void setUp();