From 42ffc195cefbae03357ba6b69cfc5a959de36f84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Tue, 18 Feb 2020 14:00:11 +0100 Subject: [PATCH] Rename RiuSummaryCurveDefSelectionDialog to RiuSummaryVectorSelectionDialog --- .../RimSummaryCalculationVariable.cpp | 6 ++--- .../RimSummaryCalculationVariable.h | 4 ++-- .../Summary/RimEnsembleCurveSet.cpp | 8 +++---- .../Summary/RimSummaryCurve.cpp | 14 +++++------ .../UserInterface/CMakeLists_files.cmake | 4 ++-- ...pp => RiuSummaryVectorSelectionDialog.cpp} | 24 +++++++++---------- ...og.h => RiuSummaryVectorSelectionDialog.h} | 6 ++--- 7 files changed, 33 insertions(+), 33 deletions(-) rename ApplicationCode/UserInterface/{RiuSummaryCurveDefSelectionDialog.cpp => RiuSummaryVectorSelectionDialog.cpp} (84%) rename ApplicationCode/UserInterface/{RiuSummaryCurveDefSelectionDialog.h => RiuSummaryVectorSelectionDialog.h} (91%) diff --git a/ApplicationCode/ProjectDataModel/RimSummaryCalculationVariable.cpp b/ApplicationCode/ProjectDataModel/RimSummaryCalculationVariable.cpp index c7f7f41f65..38be0de932 100644 --- a/ApplicationCode/ProjectDataModel/RimSummaryCalculationVariable.cpp +++ b/ApplicationCode/ProjectDataModel/RimSummaryCalculationVariable.cpp @@ -29,7 +29,7 @@ #include "RimSummaryCase.h" #include "RimSummaryCurve.h" -#include "RiuSummaryCurveDefSelectionDialog.h" +#include "RiuSummaryVectorSelectionDialog.h" #include "cafPdmUiPushButtonEditor.h" #include "cafPdmUiTableViewEditor.h" @@ -89,7 +89,7 @@ void RimSummaryCalculationVariable::fieldChangedByUi( const caf::PdmFieldHandle* bool updateContainingEditor = false; { - RiuSummaryCurveDefSelectionDialog dlg( nullptr ); + RiuSummaryVectorSelectionDialog dlg( nullptr ); dlg.hideEnsembles(); readDataFromApplicationStore( &dlg ); @@ -181,7 +181,7 @@ void RimSummaryCalculationVariable::defineObjectEditorAttribute( QString uiConfi //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimSummaryCalculationVariable::readDataFromApplicationStore( RiuSummaryCurveDefSelectionDialog* selectionDialog ) const +void RimSummaryCalculationVariable::readDataFromApplicationStore( RiuSummaryVectorSelectionDialog* selectionDialog ) const { if ( !selectionDialog ) return; diff --git a/ApplicationCode/ProjectDataModel/RimSummaryCalculationVariable.h b/ApplicationCode/ProjectDataModel/RimSummaryCalculationVariable.h index 8424c2b376..4ab6c8c91d 100644 --- a/ApplicationCode/ProjectDataModel/RimSummaryCalculationVariable.h +++ b/ApplicationCode/ProjectDataModel/RimSummaryCalculationVariable.h @@ -28,7 +28,7 @@ class RimSummaryCase; class RimSummaryAddress; -class RiuSummaryCurveDefSelectionDialog; +class RiuSummaryVectorSelectionDialog; //================================================================================================== /// @@ -54,7 +54,7 @@ private: void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override; void defineObjectEditorAttribute( QString uiConfigName, caf::PdmUiEditorAttribute* attribute ) override; - void readDataFromApplicationStore( RiuSummaryCurveDefSelectionDialog* selectionDialog ) const; + void readDataFromApplicationStore( RiuSummaryVectorSelectionDialog* selectionDialog ) const; void writeDataToApplicationStore() const; private: diff --git a/ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp b/ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp index 0bc8a50367..ec9acebf62 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp @@ -51,8 +51,8 @@ #include "RiuDraggableOverlayFrame.h" #include "RiuPlotMainWindow.h" #include "RiuQwtPlotCurve.h" -#include "RiuSummaryCurveDefSelectionDialog.h" #include "RiuSummaryQwtPlot.h" +#include "RiuSummaryVectorSelectionDialog.h" #include "cafPdmObject.h" #include "cafPdmUiLineEditor.h" @@ -572,9 +572,9 @@ void RimEnsembleCurveSet::fieldChangedByUi( const caf::PdmFieldHandle* changedFi } else if ( changedField == &m_yPushButtonSelectSummaryAddress ) { - RiuSummaryCurveDefSelectionDialog dlg( nullptr ); - RimSummaryCaseCollection* candidateEnsemble = m_yValuesSummaryCaseCollection(); - RifEclipseSummaryAddress candicateAddress = m_yValuesSummaryAddress->address(); + RiuSummaryVectorSelectionDialog dlg( nullptr ); + RimSummaryCaseCollection* candidateEnsemble = m_yValuesSummaryCaseCollection(); + RifEclipseSummaryAddress candicateAddress = m_yValuesSummaryAddress->address(); dlg.hideSummaryCases(); dlg.setEnsembleAndAddress( candidateEnsemble, candicateAddress ); diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp index 004492f9bb..8a5235ad2a 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp @@ -46,7 +46,7 @@ #include "RiuPlotMainWindow.h" #include "RiuQwtPlotCurve.h" -#include "RiuSummaryCurveDefSelectionDialog.h" +#include "RiuSummaryVectorSelectionDialog.h" #include "cafPdmUiComboBoxEditor.h" #include "cafPdmUiListEditor.h" @@ -932,9 +932,9 @@ void RimSummaryCurve::fieldChangedByUi( const caf::PdmFieldHandle* changedField, } else if ( changedField == &m_yPushButtonSelectSummaryAddress ) { - RiuSummaryCurveDefSelectionDialog dlg( nullptr ); - RimSummaryCase* candidateCase = m_yValuesSummaryCase(); - RifEclipseSummaryAddress candicateAddress = m_yValuesSummaryAddress->address(); + RiuSummaryVectorSelectionDialog dlg( nullptr ); + RimSummaryCase* candidateCase = m_yValuesSummaryCase(); + RifEclipseSummaryAddress candicateAddress = m_yValuesSummaryAddress->address(); if ( candidateCase == nullptr ) { @@ -966,9 +966,9 @@ void RimSummaryCurve::fieldChangedByUi( const caf::PdmFieldHandle* changedField, } else if ( changedField == &m_xPushButtonSelectSummaryAddress ) { - RiuSummaryCurveDefSelectionDialog dlg( nullptr ); - RimSummaryCase* candidateCase = m_xValuesSummaryCase(); - RifEclipseSummaryAddress candicateAddress = m_xValuesSummaryAddress->address(); + RiuSummaryVectorSelectionDialog dlg( nullptr ); + RimSummaryCase* candidateCase = m_xValuesSummaryCase(); + RifEclipseSummaryAddress candicateAddress = m_xValuesSummaryAddress->address(); if ( candidateCase == nullptr ) { diff --git a/ApplicationCode/UserInterface/CMakeLists_files.cmake b/ApplicationCode/UserInterface/CMakeLists_files.cmake index 4ae00c2acf..6645cf4cbc 100644 --- a/ApplicationCode/UserInterface/CMakeLists_files.cmake +++ b/ApplicationCode/UserInterface/CMakeLists_files.cmake @@ -69,7 +69,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RiuPlotObjectPicker.h ${CMAKE_CURRENT_LIST_DIR}/RiuContextMenuLauncher.h ${CMAKE_CURRENT_LIST_DIR}/RiuSummaryCurveDefinitionKeywords.h ${CMAKE_CURRENT_LIST_DIR}/RiuSummaryCurveDefSelection.h -${CMAKE_CURRENT_LIST_DIR}/RiuSummaryCurveDefSelectionDialog.h +${CMAKE_CURRENT_LIST_DIR}/RiuSummaryVectorSelectionDialog.h ${CMAKE_CURRENT_LIST_DIR}/RiuSummaryCurveDefSelectionEditor.h ${CMAKE_CURRENT_LIST_DIR}/RiuSummaryQuantityNameInfoProvider.h ${CMAKE_CURRENT_LIST_DIR}/RiuExpressionContextMenuManager.h @@ -161,7 +161,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RiuMessagePanel.cpp ${CMAKE_CURRENT_LIST_DIR}/RiuPlotObjectPicker.cpp ${CMAKE_CURRENT_LIST_DIR}/RiuContextMenuLauncher.cpp ${CMAKE_CURRENT_LIST_DIR}/RiuSummaryCurveDefSelection.cpp -${CMAKE_CURRENT_LIST_DIR}/RiuSummaryCurveDefSelectionDialog.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuSummaryVectorSelectionDialog.cpp ${CMAKE_CURRENT_LIST_DIR}/RiuSummaryCurveDefSelectionEditor.cpp ${CMAKE_CURRENT_LIST_DIR}/RiuSummaryQuantityNameInfoProvider.cpp ${CMAKE_CURRENT_LIST_DIR}/RiuExpressionContextMenuManager.cpp diff --git a/ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionDialog.cpp b/ApplicationCode/UserInterface/RiuSummaryVectorSelectionDialog.cpp similarity index 84% rename from ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionDialog.cpp rename to ApplicationCode/UserInterface/RiuSummaryVectorSelectionDialog.cpp index da56f54262..9d92a443fa 100644 --- a/ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionDialog.cpp +++ b/ApplicationCode/UserInterface/RiuSummaryVectorSelectionDialog.cpp @@ -16,7 +16,7 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RiuSummaryCurveDefSelectionDialog.h" +#include "RiuSummaryVectorSelectionDialog.h" #include "RiaSummaryCurveDefinition.h" @@ -34,7 +34,7 @@ //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RiuSummaryCurveDefSelectionDialog::RiuSummaryCurveDefSelectionDialog( QWidget* parent ) +RiuSummaryVectorSelectionDialog::RiuSummaryVectorSelectionDialog( QWidget* parent ) : QDialog( parent, RiuTools::defaultDialogFlags() ) { m_addrSelWidget = std::unique_ptr( new RiuSummaryCurveDefSelectionEditor() ); @@ -68,15 +68,15 @@ RiuSummaryCurveDefSelectionDialog::RiuSummaryCurveDefSelectionDialog( QWidget* p //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RiuSummaryCurveDefSelectionDialog::~RiuSummaryCurveDefSelectionDialog() +RiuSummaryVectorSelectionDialog::~RiuSummaryVectorSelectionDialog() { } //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RiuSummaryCurveDefSelectionDialog::setCaseAndAddress( RimSummaryCase* summaryCase, - const RifEclipseSummaryAddress& address ) +void RiuSummaryVectorSelectionDialog::setCaseAndAddress( RimSummaryCase* summaryCase, + const RifEclipseSummaryAddress& address ) { if ( summaryCase ) { @@ -92,8 +92,8 @@ void RiuSummaryCurveDefSelectionDialog::setCaseAndAddress( RimSummaryCase* //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RiuSummaryCurveDefSelectionDialog::setEnsembleAndAddress( RimSummaryCaseCollection* ensemble, - const RifEclipseSummaryAddress& address ) +void RiuSummaryVectorSelectionDialog::setEnsembleAndAddress( RimSummaryCaseCollection* ensemble, + const RifEclipseSummaryAddress& address ) { if ( ensemble ) { @@ -109,7 +109,7 @@ void RiuSummaryCurveDefSelectionDialog::setEnsembleAndAddress( RimSummaryCaseCol //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -std::vector RiuSummaryCurveDefSelectionDialog::curveSelection() const +std::vector RiuSummaryVectorSelectionDialog::curveSelection() const { return summaryAddressSelection()->selection(); } @@ -117,7 +117,7 @@ std::vector RiuSummaryCurveDefSelectionDialog::curveS //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RiuSummaryCurveDefSelectionDialog::hideEnsembles() +void RiuSummaryVectorSelectionDialog::hideEnsembles() { summaryAddressSelection()->hideEnsembles( true ); } @@ -125,7 +125,7 @@ void RiuSummaryCurveDefSelectionDialog::hideEnsembles() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RiuSummaryCurveDefSelectionDialog::hideSummaryCases() +void RiuSummaryVectorSelectionDialog::hideSummaryCases() { summaryAddressSelection()->hideSummaryCases( true ); } @@ -133,7 +133,7 @@ void RiuSummaryCurveDefSelectionDialog::hideSummaryCases() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RiuSummaryCurveDefSelection* RiuSummaryCurveDefSelectionDialog::summaryAddressSelection() const +RiuSummaryCurveDefSelection* RiuSummaryVectorSelectionDialog::summaryAddressSelection() const { return m_addrSelWidget->summaryAddressSelection(); } @@ -141,7 +141,7 @@ RiuSummaryCurveDefSelection* RiuSummaryCurveDefSelectionDialog::summaryAddressSe //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RiuSummaryCurveDefSelectionDialog::updateLabel() +void RiuSummaryVectorSelectionDialog::updateLabel() { QString curveAddressText; std::vector sumCasePairs = this->summaryAddressSelection()->selection(); diff --git a/ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionDialog.h b/ApplicationCode/UserInterface/RiuSummaryVectorSelectionDialog.h similarity index 91% rename from ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionDialog.h rename to ApplicationCode/UserInterface/RiuSummaryVectorSelectionDialog.h index 6aad8a0a3f..5dbb661b3e 100644 --- a/ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionDialog.h +++ b/ApplicationCode/UserInterface/RiuSummaryVectorSelectionDialog.h @@ -33,11 +33,11 @@ class RiuSummaryCurveDefSelectionEditor; /// /// //================================================================================================== -class RiuSummaryCurveDefSelectionDialog : public QDialog +class RiuSummaryVectorSelectionDialog : public QDialog { public: - RiuSummaryCurveDefSelectionDialog( QWidget* parent ); - ~RiuSummaryCurveDefSelectionDialog() override; + RiuSummaryVectorSelectionDialog( QWidget* parent ); + ~RiuSummaryVectorSelectionDialog() override; void setCaseAndAddress( RimSummaryCase* summaryCase, const RifEclipseSummaryAddress& address ); void setEnsembleAndAddress( RimSummaryCaseCollection* ensemble, const RifEclipseSummaryAddress& address );