diff --git a/ApplicationCode/Commands/SummaryPlotCommands/CMakeLists_files.cmake b/ApplicationCode/Commands/SummaryPlotCommands/CMakeLists_files.cmake index 44e03b48fe..e7a9ddc242 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/CMakeLists_files.cmake +++ b/ApplicationCode/Commands/SummaryPlotCommands/CMakeLists_files.cmake @@ -30,7 +30,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RicSummaryPlotEditorDialog.h ${CMAKE_CURRENT_LIST_DIR}/RicShowSummaryCurveCalculatorFeature.h ${CMAKE_CURRENT_LIST_DIR}/RicEditSummaryCurveCalculationFeature.h ${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCalculatorDialog.h -${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCalculatorEditor.h +${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCalculatorWidgetCreator.h ${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCalculator.h ${CMAKE_CURRENT_LIST_DIR}/RicNewSummaryCrossPlotCurveFeature.h ${CMAKE_CURRENT_LIST_DIR}/RicNewSummaryEnsembleCurveSetFeature.h @@ -76,7 +76,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RicSummaryPlotEditorDialog.cpp ${CMAKE_CURRENT_LIST_DIR}/RicShowSummaryCurveCalculatorFeature.cpp ${CMAKE_CURRENT_LIST_DIR}/RicEditSummaryCurveCalculationFeature.cpp ${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCalculatorDialog.cpp -${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCalculatorEditor.cpp +${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCalculatorWidgetCreator.cpp ${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCalculator.cpp ${CMAKE_CURRENT_LIST_DIR}/RicNewSummaryCrossPlotCurveFeature.cpp ${CMAKE_CURRENT_LIST_DIR}/RicNewSummaryEnsembleCurveSetFeature.cpp @@ -102,7 +102,7 @@ ${SOURCE_GROUP_SOURCE_FILES} list(APPEND QT_MOC_HEADERS ${CMAKE_CURRENT_LIST_DIR}/RicSummaryPlotEditorWidgetCreator.h ${CMAKE_CURRENT_LIST_DIR}/RicSummaryPlotEditorDialog.h -${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCalculatorEditor.h +${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCalculatorWidgetCreator.h ${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCalculatorDialog.h ) diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorDialog.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorDialog.cpp index b87efc9d78..5cb9b8d687 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorDialog.cpp +++ b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorDialog.cpp @@ -19,7 +19,7 @@ #include "RicSummaryCurveCalculatorDialog.h" #include "RicSummaryCurveCalculator.h" -#include "RicSummaryCurveCalculatorEditor.h" +#include "RicSummaryCurveCalculatorWidgetCreator.h" #include "RimSummaryCalculation.h" #include "RimSummaryCalculationCollection.h" @@ -115,7 +115,8 @@ void RicSummaryCurveCalculatorDialog::setUp() QVBoxLayout* mainLayout = new QVBoxLayout( this ); mainLayout->setContentsMargins( 0, 0, 0, 0 ); - m_summaryCalcEditor = std::unique_ptr( new RicSummaryCurveCalculatorEditor() ); + m_summaryCalcEditor = + std::unique_ptr( new RicSummaryCurveCalculatorWidgetCreator() ); mainLayout->addWidget( m_summaryCalcEditor->getOrCreateWidget( this ) ); QDialogButtonBox* buttonBox = new QDialogButtonBox( QDialogButtonBox::Close ); diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorDialog.h b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorDialog.h index 11190a2043..311ea12402 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorDialog.h +++ b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorDialog.h @@ -21,7 +21,7 @@ #include #include -class RicSummaryCurveCalculatorEditor; +class RicSummaryCurveCalculatorWidgetCreator; class RimSummaryCalculation; //================================================================================================== @@ -46,5 +46,5 @@ private: size_t dirtyCount() const; private: - std::unique_ptr m_summaryCalcEditor; + std::unique_ptr m_summaryCalcEditor; }; diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorEditor.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorWidgetCreator.cpp similarity index 90% rename from ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorEditor.cpp rename to ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorWidgetCreator.cpp index 0e37996611..f646414ca7 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorEditor.cpp +++ b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorWidgetCreator.cpp @@ -16,7 +16,7 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RicSummaryCurveCalculatorEditor.h" +#include "RicSummaryCurveCalculatorWidgetCreator.h" #include "RicSummaryCurveCalculator.h" #include "RimSummaryCalculation.h" @@ -34,7 +34,7 @@ //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RicSummaryCurveCalculatorEditor::RicSummaryCurveCalculatorEditor() +RicSummaryCurveCalculatorWidgetCreator::RicSummaryCurveCalculatorWidgetCreator() : m_pdmTableView( nullptr ) { m_calculator = std::unique_ptr( new RicSummaryCurveCalculator ); @@ -45,7 +45,7 @@ RicSummaryCurveCalculatorEditor::RicSummaryCurveCalculatorEditor() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RicSummaryCurveCalculatorEditor::~RicSummaryCurveCalculatorEditor() +RicSummaryCurveCalculatorWidgetCreator::~RicSummaryCurveCalculatorWidgetCreator() { if ( m_pdmTableView ) { @@ -61,8 +61,9 @@ RicSummaryCurveCalculatorEditor::~RicSummaryCurveCalculatorEditor() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicSummaryCurveCalculatorEditor::recursivelyConfigureAndUpdateTopLevelUiOrdering( const caf::PdmUiOrdering& topLevelUiOrdering, - const QString& uiConfigName ) +void RicSummaryCurveCalculatorWidgetCreator::recursivelyConfigureAndUpdateTopLevelUiOrdering( + const caf::PdmUiOrdering& topLevelUiOrdering, + const QString& uiConfigName ) { if ( !m_firstRowLeftLayout || !m_firstRowRightLayout ) return; @@ -116,7 +117,7 @@ void RicSummaryCurveCalculatorEditor::recursivelyConfigureAndUpdateTopLevelUiOrd //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QWidget* RicSummaryCurveCalculatorEditor::createWidget( QWidget* parent ) +QWidget* RicSummaryCurveCalculatorWidgetCreator::createWidget( QWidget* parent ) { m_pdmTableView = new caf::PdmUiTableView( parent ); m_pdmTableView->tableView()->setSelectionMode( QAbstractItemView::ExtendedSelection ); @@ -185,8 +186,8 @@ QWidget* RicSummaryCurveCalculatorEditor::createWidget( QWidget* parent ) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QMinimizePanel* RicSummaryCurveCalculatorEditor::updateGroupBoxWithContent( caf::PdmUiGroup* group, - const QString& uiConfigName ) +QMinimizePanel* RicSummaryCurveCalculatorWidgetCreator::updateGroupBoxWithContent( caf::PdmUiGroup* group, + const QString& uiConfigName ) { QMinimizePanel* groupBox = findOrCreateGroupBox( this->widget(), group, uiConfigName ); @@ -197,7 +198,7 @@ QMinimizePanel* RicSummaryCurveCalculatorEditor::updateGroupBoxWithContent( caf: //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RicSummaryCurveCalculator* RicSummaryCurveCalculatorEditor::calculator() const +RicSummaryCurveCalculator* RicSummaryCurveCalculatorWidgetCreator::calculator() const { return m_calculator.get(); } @@ -205,7 +206,7 @@ RicSummaryCurveCalculator* RicSummaryCurveCalculatorEditor::calculator() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicSummaryCurveCalculatorEditor::slotCalculate() +void RicSummaryCurveCalculatorWidgetCreator::slotCalculate() { m_calculator->calculate(); @@ -215,7 +216,7 @@ void RicSummaryCurveCalculatorEditor::slotCalculate() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RicSummaryCurveCalculatorEditor::slotParseExpression() +void RicSummaryCurveCalculatorWidgetCreator::slotParseExpression() { m_calculator->parseExpression(); diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorEditor.h b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorWidgetCreator.h similarity index 91% rename from ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorEditor.h rename to ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorWidgetCreator.h index 90fa9b94cf..d27c7991c7 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorEditor.h +++ b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorWidgetCreator.h @@ -41,13 +41,13 @@ class PdmUiTableView; /// /// //================================================================================================== -class RicSummaryCurveCalculatorEditor : public caf::PdmUiFormLayoutObjectEditor +class RicSummaryCurveCalculatorWidgetCreator : public caf::PdmUiFormLayoutObjectEditor { Q_OBJECT public: - RicSummaryCurveCalculatorEditor(); - ~RicSummaryCurveCalculatorEditor() override; + RicSummaryCurveCalculatorWidgetCreator(); + ~RicSummaryCurveCalculatorWidgetCreator() override; RicSummaryCurveCalculator* calculator() const;