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 RicSummaryCurveCalculatorEditor to RicSummaryCurveCalculatorWidgetCreator

Browse Source
This commit is contained in:
Jacob Støren 2020-02-18 13:47:24 +01:00
parent dacd84a289
commit 877133478c
5 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/Commands/SummaryPlotCommands/CMakeLists_files.cmake
View File

@ -30,7 +30,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RicSummaryPlotEditorDialog.h
${CMAKE_CURRENT_LIST_DIR}/RicShowSummaryCurveCalculatorFeature.h ${CMAKE_CURRENT_LIST_DIR}/RicShowSummaryCurveCalculatorFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicEditSummaryCurveCalculationFeature.h ${CMAKE_CURRENT_LIST_DIR}/RicEditSummaryCurveCalculationFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCalculatorDialog.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}/RicSummaryCurveCalculator.h
${CMAKE_CURRENT_LIST_DIR}/RicNewSummaryCrossPlotCurveFeature.h ${CMAKE_CURRENT_LIST_DIR}/RicNewSummaryCrossPlotCurveFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicNewSummaryEnsembleCurveSetFeature.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}/RicShowSummaryCurveCalculatorFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicEditSummaryCurveCalculationFeature.cpp ${CMAKE_CURRENT_LIST_DIR}/RicEditSummaryCurveCalculationFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCalculatorDialog.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}/RicSummaryCurveCalculator.cpp
${CMAKE_CURRENT_LIST_DIR}/RicNewSummaryCrossPlotCurveFeature.cpp ${CMAKE_CURRENT_LIST_DIR}/RicNewSummaryCrossPlotCurveFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicNewSummaryEnsembleCurveSetFeature.cpp ${CMAKE_CURRENT_LIST_DIR}/RicNewSummaryEnsembleCurveSetFeature.cpp
@ -102,7 +102,7 @@ ${SOURCE_GROUP_SOURCE_FILES}
list(APPEND QT_MOC_HEADERS list(APPEND QT_MOC_HEADERS
${CMAKE_CURRENT_LIST_DIR}/RicSummaryPlotEditorWidgetCreator.h ${CMAKE_CURRENT_LIST_DIR}/RicSummaryPlotEditorWidgetCreator.h
${CMAKE_CURRENT_LIST_DIR}/RicSummaryPlotEditorDialog.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 ${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCalculatorDialog.h
) )

5
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorDialog.cpp
View File

@ -19,7 +19,7 @@
#include "RicSummaryCurveCalculatorDialog.h" #include "RicSummaryCurveCalculatorDialog.h"
#include "RicSummaryCurveCalculator.h" #include "RicSummaryCurveCalculator.h"
#include "RicSummaryCurveCalculatorEditor.h" #include "RicSummaryCurveCalculatorWidgetCreator.h"
#include "RimSummaryCalculation.h" #include "RimSummaryCalculation.h"
#include "RimSummaryCalculationCollection.h" #include "RimSummaryCalculationCollection.h"
@ -115,7 +115,8 @@ void RicSummaryCurveCalculatorDialog::setUp()
QVBoxLayout* mainLayout = new QVBoxLayout( this ); QVBoxLayout* mainLayout = new QVBoxLayout( this );
mainLayout->setContentsMargins( 0, 0, 0, 0 ); 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 ) ); mainLayout->addWidget( m_summaryCalcEditor->getOrCreateWidget( this ) );
QDialogButtonBox* buttonBox = new QDialogButtonBox( QDialogButtonBox::Close ); QDialogButtonBox* buttonBox = new QDialogButtonBox( QDialogButtonBox::Close );

4
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorDialog.h
View File

@ -21,7 +21,7 @@
#include <QDialog> #include <QDialog>
#include <memory> #include <memory>
class RicSummaryCurveCalculatorEditor; class RicSummaryCurveCalculatorWidgetCreator;
class RimSummaryCalculation; class RimSummaryCalculation;
//================================================================================================== //==================================================================================================
@ -46,5 +46,5 @@ private:
size_t dirtyCount() const; size_t dirtyCount() const;
private: private:
std::unique_ptr<RicSummaryCurveCalculatorEditor> m_summaryCalcEditor; std::unique_ptr<RicSummaryCurveCalculatorWidgetCreator> m_summaryCalcEditor;
}; };

19
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorEditor.cpp → ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorWidgetCreator.cpp
View File

@ -16,7 +16,7 @@
// //
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
#include "RicSummaryCurveCalculatorEditor.h" #include "RicSummaryCurveCalculatorWidgetCreator.h"
#include "RicSummaryCurveCalculator.h" #include "RicSummaryCurveCalculator.h"
#include "RimSummaryCalculation.h" #include "RimSummaryCalculation.h"
@ -34,7 +34,7 @@
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RicSummaryCurveCalculatorEditor::RicSummaryCurveCalculatorEditor() RicSummaryCurveCalculatorWidgetCreator::RicSummaryCurveCalculatorWidgetCreator()
: m_pdmTableView( nullptr ) : m_pdmTableView( nullptr )
{ {
m_calculator = std::unique_ptr<RicSummaryCurveCalculator>( new RicSummaryCurveCalculator ); m_calculator = std::unique_ptr<RicSummaryCurveCalculator>( new RicSummaryCurveCalculator );
@ -45,7 +45,7 @@ RicSummaryCurveCalculatorEditor::RicSummaryCurveCalculatorEditor()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RicSummaryCurveCalculatorEditor::~RicSummaryCurveCalculatorEditor() RicSummaryCurveCalculatorWidgetCreator::~RicSummaryCurveCalculatorWidgetCreator()
{ {
if ( m_pdmTableView ) if ( m_pdmTableView )
{ {
@ -61,7 +61,8 @@ RicSummaryCurveCalculatorEditor::~RicSummaryCurveCalculatorEditor()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicSummaryCurveCalculatorEditor::recursivelyConfigureAndUpdateTopLevelUiOrdering( const caf::PdmUiOrdering& topLevelUiOrdering, void RicSummaryCurveCalculatorWidgetCreator::recursivelyConfigureAndUpdateTopLevelUiOrdering(
const caf::PdmUiOrdering& topLevelUiOrdering,
const QString& uiConfigName ) const QString& uiConfigName )
{ {
if ( !m_firstRowLeftLayout || !m_firstRowRightLayout ) return; 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 = new caf::PdmUiTableView( parent );
m_pdmTableView->tableView()->setSelectionMode( QAbstractItemView::ExtendedSelection ); m_pdmTableView->tableView()->setSelectionMode( QAbstractItemView::ExtendedSelection );
@ -185,7 +186,7 @@ QWidget* RicSummaryCurveCalculatorEditor::createWidget( QWidget* parent )
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QMinimizePanel* RicSummaryCurveCalculatorEditor::updateGroupBoxWithContent( caf::PdmUiGroup* group, QMinimizePanel* RicSummaryCurveCalculatorWidgetCreator::updateGroupBoxWithContent( caf::PdmUiGroup* group,
const QString& uiConfigName ) const QString& uiConfigName )
{ {
QMinimizePanel* groupBox = findOrCreateGroupBox( this->widget(), group, 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(); return m_calculator.get();
} }
@ -205,7 +206,7 @@ RicSummaryCurveCalculator* RicSummaryCurveCalculatorEditor::calculator() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicSummaryCurveCalculatorEditor::slotCalculate() void RicSummaryCurveCalculatorWidgetCreator::slotCalculate()
{ {
m_calculator->calculate(); m_calculator->calculate();
@ -215,7 +216,7 @@ void RicSummaryCurveCalculatorEditor::slotCalculate()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicSummaryCurveCalculatorEditor::slotParseExpression() void RicSummaryCurveCalculatorWidgetCreator::slotParseExpression()
{ {
m_calculator->parseExpression(); m_calculator->parseExpression();

6
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorEditor.h → ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCalculatorWidgetCreator.h
View File

@ -41,13 +41,13 @@ class PdmUiTableView;
/// ///
/// ///
//================================================================================================== //==================================================================================================
class RicSummaryCurveCalculatorEditor : public caf::PdmUiFormLayoutObjectEditor class RicSummaryCurveCalculatorWidgetCreator : public caf::PdmUiFormLayoutObjectEditor
{ {
Q_OBJECT Q_OBJECT
public: public:
RicSummaryCurveCalculatorEditor(); RicSummaryCurveCalculatorWidgetCreator();
~RicSummaryCurveCalculatorEditor() override; ~RicSummaryCurveCalculatorWidgetCreator() override;
RicSummaryCurveCalculator* calculator() const; RicSummaryCurveCalculator* calculator() const;