From 5af6b9f001184ed9effb2b5ac633b92fb47fa0f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Tue, 18 Feb 2020 13:26:32 +0100 Subject: [PATCH] Rename RicSummaryCurveCreatorSplitterUi to RicSummaryPlotEditorWidgetCreator --- .../CMakeLists_files.cmake | 6 +-- .../RicSummaryPlotEditorDialog.cpp | 4 +- .../RicSummaryPlotEditorDialog.h | 4 +- ... => RicSummaryPlotEditorWidgetCreator.cpp} | 38 +++++++++---------- ....h => RicSummaryPlotEditorWidgetCreator.h} | 6 +-- 5 files changed, 29 insertions(+), 29 deletions(-) rename ApplicationCode/Commands/SummaryPlotCommands/{RicSummaryCurveCreatorSplitterUi.cpp => RicSummaryPlotEditorWidgetCreator.cpp} (89%) rename ApplicationCode/Commands/SummaryPlotCommands/{RicSummaryCurveCreatorSplitterUi.h => RicSummaryPlotEditorWidgetCreator.h} (94%) diff --git a/ApplicationCode/Commands/SummaryPlotCommands/CMakeLists_files.cmake b/ApplicationCode/Commands/SummaryPlotCommands/CMakeLists_files.cmake index a97b523186..12da778637 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/CMakeLists_files.cmake +++ b/ApplicationCode/Commands/SummaryPlotCommands/CMakeLists_files.cmake @@ -25,7 +25,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RicPasteAsciiDataCurveFeature.h ${CMAKE_CURRENT_LIST_DIR}/RicEditSummaryPlotFeature.h ${CMAKE_CURRENT_LIST_DIR}/RicEditSummaryCrossPlotFeature.h ${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCreator.h -${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCreatorSplitterUi.h +${CMAKE_CURRENT_LIST_DIR}/RicSummaryPlotEditorWidgetCreator.h ${CMAKE_CURRENT_LIST_DIR}/RicSummaryPlotEditorDialog.h ${CMAKE_CURRENT_LIST_DIR}/RicShowSummaryCurveCalculatorFeature.h ${CMAKE_CURRENT_LIST_DIR}/RicEditSummaryCurveCalculationFeature.h @@ -71,7 +71,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RicPasteAsciiDataCurveFeature.cpp ${CMAKE_CURRENT_LIST_DIR}/RicEditSummaryPlotFeature.cpp ${CMAKE_CURRENT_LIST_DIR}/RicEditSummaryCrossPlotFeature.cpp ${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCreator.cpp -${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCreatorSplitterUi.cpp +${CMAKE_CURRENT_LIST_DIR}/RicSummaryPlotEditorWidgetCreator.cpp ${CMAKE_CURRENT_LIST_DIR}/RicSummaryPlotEditorDialog.cpp ${CMAKE_CURRENT_LIST_DIR}/RicShowSummaryCurveCalculatorFeature.cpp ${CMAKE_CURRENT_LIST_DIR}/RicEditSummaryCurveCalculationFeature.cpp @@ -100,7 +100,7 @@ ${SOURCE_GROUP_SOURCE_FILES} ) list(APPEND QT_MOC_HEADERS -${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCreatorSplitterUi.h +${CMAKE_CURRENT_LIST_DIR}/RicSummaryPlotEditorWidgetCreator.h ${CMAKE_CURRENT_LIST_DIR}/RicSummaryPlotEditorDialog.h ${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCalculatorEditor.h ${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCalculatorDialog.h diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorDialog.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorDialog.cpp index d65256b11a..6b78dafbed 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorDialog.cpp +++ b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorDialog.cpp @@ -21,7 +21,7 @@ #include "RiaGuiApplication.h" #include "RicSummaryCurveCreator.h" -#include "RicSummaryCurveCreatorSplitterUi.h" +#include "RicSummaryPlotEditorWidgetCreator.h" #include "RifReaderEclipseSummary.h" @@ -36,7 +36,7 @@ RicSummaryPlotEditorDialog::RicSummaryPlotEditorDialog( QWidget* parent ) : QDialog( parent, RiuTools::defaultDialogFlags() ) { - m_curveCreatorSplitterUi = new RicSummaryCurveCreatorSplitterUi( this ); + m_curveCreatorSplitterUi = new RicSummaryPlotEditorWidgetCreator( this ); QWidget* propertyWidget = m_curveCreatorSplitterUi->getOrCreateWidget( this ); diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorDialog.h b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorDialog.h index b4f78502ee..58b16d2f14 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorDialog.h +++ b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorDialog.h @@ -25,7 +25,7 @@ namespace caf class PdmObject; }; -class RicSummaryCurveCreatorSplitterUi; +class RicSummaryPlotEditorWidgetCreator; class RimSummaryPlot; class RimSummaryCase; @@ -47,5 +47,5 @@ private slots: void slotDialogFinished(); private: - RicSummaryCurveCreatorSplitterUi* m_curveCreatorSplitterUi; + RicSummaryPlotEditorWidgetCreator* m_curveCreatorSplitterUi; }; diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreatorSplitterUi.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorWidgetCreator.cpp similarity index 89% rename from ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreatorSplitterUi.cpp rename to ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorWidgetCreator.cpp index 52b344adbf..dfacd29ad9 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreatorSplitterUi.cpp +++ b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorWidgetCreator.cpp @@ -16,7 +16,7 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RicSummaryCurveCreatorSplitterUi.h" +#include "RicSummaryPlotEditorWidgetCreator.h" #include "RicSummaryCurveCreator.h" #include "RimEnsembleCurveSetCollection.h" @@ -42,7 +42,7 @@ //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RicSummaryCurveCreatorSplitterUi::RicSummaryCurveCreatorSplitterUi( QWidget* parent ) +RicSummaryPlotEditorWidgetCreator::RicSummaryPlotEditorWidgetCreator( QWidget* parent ) { m_parentWidget = parent; @@ -54,14 +54,14 @@ RicSummaryCurveCreatorSplitterUi::RicSummaryCurveCreatorSplitterUi( QWidget* par //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RicSummaryCurveCreatorSplitterUi::~RicSummaryCurveCreatorSplitterUi() +RicSummaryPlotEditorWidgetCreator::~RicSummaryPlotEditorWidgetCreator() { } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicSummaryCurveCreatorSplitterUi::updateFromSummaryPlot( RimSummaryPlot* summaryPlot ) +void RicSummaryPlotEditorWidgetCreator::updateFromSummaryPlot( RimSummaryPlot* summaryPlot ) { m_summaryCurveCreator->updateFromSummaryPlot( summaryPlot ); } @@ -69,7 +69,7 @@ void RicSummaryCurveCreatorSplitterUi::updateFromSummaryPlot( RimSummaryPlot* su //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicSummaryCurveCreatorSplitterUi::updateFromDefaultSources( const std::vector defaultSources ) +void RicSummaryPlotEditorWidgetCreator::updateFromDefaultSources( const std::vector defaultSources ) { m_summaryCurveCreator->updateFromSummaryPlot( nullptr, defaultSources ); } @@ -77,8 +77,8 @@ void RicSummaryCurveCreatorSplitterUi::updateFromDefaultSources( const std::vect //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicSummaryCurveCreatorSplitterUi::recursivelyConfigureAndUpdateTopLevelUiOrdering( const caf::PdmUiOrdering& topLevelUiOrdering, - const QString& uiConfigName ) +void RicSummaryPlotEditorWidgetCreator::recursivelyConfigureAndUpdateTopLevelUiOrdering( const caf::PdmUiOrdering& topLevelUiOrdering, + const QString& uiConfigName ) { const std::vector& topLevelUiItems = topLevelUiOrdering.uiItems(); if ( m_summaryCurveCreator->isCloseButtonPressed() ) @@ -116,7 +116,7 @@ void RicSummaryCurveCreatorSplitterUi::recursivelyConfigureAndUpdateTopLevelUiOr //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QWidget* RicSummaryCurveCreatorSplitterUi::createWidget( QWidget* parent ) +QWidget* RicSummaryPlotEditorWidgetCreator::createWidget( QWidget* parent ) { QWidget* widget = new QWidget( parent ); @@ -179,9 +179,9 @@ QWidget* RicSummaryCurveCreatorSplitterUi::createWidget( QWidget* parent ) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -caf::PdmUiGroup* RicSummaryCurveCreatorSplitterUi::findGroupByKeyword( const std::vector& topLevelUiItems, - const QString& keyword, - const QString& uiConfigName ) +caf::PdmUiGroup* RicSummaryPlotEditorWidgetCreator::findGroupByKeyword( const std::vector& topLevelUiItems, + const QString& keyword, + const QString& uiConfigName ) { for ( auto uiItem : topLevelUiItems ) { @@ -203,7 +203,7 @@ caf::PdmUiGroup* RicSummaryCurveCreatorSplitterUi::findGroupByKeyword( const std //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QMinimizePanel* RicSummaryCurveCreatorSplitterUi::getOrCreateCurveTreeGroup() +QMinimizePanel* RicSummaryPlotEditorWidgetCreator::getOrCreateCurveTreeGroup() { if ( !m_curvesPanel ) { @@ -234,7 +234,7 @@ QMinimizePanel* RicSummaryCurveCreatorSplitterUi::getOrCreateCurveTreeGroup() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QWidget* RicSummaryCurveCreatorSplitterUi::getOrCreatePlotWidget() +QWidget* RicSummaryPlotEditorWidgetCreator::getOrCreatePlotWidget() { if ( m_summaryCurveCreator ) { @@ -250,10 +250,10 @@ QWidget* RicSummaryCurveCreatorSplitterUi::getOrCreatePlotWidget() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicSummaryCurveCreatorSplitterUi::configureAndUpdateFields( int widgetStartIndex, - QBoxLayout* layout, - const std::vector& uiItems, - const QString& uiConfigName ) +void RicSummaryPlotEditorWidgetCreator::configureAndUpdateFields( int widgetStartIndex, + QBoxLayout* layout, + const std::vector& uiItems, + const QString& uiConfigName ) { int currentWidgetIndex = widgetStartIndex; @@ -319,8 +319,8 @@ void RicSummaryCurveCreatorSplitterUi::configureAndUpdateFields( int //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QMinimizePanel* RicSummaryCurveCreatorSplitterUi::createGroupBoxWithContent( caf::PdmUiGroup* group, - const QString& uiConfigName ) +QMinimizePanel* RicSummaryPlotEditorWidgetCreator::createGroupBoxWithContent( caf::PdmUiGroup* group, + const QString& uiConfigName ) { QMinimizePanel* groupBox = findOrCreateGroupBox( this->widget(), group, uiConfigName ); diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreatorSplitterUi.h b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorWidgetCreator.h similarity index 94% rename from ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreatorSplitterUi.h rename to ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorWidgetCreator.h index 70ffd5f80c..7acc9c78d0 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreatorSplitterUi.h +++ b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorWidgetCreator.h @@ -45,13 +45,13 @@ class PdmUiTreeView; /// /// //================================================================================================== -class RicSummaryCurveCreatorSplitterUi : public caf::PdmUiFormLayoutObjectEditor +class RicSummaryPlotEditorWidgetCreator : public caf::PdmUiFormLayoutObjectEditor { Q_OBJECT public: - RicSummaryCurveCreatorSplitterUi( QWidget* parent ); - ~RicSummaryCurveCreatorSplitterUi() override; + RicSummaryPlotEditorWidgetCreator( QWidget* parent ); + ~RicSummaryPlotEditorWidgetCreator() override; void updateFromSummaryPlot( RimSummaryPlot* summaryPlot ); void updateFromDefaultSources( const std::vector defaultSources );