mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
Rename RicSummaryCurveCalculatorEditor to RicSummaryCurveCalculatorWidgetCreator
This commit is contained in:
parent
dacd84a289
commit
877133478c
@ -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
|
||||
)
|
||||
|
||||
|
@ -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<RicSummaryCurveCalculatorEditor>( new RicSummaryCurveCalculatorEditor() );
|
||||
m_summaryCalcEditor =
|
||||
std::unique_ptr<RicSummaryCurveCalculatorWidgetCreator>( new RicSummaryCurveCalculatorWidgetCreator() );
|
||||
mainLayout->addWidget( m_summaryCalcEditor->getOrCreateWidget( this ) );
|
||||
|
||||
QDialogButtonBox* buttonBox = new QDialogButtonBox( QDialogButtonBox::Close );
|
||||
|
@ -21,7 +21,7 @@
|
||||
#include <QDialog>
|
||||
#include <memory>
|
||||
|
||||
class RicSummaryCurveCalculatorEditor;
|
||||
class RicSummaryCurveCalculatorWidgetCreator;
|
||||
class RimSummaryCalculation;
|
||||
|
||||
//==================================================================================================
|
||||
@ -46,5 +46,5 @@ private:
|
||||
size_t dirtyCount() const;
|
||||
|
||||
private:
|
||||
std::unique_ptr<RicSummaryCurveCalculatorEditor> m_summaryCalcEditor;
|
||||
std::unique_ptr<RicSummaryCurveCalculatorWidgetCreator> m_summaryCalcEditor;
|
||||
};
|
||||
|
@ -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<RicSummaryCurveCalculator>( 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();
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user