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 "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;

4
ApplicationCode/ProjectDataModel/RimSummaryCalculationVariable.h
View File

@@ -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:

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

@@ -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 );

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

@@ -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 )
{