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

Rename RiuSummaryCurveDefSelectionDialog to RiuSummaryVectorSelectionDialog

Browse Source
This commit is contained in:
Jacob Støren
2020-02-18 14:00:11 +01:00
parent 877133478c
commit 42ffc195ce
7 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/ProjectDataModel/RimSummaryCalculationVariable.cpp
View File

@@ -29,7 +29,7 @@
#include "RimSummaryCase.h" #include "RimSummaryCase.h"
#include "RimSummaryCurve.h" #include "RimSummaryCurve.h"
#include "RiuSummaryCurveDefSelectionDialog.h" #include "RiuSummaryVectorSelectionDialog.h"
#include "cafPdmUiPushButtonEditor.h" #include "cafPdmUiPushButtonEditor.h"
#include "cafPdmUiTableViewEditor.h" #include "cafPdmUiTableViewEditor.h"
@@ -89,7 +89,7 @@ void RimSummaryCalculationVariable::fieldChangedByUi( const caf::PdmFieldHandle*
bool updateContainingEditor = false; bool updateContainingEditor = false;
{ {
RiuSummaryCurveDefSelectionDialog dlg( nullptr ); RiuSummaryVectorSelectionDialog dlg( nullptr );
dlg.hideEnsembles(); dlg.hideEnsembles();
readDataFromApplicationStore( &dlg ); 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; if ( !selectionDialog ) return;

4
ApplicationCode/ProjectDataModel/RimSummaryCalculationVariable.h
View File

@@ -28,7 +28,7 @@
class RimSummaryCase; class RimSummaryCase;
class RimSummaryAddress; class RimSummaryAddress;
class RiuSummaryCurveDefSelectionDialog; class RiuSummaryVectorSelectionDialog;
//================================================================================================== //==================================================================================================
/// ///
@@ -54,7 +54,7 @@ private:
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override; void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
void defineObjectEditorAttribute( QString uiConfigName, caf::PdmUiEditorAttribute* attribute ) override; void defineObjectEditorAttribute( QString uiConfigName, caf::PdmUiEditorAttribute* attribute ) override;
void readDataFromApplicationStore( RiuSummaryCurveDefSelectionDialog* selectionDialog ) const; void readDataFromApplicationStore( RiuSummaryVectorSelectionDialog* selectionDialog ) const;
void writeDataToApplicationStore() const; void writeDataToApplicationStore() const;
private: private:

4
ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp
View File

@@ -51,8 +51,8 @@
#include "RiuDraggableOverlayFrame.h" #include "RiuDraggableOverlayFrame.h"
#include "RiuPlotMainWindow.h" #include "RiuPlotMainWindow.h"
#include "RiuQwtPlotCurve.h" #include "RiuQwtPlotCurve.h"
#include "RiuSummaryCurveDefSelectionDialog.h"
#include "RiuSummaryQwtPlot.h" #include "RiuSummaryQwtPlot.h"
#include "RiuSummaryVectorSelectionDialog.h"
#include "cafPdmObject.h" #include "cafPdmObject.h"
#include "cafPdmUiLineEditor.h" #include "cafPdmUiLineEditor.h"
@@ -572,7 +572,7 @@ void RimEnsembleCurveSet::fieldChangedByUi( const caf::PdmFieldHandle* changedFi
} }
else if ( changedField == &m_yPushButtonSelectSummaryAddress ) else if ( changedField == &m_yPushButtonSelectSummaryAddress )
{ {
RiuSummaryCurveDefSelectionDialog dlg( nullptr ); RiuSummaryVectorSelectionDialog dlg( nullptr );
RimSummaryCaseCollection* candidateEnsemble = m_yValuesSummaryCaseCollection(); RimSummaryCaseCollection* candidateEnsemble = m_yValuesSummaryCaseCollection();
RifEclipseSummaryAddress candicateAddress = m_yValuesSummaryAddress->address(); RifEclipseSummaryAddress candicateAddress = m_yValuesSummaryAddress->address();

6
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp
View File

@@ -46,7 +46,7 @@
#include "RiuPlotMainWindow.h" #include "RiuPlotMainWindow.h"
#include "RiuQwtPlotCurve.h" #include "RiuQwtPlotCurve.h"
#include "RiuSummaryCurveDefSelectionDialog.h" #include "RiuSummaryVectorSelectionDialog.h"
#include "cafPdmUiComboBoxEditor.h" #include "cafPdmUiComboBoxEditor.h"
#include "cafPdmUiListEditor.h" #include "cafPdmUiListEditor.h"
@@ -932,7 +932,7 @@ void RimSummaryCurve::fieldChangedByUi( const caf::PdmFieldHandle* changedField,
} }
else if ( changedField == &m_yPushButtonSelectSummaryAddress ) else if ( changedField == &m_yPushButtonSelectSummaryAddress )
{ {
RiuSummaryCurveDefSelectionDialog dlg( nullptr ); RiuSummaryVectorSelectionDialog dlg( nullptr );
RimSummaryCase* candidateCase = m_yValuesSummaryCase(); RimSummaryCase* candidateCase = m_yValuesSummaryCase();
RifEclipseSummaryAddress candicateAddress = m_yValuesSummaryAddress->address(); RifEclipseSummaryAddress candicateAddress = m_yValuesSummaryAddress->address();
@@ -966,7 +966,7 @@ void RimSummaryCurve::fieldChangedByUi( const caf::PdmFieldHandle* changedField,
} }
else if ( changedField == &m_xPushButtonSelectSummaryAddress ) else if ( changedField == &m_xPushButtonSelectSummaryAddress )
{ {
RiuSummaryCurveDefSelectionDialog dlg( nullptr ); RiuSummaryVectorSelectionDialog dlg( nullptr );
RimSummaryCase* candidateCase = m_xValuesSummaryCase(); RimSummaryCase* candidateCase = m_xValuesSummaryCase();
RifEclipseSummaryAddress candicateAddress = m_xValuesSummaryAddress->address(); RifEclipseSummaryAddress candicateAddress = m_xValuesSummaryAddress->address();

4
ApplicationCode/UserInterface/CMakeLists_files.cmake
View File

@@ -69,7 +69,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RiuPlotObjectPicker.h
${CMAKE_CURRENT_LIST_DIR}/RiuContextMenuLauncher.h ${CMAKE_CURRENT_LIST_DIR}/RiuContextMenuLauncher.h
${CMAKE_CURRENT_LIST_DIR}/RiuSummaryCurveDefinitionKeywords.h ${CMAKE_CURRENT_LIST_DIR}/RiuSummaryCurveDefinitionKeywords.h
${CMAKE_CURRENT_LIST_DIR}/RiuSummaryCurveDefSelection.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}/RiuSummaryCurveDefSelectionEditor.h
${CMAKE_CURRENT_LIST_DIR}/RiuSummaryQuantityNameInfoProvider.h ${CMAKE_CURRENT_LIST_DIR}/RiuSummaryQuantityNameInfoProvider.h
${CMAKE_CURRENT_LIST_DIR}/RiuExpressionContextMenuManager.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}/RiuPlotObjectPicker.cpp
${CMAKE_CURRENT_LIST_DIR}/RiuContextMenuLauncher.cpp ${CMAKE_CURRENT_LIST_DIR}/RiuContextMenuLauncher.cpp
${CMAKE_CURRENT_LIST_DIR}/RiuSummaryCurveDefSelection.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}/RiuSummaryCurveDefSelectionEditor.cpp
${CMAKE_CURRENT_LIST_DIR}/RiuSummaryQuantityNameInfoProvider.cpp ${CMAKE_CURRENT_LIST_DIR}/RiuSummaryQuantityNameInfoProvider.cpp
${CMAKE_CURRENT_LIST_DIR}/RiuExpressionContextMenuManager.cpp ${CMAKE_CURRENT_LIST_DIR}/RiuExpressionContextMenuManager.cpp

20
ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionDialog.cpp → ApplicationCode/UserInterface/RiuSummaryVectorSelectionDialog.cpp
View File

@@ -16,7 +16,7 @@
// //
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
#include "RiuSummaryCurveDefSelectionDialog.h" #include "RiuSummaryVectorSelectionDialog.h"
#include "RiaSummaryCurveDefinition.h" #include "RiaSummaryCurveDefinition.h"
@@ -34,7 +34,7 @@
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RiuSummaryCurveDefSelectionDialog::RiuSummaryCurveDefSelectionDialog( QWidget* parent ) RiuSummaryVectorSelectionDialog::RiuSummaryVectorSelectionDialog( QWidget* parent )
: QDialog( parent, RiuTools::defaultDialogFlags() ) : QDialog( parent, RiuTools::defaultDialogFlags() )
{ {
m_addrSelWidget = std::unique_ptr<RiuSummaryCurveDefSelectionEditor>( new RiuSummaryCurveDefSelectionEditor() ); m_addrSelWidget = std::unique_ptr<RiuSummaryCurveDefSelectionEditor>( new RiuSummaryCurveDefSelectionEditor() );
@@ -68,14 +68,14 @@ RiuSummaryCurveDefSelectionDialog::RiuSummaryCurveDefSelectionDialog( QWidget* p
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RiuSummaryCurveDefSelectionDialog::~RiuSummaryCurveDefSelectionDialog() RiuSummaryVectorSelectionDialog::~RiuSummaryVectorSelectionDialog()
{ {
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RiuSummaryCurveDefSelectionDialog::setCaseAndAddress( RimSummaryCase* summaryCase, void RiuSummaryVectorSelectionDialog::setCaseAndAddress( RimSummaryCase* summaryCase,
const RifEclipseSummaryAddress& address ) const RifEclipseSummaryAddress& address )
{ {
if ( summaryCase ) if ( summaryCase )
@@ -92,7 +92,7 @@ void RiuSummaryCurveDefSelectionDialog::setCaseAndAddress( RimSummaryCase*
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RiuSummaryCurveDefSelectionDialog::setEnsembleAndAddress( RimSummaryCaseCollection* ensemble, void RiuSummaryVectorSelectionDialog::setEnsembleAndAddress( RimSummaryCaseCollection* ensemble,
const RifEclipseSummaryAddress& address ) const RifEclipseSummaryAddress& address )
{ {
if ( ensemble ) if ( ensemble )
@@ -109,7 +109,7 @@ void RiuSummaryCurveDefSelectionDialog::setEnsembleAndAddress( RimSummaryCaseCol
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::vector<RiaSummaryCurveDefinition> RiuSummaryCurveDefSelectionDialog::curveSelection() const std::vector<RiaSummaryCurveDefinition> RiuSummaryVectorSelectionDialog::curveSelection() const
{ {
return summaryAddressSelection()->selection(); return summaryAddressSelection()->selection();
} }
@@ -117,7 +117,7 @@ std::vector<RiaSummaryCurveDefinition> RiuSummaryCurveDefSelectionDialog::curveS
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RiuSummaryCurveDefSelectionDialog::hideEnsembles() void RiuSummaryVectorSelectionDialog::hideEnsembles()
{ {
summaryAddressSelection()->hideEnsembles( true ); summaryAddressSelection()->hideEnsembles( true );
} }
@@ -125,7 +125,7 @@ void RiuSummaryCurveDefSelectionDialog::hideEnsembles()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RiuSummaryCurveDefSelectionDialog::hideSummaryCases() void RiuSummaryVectorSelectionDialog::hideSummaryCases()
{ {
summaryAddressSelection()->hideSummaryCases( true ); summaryAddressSelection()->hideSummaryCases( true );
} }
@@ -133,7 +133,7 @@ void RiuSummaryCurveDefSelectionDialog::hideSummaryCases()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RiuSummaryCurveDefSelection* RiuSummaryCurveDefSelectionDialog::summaryAddressSelection() const RiuSummaryCurveDefSelection* RiuSummaryVectorSelectionDialog::summaryAddressSelection() const
{ {
return m_addrSelWidget->summaryAddressSelection(); return m_addrSelWidget->summaryAddressSelection();
} }
@@ -141,7 +141,7 @@ RiuSummaryCurveDefSelection* RiuSummaryCurveDefSelectionDialog::summaryAddressSe
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RiuSummaryCurveDefSelectionDialog::updateLabel() void RiuSummaryVectorSelectionDialog::updateLabel()
{ {
QString curveAddressText; QString curveAddressText;
std::vector<RiaSummaryCurveDefinition> sumCasePairs = this->summaryAddressSelection()->selection(); std::vector<RiaSummaryCurveDefinition> sumCasePairs = this->summaryAddressSelection()->selection();

6
ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionDialog.h → ApplicationCode/UserInterface/RiuSummaryVectorSelectionDialog.h
View File

@@ -33,11 +33,11 @@ class RiuSummaryCurveDefSelectionEditor;
/// ///
/// ///
//================================================================================================== //==================================================================================================
class RiuSummaryCurveDefSelectionDialog : public QDialog class RiuSummaryVectorSelectionDialog : public QDialog
{ {
public: public:
RiuSummaryCurveDefSelectionDialog( QWidget* parent ); RiuSummaryVectorSelectionDialog( QWidget* parent );
~RiuSummaryCurveDefSelectionDialog() override; ~RiuSummaryVectorSelectionDialog() override;
void setCaseAndAddress( RimSummaryCase* summaryCase, const RifEclipseSummaryAddress& address ); void setCaseAndAddress( RimSummaryCase* summaryCase, const RifEclipseSummaryAddress& address );
void setEnsembleAndAddress( RimSummaryCaseCollection* ensemble, const RifEclipseSummaryAddress& address ); void setEnsembleAndAddress( RimSummaryCaseCollection* ensemble, const RifEclipseSummaryAddress& address );