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 : Rename to RicSummaryCurveCalculatorEditor

Browse Source
This commit is contained in:
Magne Sjaastad 2017-10-12 20:24:26 +02:00
parent 44a5605936
commit ad92b93e06
5 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,6 +26,10 @@ ${CEE_CURRENT_LIST_DIR}RicSummaryCurveCreator.h
${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}RicSummaryCurveCreatorFactoryImpl.h ${CEE_CURRENT_LIST_DIR}RicSummaryCurveCreatorFactoryImpl.h
${CEE_CURRENT_LIST_DIR}RicShowSummaryCurveCalculatorFeature.h
${CEE_CURRENT_LIST_DIR}RicSummaryCurveCalculatorDialog.h
${CEE_CURRENT_LIST_DIR}RicSummaryCurveCalculatorEditor.h
${CEE_CURRENT_LIST_DIR}RicSummaryCurveCalculator.h
) )
set (SOURCE_GROUP_SOURCE_FILES set (SOURCE_GROUP_SOURCE_FILES
@ -51,7 +55,7 @@ ${CEE_CURRENT_LIST_DIR}RicSummaryCurveCreatorDialog.cpp
${CEE_CURRENT_LIST_DIR}RicSummaryCurveCreatorFactoryImpl.cpp ${CEE_CURRENT_LIST_DIR}RicSummaryCurveCreatorFactoryImpl.cpp
${CEE_CURRENT_LIST_DIR}RicShowSummaryCurveCalculatorFeature.cpp ${CEE_CURRENT_LIST_DIR}RicShowSummaryCurveCalculatorFeature.cpp
${CEE_CURRENT_LIST_DIR}RicSummaryCurveCalculatorDialog.cpp ${CEE_CURRENT_LIST_DIR}RicSummaryCurveCalculatorDialog.cpp
${CEE_CURRENT_LIST_DIR}RicSummaryCurveCalculatorWidget.cpp ${CEE_CURRENT_LIST_DIR}RicSummaryCurveCalculatorEditor.cpp
${CEE_CURRENT_LIST_DIR}RicSummaryCurveCalculator.cpp ${CEE_CURRENT_LIST_DIR}RicSummaryCurveCalculator.cpp
) )

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

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

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

@ -19,7 +19,9 @@
#pragma once #pragma once
#include <QDialog> #include <QDialog>
#include <memory>
class RicSummaryCurveCalculatorEditor;
//================================================================================================== //==================================================================================================
/// ///
@ -34,4 +36,6 @@ public:
private: private:
void setUp(); void setUp();
private:
std::unique_ptr<RicSummaryCurveCalculatorEditor> m_summaryCalcWidget;
}; };

20
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorWidget.cpp → ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorEditor.cpp
View File

@ -16,7 +16,7 @@
// //
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
#include "RicSummaryCurveCalculatorWidget.h" #include "RicSummaryCurveCalculatorEditor.h"
#include "RicSummaryCurveCalculator.h" #include "RicSummaryCurveCalculator.h"
@ -40,7 +40,7 @@
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RicSummaryCurveCalculatorWidget::RicSummaryCurveCalculatorWidget(QWidget* parent) RicSummaryCurveCalculatorEditor::RicSummaryCurveCalculatorEditor(QWidget* parent)
{ {
m_calculator = std::unique_ptr<RicSummaryCurveCalculator>(new RicSummaryCurveCalculator); m_calculator = std::unique_ptr<RicSummaryCurveCalculator>(new RicSummaryCurveCalculator);
@ -61,15 +61,23 @@ RicSummaryCurveCalculatorWidget::RicSummaryCurveCalculatorWidget(QWidget* parent
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RicSummaryCurveCalculatorWidget::~RicSummaryCurveCalculatorWidget() RicSummaryCurveCalculatorEditor::~RicSummaryCurveCalculatorEditor()
{ {
if (m_pdmTableView)
{
m_pdmTableView->setListField(nullptr);
delete m_pdmTableView;
m_pdmTableView = nullptr;
}
this->setPdmObject(nullptr);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicSummaryCurveCalculatorWidget::recursivelyConfigureAndUpdateTopLevelUiItems(const std::vector<caf::PdmUiItem *>& topLevelUiItems, const QString& uiConfigName) void RicSummaryCurveCalculatorEditor::recursivelyConfigureAndUpdateTopLevelUiItems(const std::vector<caf::PdmUiItem *>& topLevelUiItems, const QString& uiConfigName)
{ {
if (!m_firstRowLeftLayout || !m_firstRowRightLayout) return; if (!m_firstRowLeftLayout || !m_firstRowRightLayout) return;
@ -106,7 +114,7 @@ void RicSummaryCurveCalculatorWidget::recursivelyConfigureAndUpdateTopLevelUiIte
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QWidget* RicSummaryCurveCalculatorWidget::createWidget(QWidget* parent) QWidget* RicSummaryCurveCalculatorEditor::createWidget(QWidget* parent)
{ {
QWidget* widget = new QWidget(parent); QWidget* widget = new QWidget(parent);
@ -147,7 +155,7 @@ QWidget* RicSummaryCurveCalculatorWidget::createWidget(QWidget* parent)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QMinimizePanel* RicSummaryCurveCalculatorWidget::updateGroupBoxWithContent(caf::PdmUiGroup* group, QMinimizePanel* RicSummaryCurveCalculatorEditor::updateGroupBoxWithContent(caf::PdmUiGroup* group,
const QString& uiConfigName) const QString& uiConfigName)
{ {
QMinimizePanel* groupBox = findOrCreateGroupBox(this->widget(), group, uiConfigName); QMinimizePanel* groupBox = findOrCreateGroupBox(this->widget(), group, uiConfigName);

6
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorWidget.h → ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorEditor.h
View File

@ -42,11 +42,11 @@ namespace caf {
/// ///
/// ///
//================================================================================================== //==================================================================================================
class RicSummaryCurveCalculatorWidget : public caf::PdmUiWidgetBasedObjectEditor class RicSummaryCurveCalculatorEditor : public caf::PdmUiWidgetBasedObjectEditor
{ {
public: public:
RicSummaryCurveCalculatorWidget(QWidget* parent); RicSummaryCurveCalculatorEditor(QWidget* parent);
~RicSummaryCurveCalculatorWidget(); ~RicSummaryCurveCalculatorEditor();
private: private:
virtual void recursivelyConfigureAndUpdateTopLevelUiItems(const std::vector<caf::PdmUiItem *>& topLevelUiItems, virtual void recursivelyConfigureAndUpdateTopLevelUiItems(const std::vector<caf::PdmUiItem *>& topLevelUiItems,