From 72889f8b0a7cc0a12587c003eb6addd26b4afc2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Tue, 18 Feb 2020 14:06:16 +0100 Subject: [PATCH] Rename RiuSummaryCurveDefSelectionEditor to RiuSummaryVectorSelectionWidgetCreator --- .../RicSummaryPlotEditorUi.cpp | 2 +- .../RicSummaryPlotEditorUi.h | 4 +-- .../RicSummaryPlotEditorWidgetCreator.cpp | 2 +- .../UserInterface/CMakeLists_files.cmake | 4 +-- .../RiuSummaryVectorSelectionDialog.cpp | 5 ++-- .../RiuSummaryVectorSelectionDialog.h | 4 +-- ...iuSummaryVectorSelectionWidgetCreator.cpp} | 27 ++++++++++--------- ... RiuSummaryVectorSelectionWidgetCreator.h} | 6 ++--- 8 files changed, 28 insertions(+), 26 deletions(-) rename ApplicationCode/UserInterface/{RiuSummaryCurveDefSelectionEditor.cpp => RiuSummaryVectorSelectionWidgetCreator.cpp} (89%) rename ApplicationCode/UserInterface/{RiuSummaryCurveDefSelectionEditor.h => RiuSummaryVectorSelectionWidgetCreator.h} (92%) diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorUi.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorUi.cpp index c082097726..272288c79a 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorUi.cpp +++ b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorUi.cpp @@ -126,7 +126,7 @@ RicSummaryPlotEditorUi::RicSummaryPlotEditorUi() m_curveNameConfig.uiCapability()->setUiHidden( true ); m_curveNameConfig.uiCapability()->setUiTreeChildrenHidden( true ); - m_summaryCurveSelectionEditor.reset( new RiuSummaryCurveDefSelectionEditor() ); + m_summaryCurveSelectionEditor.reset( new RiuSummaryVectorSelectionWidgetCreator() ); m_summaryCurveSelectionEditor->summaryAddressSelection()->setFieldChangedHandler( [this]() { this->selectionEditorFieldChanged(); } ); diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorUi.h b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorUi.h index 1097b8a791..850d071660 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorUi.h +++ b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorUi.h @@ -20,7 +20,7 @@ #include "RifEclipseSummaryAddress.h" #include "RimSummaryCurveAppearanceCalculator.h" -#include "RiuSummaryCurveDefSelectionEditor.h" +#include "RiuSummaryVectorSelectionWidgetCreator.h" #include "cafPdmChildArrayField.h" #include "cafPdmChildField.h" @@ -132,5 +132,5 @@ private: caf::PdmField m_applyButtonField; caf::PdmField m_closeButtonField; - std::unique_ptr m_summaryCurveSelectionEditor; + std::unique_ptr m_summaryCurveSelectionEditor; }; diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorWidgetCreator.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorWidgetCreator.cpp index 61ad6b010c..452e0764b6 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorWidgetCreator.cpp +++ b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorWidgetCreator.cpp @@ -24,8 +24,8 @@ #include "RimSummaryPlot.h" #include "RiuSummaryCurveDefSelection.h" -#include "RiuSummaryCurveDefSelectionEditor.h" #include "RiuSummaryCurveDefinitionKeywords.h" +#include "RiuSummaryVectorSelectionWidgetCreator.h" #include "cafPdmUiFieldEditorHandle.h" #include "cafPdmUiFieldHandle.h" diff --git a/ApplicationCode/UserInterface/CMakeLists_files.cmake b/ApplicationCode/UserInterface/CMakeLists_files.cmake index 6645cf4cbc..efdfafb5cf 100644 --- a/ApplicationCode/UserInterface/CMakeLists_files.cmake +++ b/ApplicationCode/UserInterface/CMakeLists_files.cmake @@ -70,7 +70,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RiuContextMenuLauncher.h ${CMAKE_CURRENT_LIST_DIR}/RiuSummaryCurveDefinitionKeywords.h ${CMAKE_CURRENT_LIST_DIR}/RiuSummaryCurveDefSelection.h ${CMAKE_CURRENT_LIST_DIR}/RiuSummaryVectorSelectionDialog.h -${CMAKE_CURRENT_LIST_DIR}/RiuSummaryCurveDefSelectionEditor.h +${CMAKE_CURRENT_LIST_DIR}/RiuSummaryVectorSelectionWidgetCreator.h ${CMAKE_CURRENT_LIST_DIR}/RiuSummaryQuantityNameInfoProvider.h ${CMAKE_CURRENT_LIST_DIR}/RiuExpressionContextMenuManager.h ${CMAKE_CURRENT_LIST_DIR}/RiuCalculationsContextMenuManager.h @@ -162,7 +162,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RiuPlotObjectPicker.cpp ${CMAKE_CURRENT_LIST_DIR}/RiuContextMenuLauncher.cpp ${CMAKE_CURRENT_LIST_DIR}/RiuSummaryCurveDefSelection.cpp ${CMAKE_CURRENT_LIST_DIR}/RiuSummaryVectorSelectionDialog.cpp -${CMAKE_CURRENT_LIST_DIR}/RiuSummaryCurveDefSelectionEditor.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuSummaryVectorSelectionWidgetCreator.cpp ${CMAKE_CURRENT_LIST_DIR}/RiuSummaryQuantityNameInfoProvider.cpp ${CMAKE_CURRENT_LIST_DIR}/RiuExpressionContextMenuManager.cpp ${CMAKE_CURRENT_LIST_DIR}/RiuCalculationsContextMenuManager.cpp diff --git a/ApplicationCode/UserInterface/RiuSummaryVectorSelectionDialog.cpp b/ApplicationCode/UserInterface/RiuSummaryVectorSelectionDialog.cpp index 9d92a443fa..499148eec7 100644 --- a/ApplicationCode/UserInterface/RiuSummaryVectorSelectionDialog.cpp +++ b/ApplicationCode/UserInterface/RiuSummaryVectorSelectionDialog.cpp @@ -23,7 +23,7 @@ #include "RimSummaryCaseCollection.h" #include "RiuSummaryCurveDefSelection.h" -#include "RiuSummaryCurveDefSelectionEditor.h" +#include "RiuSummaryVectorSelectionWidgetCreator.h" #include "RiuTools.h" #include @@ -37,7 +37,8 @@ RiuSummaryVectorSelectionDialog::RiuSummaryVectorSelectionDialog( QWidget* parent ) : QDialog( parent, RiuTools::defaultDialogFlags() ) { - m_addrSelWidget = std::unique_ptr( new RiuSummaryCurveDefSelectionEditor() ); + m_addrSelWidget = + std::unique_ptr( new RiuSummaryVectorSelectionWidgetCreator() ); QWidget* addrWidget = m_addrSelWidget->getOrCreateWidget( this ); QVBoxLayout* mainLayout = new QVBoxLayout( this ); diff --git a/ApplicationCode/UserInterface/RiuSummaryVectorSelectionDialog.h b/ApplicationCode/UserInterface/RiuSummaryVectorSelectionDialog.h index 5dbb661b3e..ebba15ef2a 100644 --- a/ApplicationCode/UserInterface/RiuSummaryVectorSelectionDialog.h +++ b/ApplicationCode/UserInterface/RiuSummaryVectorSelectionDialog.h @@ -27,7 +27,7 @@ class QLabel; class RiuSummaryCurveDefSelection; -class RiuSummaryCurveDefSelectionEditor; +class RiuSummaryVectorSelectionWidgetCreator; //================================================================================================== /// @@ -51,7 +51,7 @@ private: void updateLabel(); private: - std::unique_ptr m_addrSelWidget; + std::unique_ptr m_addrSelWidget; QLabel* m_label; }; diff --git a/ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionEditor.cpp b/ApplicationCode/UserInterface/RiuSummaryVectorSelectionWidgetCreator.cpp similarity index 89% rename from ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionEditor.cpp rename to ApplicationCode/UserInterface/RiuSummaryVectorSelectionWidgetCreator.cpp index 8875cb84f5..191683b958 100644 --- a/ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionEditor.cpp +++ b/ApplicationCode/UserInterface/RiuSummaryVectorSelectionWidgetCreator.cpp @@ -16,7 +16,7 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RiuSummaryCurveDefSelectionEditor.h" +#include "RiuSummaryVectorSelectionWidgetCreator.h" #include "RiuSummaryCurveDefSelection.h" #include "RiuSummaryCurveDefinitionKeywords.h" @@ -33,7 +33,7 @@ //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RiuSummaryCurveDefSelectionEditor::RiuSummaryCurveDefSelectionEditor() +RiuSummaryVectorSelectionWidgetCreator::RiuSummaryVectorSelectionWidgetCreator() { m_summaryAddressSelection = std::unique_ptr( new RiuSummaryCurveDefSelection() ); @@ -43,7 +43,7 @@ RiuSummaryCurveDefSelectionEditor::RiuSummaryCurveDefSelectionEditor() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RiuSummaryCurveDefSelectionEditor::~RiuSummaryCurveDefSelectionEditor() +RiuSummaryVectorSelectionWidgetCreator::~RiuSummaryVectorSelectionWidgetCreator() { this->setPdmObject( nullptr ); } @@ -51,7 +51,7 @@ RiuSummaryCurveDefSelectionEditor::~RiuSummaryCurveDefSelectionEditor() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RiuSummaryCurveDefSelection* RiuSummaryCurveDefSelectionEditor::summaryAddressSelection() const +RiuSummaryCurveDefSelection* RiuSummaryVectorSelectionWidgetCreator::summaryAddressSelection() const { return m_summaryAddressSelection.get(); } @@ -59,8 +59,9 @@ RiuSummaryCurveDefSelection* RiuSummaryCurveDefSelectionEditor::summaryAddressSe //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RiuSummaryCurveDefSelectionEditor::recursivelyConfigureAndUpdateTopLevelUiOrdering( const caf::PdmUiOrdering& topLevelUiOrdering, - const QString& uiConfigName ) +void RiuSummaryVectorSelectionWidgetCreator::recursivelyConfigureAndUpdateTopLevelUiOrdering( + const caf::PdmUiOrdering& topLevelUiOrdering, + const QString& uiConfigName ) { if ( !m_firstRowLeftLayout || !m_firstRowRightLayout ) return; @@ -101,7 +102,7 @@ void RiuSummaryCurveDefSelectionEditor::recursivelyConfigureAndUpdateTopLevelUiO //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QWidget* RiuSummaryCurveDefSelectionEditor::createWidget( QWidget* parent ) +QWidget* RiuSummaryVectorSelectionWidgetCreator::createWidget( QWidget* parent ) { QWidget* widget = new QWidget( parent ); @@ -141,10 +142,10 @@ QWidget* RiuSummaryCurveDefSelectionEditor::createWidget( QWidget* parent ) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RiuSummaryCurveDefSelectionEditor::configureAndUpdateFields( int widgetStartIndex, - QBoxLayout* layout, - const std::vector& uiItems, - const QString& uiConfigName ) +void RiuSummaryVectorSelectionWidgetCreator::configureAndUpdateFields( int widgetStartIndex, + QBoxLayout* layout, + const std::vector& uiItems, + const QString& uiConfigName ) { int currentWidgetIndex = widgetStartIndex; @@ -210,8 +211,8 @@ void RiuSummaryCurveDefSelectionEditor::configureAndUpdateFields( int //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QMinimizePanel* RiuSummaryCurveDefSelectionEditor::createGroupBoxWithContent( caf::PdmUiGroup* group, - const QString& uiConfigName ) +QMinimizePanel* RiuSummaryVectorSelectionWidgetCreator::createGroupBoxWithContent( caf::PdmUiGroup* group, + const QString& uiConfigName ) { QMinimizePanel* groupBox = findOrCreateGroupBox( this->widget(), group, uiConfigName ); diff --git a/ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionEditor.h b/ApplicationCode/UserInterface/RiuSummaryVectorSelectionWidgetCreator.h similarity index 92% rename from ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionEditor.h rename to ApplicationCode/UserInterface/RiuSummaryVectorSelectionWidgetCreator.h index 6de7c3e68e..f489a5ae34 100644 --- a/ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionEditor.h +++ b/ApplicationCode/UserInterface/RiuSummaryVectorSelectionWidgetCreator.h @@ -43,11 +43,11 @@ class PdmUiItem; /// /// //================================================================================================== -class RiuSummaryCurveDefSelectionEditor : public caf::PdmUiFormLayoutObjectEditor +class RiuSummaryVectorSelectionWidgetCreator : public caf::PdmUiFormLayoutObjectEditor { public: - RiuSummaryCurveDefSelectionEditor(); - ~RiuSummaryCurveDefSelectionEditor() override; + RiuSummaryVectorSelectionWidgetCreator(); + ~RiuSummaryVectorSelectionWidgetCreator() override; RiuSummaryCurveDefSelection* summaryAddressSelection() const;