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 RiuSummaryCurveDefSelectionEditor

Browse Source
This commit is contained in:
Magne Sjaastad 2017-10-12 21:07:31 +02:00
parent 2dd18cec6e
commit c2b543b375
5 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/UserInterface/CMakeLists_files.cmake
View File

@ -54,7 +54,7 @@ ${CEE_CURRENT_LIST_DIR}RiuContextMenuLauncher.h
${CEE_CURRENT_LIST_DIR}RiuSummaryCurveDefinitionKeywords.h ${CEE_CURRENT_LIST_DIR}RiuSummaryCurveDefinitionKeywords.h
${CEE_CURRENT_LIST_DIR}RiuSummaryCurveDefSelection.h ${CEE_CURRENT_LIST_DIR}RiuSummaryCurveDefSelection.h
${CEE_CURRENT_LIST_DIR}RiuSummaryCurveDefSelectionDialog.h ${CEE_CURRENT_LIST_DIR}RiuSummaryCurveDefSelectionDialog.h
${CEE_CURRENT_LIST_DIR}RiuSummaryCurveDefSelectionWidget.h ${CEE_CURRENT_LIST_DIR}RiuSummaryCurveDefSelectionEditor.h
) )
set (SOURCE_GROUP_SOURCE_FILES set (SOURCE_GROUP_SOURCE_FILES
@ -105,7 +105,7 @@ ${CEE_CURRENT_LIST_DIR}RiuPlotObjectPicker.cpp
${CEE_CURRENT_LIST_DIR}RiuContextMenuLauncher.cpp ${CEE_CURRENT_LIST_DIR}RiuContextMenuLauncher.cpp
${CEE_CURRENT_LIST_DIR}RiuSummaryCurveDefSelection.cpp ${CEE_CURRENT_LIST_DIR}RiuSummaryCurveDefSelection.cpp
${CEE_CURRENT_LIST_DIR}RiuSummaryCurveDefSelectionDialog.cpp ${CEE_CURRENT_LIST_DIR}RiuSummaryCurveDefSelectionDialog.cpp
${CEE_CURRENT_LIST_DIR}RiuSummaryCurveDefSelectionWidget.cpp ${CEE_CURRENT_LIST_DIR}RiuSummaryCurveDefSelectionEditor.cpp
) )
list(APPEND CODE_HEADER_FILES list(APPEND CODE_HEADER_FILES

4
ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionDialog.cpp
View File

@ -18,7 +18,7 @@
#include "RiuSummaryCurveDefSelectionDialog.h" #include "RiuSummaryCurveDefSelectionDialog.h"
#include "RiuSummaryCurveDefSelectionWidget.h" #include "RiuSummaryCurveDefSelectionEditor.h"
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QDialogButtonBox> #include <QDialogButtonBox>
@ -29,7 +29,7 @@
RiuSummaryCurveDefSelectionDialog::RiuSummaryCurveDefSelectionDialog(QWidget* parent) RiuSummaryCurveDefSelectionDialog::RiuSummaryCurveDefSelectionDialog(QWidget* parent)
: QDialog(parent) : QDialog(parent)
{ {
m_addrSelWidget = new RiuSummaryCurveDefSelectionWidget(this); m_addrSelWidget = std::unique_ptr<RiuSummaryCurveDefSelectionEditor>(new RiuSummaryCurveDefSelectionEditor());
QWidget* addrWidget = m_addrSelWidget->getOrCreateWidget(this); QWidget* addrWidget = m_addrSelWidget->getOrCreateWidget(this);
QVBoxLayout* mainLayout = new QVBoxLayout(this); QVBoxLayout* mainLayout = new QVBoxLayout(this);

5
ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionDialog.h
View File

@ -19,8 +19,9 @@
#pragma once #pragma once
#include <QDialog> #include <QDialog>
#include <memory>
class RiuSummaryCurveDefSelectionWidget; class RiuSummaryCurveDefSelectionEditor;
class RiuSummaryCurveDefSelection; class RiuSummaryCurveDefSelection;
//================================================================================================== //==================================================================================================
@ -36,5 +37,5 @@ public:
RiuSummaryCurveDefSelection* summaryAddressSelection() const; RiuSummaryCurveDefSelection* summaryAddressSelection() const;
private: private:
RiuSummaryCurveDefSelectionWidget* m_addrSelWidget; std::unique_ptr<RiuSummaryCurveDefSelectionEditor> m_addrSelWidget;
}; };

18
ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionWidget.cpp → ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionEditor.cpp
View File

@ -16,7 +16,7 @@
// //
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
#include "RiuSummaryCurveDefSelectionWidget.h" #include "RiuSummaryCurveDefSelectionEditor.h"
#include "RiuSummaryCurveDefSelection.h" #include "RiuSummaryCurveDefSelection.h"
#include "RiuSummaryCurveDefinitionKeywords.h" #include "RiuSummaryCurveDefinitionKeywords.h"
@ -33,7 +33,7 @@
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RiuSummaryCurveDefSelectionWidget::RiuSummaryCurveDefSelectionWidget(QWidget* parent) RiuSummaryCurveDefSelectionEditor::RiuSummaryCurveDefSelectionEditor()
{ {
m_summaryAddressSelection = std::unique_ptr<RiuSummaryCurveDefSelection>(new RiuSummaryCurveDefSelection()); m_summaryAddressSelection = std::unique_ptr<RiuSummaryCurveDefSelection>(new RiuSummaryCurveDefSelection());
@ -43,15 +43,15 @@ RiuSummaryCurveDefSelectionWidget::RiuSummaryCurveDefSelectionWidget(QWidget* pa
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RiuSummaryCurveDefSelectionWidget::~RiuSummaryCurveDefSelectionWidget() RiuSummaryCurveDefSelectionEditor::~RiuSummaryCurveDefSelectionEditor()
{ {
this->setPdmObject(nullptr);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RiuSummaryCurveDefSelection* RiuSummaryCurveDefSelectionWidget::summaryAddressSelection() const RiuSummaryCurveDefSelection* RiuSummaryCurveDefSelectionEditor::summaryAddressSelection() const
{ {
return m_summaryAddressSelection.get(); return m_summaryAddressSelection.get();
} }
@ -59,7 +59,7 @@ RiuSummaryCurveDefSelection* RiuSummaryCurveDefSelectionWidget::summaryAddressSe
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RiuSummaryCurveDefSelectionWidget::recursivelyConfigureAndUpdateTopLevelUiItems(const std::vector<caf::PdmUiItem *>& topLevelUiItems, const QString& uiConfigName) void RiuSummaryCurveDefSelectionEditor::recursivelyConfigureAndUpdateTopLevelUiItems(const std::vector<caf::PdmUiItem *>& topLevelUiItems, const QString& uiConfigName)
{ {
if (!m_firstRowLeftLayout || !m_firstRowRightLayout) return; if (!m_firstRowLeftLayout || !m_firstRowRightLayout) return;
@ -99,7 +99,7 @@ void RiuSummaryCurveDefSelectionWidget::recursivelyConfigureAndUpdateTopLevelUiI
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QWidget* RiuSummaryCurveDefSelectionWidget::createWidget(QWidget* parent) QWidget* RiuSummaryCurveDefSelectionEditor::createWidget(QWidget* parent)
{ {
QWidget* widget = new QWidget(parent); QWidget* widget = new QWidget(parent);
@ -139,7 +139,7 @@ QWidget* RiuSummaryCurveDefSelectionWidget::createWidget(QWidget* parent)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RiuSummaryCurveDefSelectionWidget::configureAndUpdateFields(int widgetStartIndex, void RiuSummaryCurveDefSelectionEditor::configureAndUpdateFields(int widgetStartIndex,
QBoxLayout* layout, QBoxLayout* layout,
const std::vector<caf::PdmUiItem *>& uiItems, const std::vector<caf::PdmUiItem *>& uiItems,
const QString& uiConfigName) const QString& uiConfigName)
@ -209,7 +209,7 @@ void RiuSummaryCurveDefSelectionWidget::configureAndUpdateFields(int widgetStart
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QMinimizePanel* RiuSummaryCurveDefSelectionWidget::createGroupBoxWithContent(caf::PdmUiGroup* group, QMinimizePanel* RiuSummaryCurveDefSelectionEditor::createGroupBoxWithContent(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/UserInterface/RiuSummaryCurveDefSelectionWidget.h → ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionEditor.h
View File

@ -43,11 +43,11 @@ namespace caf {
/// ///
/// ///
//================================================================================================== //==================================================================================================
class RiuSummaryCurveDefSelectionWidget : public caf::PdmUiWidgetBasedObjectEditor class RiuSummaryCurveDefSelectionEditor : public caf::PdmUiWidgetBasedObjectEditor
{ {
public: public:
RiuSummaryCurveDefSelectionWidget(QWidget* parent); RiuSummaryCurveDefSelectionEditor();
~RiuSummaryCurveDefSelectionWidget(); ~RiuSummaryCurveDefSelectionEditor();
RiuSummaryCurveDefSelection* summaryAddressSelection() const; RiuSummaryCurveDefSelection* summaryAddressSelection() const;