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 RiuSummaryCurveDefSelectionEditor to RiuSummaryVectorSelectionWidgetCreator

Browse Source
This commit is contained in:
Jacob Støren 2020-02-18 14:06:16 +01:00
parent 42ffc195ce
commit 72889f8b0a
8 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorUi.cpp
View File

@ -126,7 +126,7 @@ RicSummaryPlotEditorUi::RicSummaryPlotEditorUi()
m_curveNameConfig.uiCapability()->setUiHidden( true );
m_curveNameConfig.uiCapability()->setUiTreeChildrenHidden( true );
m_summaryCurveSelectionEditor.reset( new RiuSummaryCurveDefSelectionEditor() );
m_summaryCurveSelectionEditor.reset( new RiuSummaryVectorSelectionWidgetCreator() );
m_summaryCurveSelectionEditor->summaryAddressSelection()->setFieldChangedHandler(
[this]() { this->selectionEditorFieldChanged(); } );

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

@ -20,7 +20,7 @@
#include "RifEclipseSummaryAddress.h"
#include "RimSummaryCurveAppearanceCalculator.h"
#include "RiuSummaryCurveDefSelectionEditor.h"
#include "RiuSummaryVectorSelectionWidgetCreator.h"
#include "cafPdmChildArrayField.h"
#include "cafPdmChildField.h"
@ -132,5 +132,5 @@ private:
caf::PdmField<bool> m_applyButtonField;
caf::PdmField<bool> m_closeButtonField;
std::unique_ptr<RiuSummaryCurveDefSelectionEditor> m_summaryCurveSelectionEditor;
std::unique_ptr<RiuSummaryVectorSelectionWidgetCreator> m_summaryCurveSelectionEditor;
};

2
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorWidgetCreator.cpp
View File

@ -24,8 +24,8 @@
#include "RimSummaryPlot.h"
#include "RiuSummaryCurveDefSelection.h"
#include "RiuSummaryCurveDefSelectionEditor.h"
#include "RiuSummaryCurveDefinitionKeywords.h"
#include "RiuSummaryVectorSelectionWidgetCreator.h"
#include "cafPdmUiFieldEditorHandle.h"
#include "cafPdmUiFieldHandle.h"

4
ApplicationCode/UserInterface/CMakeLists_files.cmake
View File

@ -70,7 +70,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RiuContextMenuLauncher.h
${CMAKE_CURRENT_LIST_DIR}/RiuSummaryCurveDefinitionKeywords.h
${CMAKE_CURRENT_LIST_DIR}/RiuSummaryCurveDefSelection.h
${CMAKE_CURRENT_LIST_DIR}/RiuSummaryVectorSelectionDialog.h
${CMAKE_CURRENT_LIST_DIR}/RiuSummaryCurveDefSelectionEditor.h
${CMAKE_CURRENT_LIST_DIR}/RiuSummaryVectorSelectionWidgetCreator.h
${CMAKE_CURRENT_LIST_DIR}/RiuSummaryQuantityNameInfoProvider.h
${CMAKE_CURRENT_LIST_DIR}/RiuExpressionContextMenuManager.h
${CMAKE_CURRENT_LIST_DIR}/RiuCalculationsContextMenuManager.h
@ -162,7 +162,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RiuPlotObjectPicker.cpp
${CMAKE_CURRENT_LIST_DIR}/RiuContextMenuLauncher.cpp
${CMAKE_CURRENT_LIST_DIR}/RiuSummaryCurveDefSelection.cpp
${CMAKE_CURRENT_LIST_DIR}/RiuSummaryVectorSelectionDialog.cpp
${CMAKE_CURRENT_LIST_DIR}/RiuSummaryCurveDefSelectionEditor.cpp
${CMAKE_CURRENT_LIST_DIR}/RiuSummaryVectorSelectionWidgetCreator.cpp
${CMAKE_CURRENT_LIST_DIR}/RiuSummaryQuantityNameInfoProvider.cpp
${CMAKE_CURRENT_LIST_DIR}/RiuExpressionContextMenuManager.cpp
${CMAKE_CURRENT_LIST_DIR}/RiuCalculationsContextMenuManager.cpp

5
ApplicationCode/UserInterface/RiuSummaryVectorSelectionDialog.cpp
View File

@ -23,7 +23,7 @@
#include "RimSummaryCaseCollection.h"
#include "RiuSummaryCurveDefSelection.h"
#include "RiuSummaryCurveDefSelectionEditor.h"
#include "RiuSummaryVectorSelectionWidgetCreator.h"
#include "RiuTools.h"
#include <QBoxLayout>
@ -37,7 +37,8 @@
RiuSummaryVectorSelectionDialog::RiuSummaryVectorSelectionDialog( QWidget* parent )
: QDialog( parent, RiuTools::defaultDialogFlags() )
{
m_addrSelWidget = std::unique_ptr<RiuSummaryCurveDefSelectionEditor>( new RiuSummaryCurveDefSelectionEditor() );
m_addrSelWidget =
std::unique_ptr<RiuSummaryVectorSelectionWidgetCreator>( new RiuSummaryVectorSelectionWidgetCreator() );
QWidget* addrWidget = m_addrSelWidget->getOrCreateWidget( this );
QVBoxLayout* mainLayout = new QVBoxLayout( this );

4
ApplicationCode/UserInterface/RiuSummaryVectorSelectionDialog.h
View File

@ -27,7 +27,7 @@
class QLabel;
class RiuSummaryCurveDefSelection;
class RiuSummaryCurveDefSelectionEditor;
class RiuSummaryVectorSelectionWidgetCreator;
//==================================================================================================
///
@ -51,7 +51,7 @@ private:
void updateLabel();
private:
std::unique_ptr<RiuSummaryCurveDefSelectionEditor> m_addrSelWidget;
std::unique_ptr<RiuSummaryVectorSelectionWidgetCreator> m_addrSelWidget;
QLabel* m_label;
};

27
ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionEditor.cpp → ApplicationCode/UserInterface/RiuSummaryVectorSelectionWidgetCreator.cpp
View File

@ -16,7 +16,7 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RiuSummaryCurveDefSelectionEditor.h"
#include "RiuSummaryVectorSelectionWidgetCreator.h"
#include "RiuSummaryCurveDefSelection.h"
#include "RiuSummaryCurveDefinitionKeywords.h"
@ -33,7 +33,7 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuSummaryCurveDefSelectionEditor::RiuSummaryCurveDefSelectionEditor()
RiuSummaryVectorSelectionWidgetCreator::RiuSummaryVectorSelectionWidgetCreator()
{
m_summaryAddressSelection = std::unique_ptr<RiuSummaryCurveDefSelection>( new RiuSummaryCurveDefSelection() );
@ -43,7 +43,7 @@ RiuSummaryCurveDefSelectionEditor::RiuSummaryCurveDefSelectionEditor()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuSummaryCurveDefSelectionEditor::~RiuSummaryCurveDefSelectionEditor()
RiuSummaryVectorSelectionWidgetCreator::~RiuSummaryVectorSelectionWidgetCreator()
{
this->setPdmObject( nullptr );
}
@ -51,7 +51,7 @@ RiuSummaryCurveDefSelectionEditor::~RiuSummaryCurveDefSelectionEditor()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuSummaryCurveDefSelection* RiuSummaryCurveDefSelectionEditor::summaryAddressSelection() const
RiuSummaryCurveDefSelection* RiuSummaryVectorSelectionWidgetCreator::summaryAddressSelection() const
{
return m_summaryAddressSelection.get();
}
@ -59,8 +59,9 @@ RiuSummaryCurveDefSelection* RiuSummaryCurveDefSelectionEditor::summaryAddressSe
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuSummaryCurveDefSelectionEditor::recursivelyConfigureAndUpdateTopLevelUiOrdering( const caf::PdmUiOrdering& topLevelUiOrdering,
const QString& uiConfigName )
void RiuSummaryVectorSelectionWidgetCreator::recursivelyConfigureAndUpdateTopLevelUiOrdering(
const caf::PdmUiOrdering& topLevelUiOrdering,
const QString& uiConfigName )
{
if ( !m_firstRowLeftLayout || !m_firstRowRightLayout ) return;
@ -101,7 +102,7 @@ void RiuSummaryCurveDefSelectionEditor::recursivelyConfigureAndUpdateTopLevelUiO
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QWidget* RiuSummaryCurveDefSelectionEditor::createWidget( QWidget* parent )
QWidget* RiuSummaryVectorSelectionWidgetCreator::createWidget( QWidget* parent )
{
QWidget* widget = new QWidget( parent );
@ -141,10 +142,10 @@ QWidget* RiuSummaryCurveDefSelectionEditor::createWidget( QWidget* parent )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuSummaryCurveDefSelectionEditor::configureAndUpdateFields( int widgetStartIndex,
QBoxLayout* layout,
const std::vector<caf::PdmUiItem*>& uiItems,
const QString& uiConfigName )
void RiuSummaryVectorSelectionWidgetCreator::configureAndUpdateFields( int widgetStartIndex,
QBoxLayout* layout,
const std::vector<caf::PdmUiItem*>& uiItems,
const QString& uiConfigName )
{
int currentWidgetIndex = widgetStartIndex;
@ -210,8 +211,8 @@ void RiuSummaryCurveDefSelectionEditor::configureAndUpdateFields( int
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QMinimizePanel* RiuSummaryCurveDefSelectionEditor::createGroupBoxWithContent( caf::PdmUiGroup* group,
const QString& uiConfigName )
QMinimizePanel* RiuSummaryVectorSelectionWidgetCreator::createGroupBoxWithContent( caf::PdmUiGroup* group,
const QString& uiConfigName )
{
QMinimizePanel* groupBox = findOrCreateGroupBox( this->widget(), group, uiConfigName );

6
ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionEditor.h → ApplicationCode/UserInterface/RiuSummaryVectorSelectionWidgetCreator.h
View File

@ -43,11 +43,11 @@ class PdmUiItem;
///
///
//==================================================================================================
class RiuSummaryCurveDefSelectionEditor : public caf::PdmUiFormLayoutObjectEditor
class RiuSummaryVectorSelectionWidgetCreator : public caf::PdmUiFormLayoutObjectEditor
{
public:
RiuSummaryCurveDefSelectionEditor();
~RiuSummaryCurveDefSelectionEditor() override;
RiuSummaryVectorSelectionWidgetCreator();
~RiuSummaryVectorSelectionWidgetCreator() override;
RiuSummaryCurveDefSelection* summaryAddressSelection() const;