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 RicSummaryCurveCreatorSplitterUi to RicSummaryPlotEditorWidgetCreator

Browse Source
This commit is contained in:
Jacob Støren 2020-02-18 13:26:32 +01:00
parent 568b198339
commit 5af6b9f001
5 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,7 +25,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RicPasteAsciiDataCurveFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicEditSummaryPlotFeature.h ${CMAKE_CURRENT_LIST_DIR}/RicEditSummaryPlotFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicEditSummaryCrossPlotFeature.h ${CMAKE_CURRENT_LIST_DIR}/RicEditSummaryCrossPlotFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCreator.h ${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCreator.h
${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCreatorSplitterUi.h ${CMAKE_CURRENT_LIST_DIR}/RicSummaryPlotEditorWidgetCreator.h
${CMAKE_CURRENT_LIST_DIR}/RicSummaryPlotEditorDialog.h ${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
@ -71,7 +71,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RicPasteAsciiDataCurveFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicEditSummaryPlotFeature.cpp ${CMAKE_CURRENT_LIST_DIR}/RicEditSummaryPlotFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicEditSummaryCrossPlotFeature.cpp ${CMAKE_CURRENT_LIST_DIR}/RicEditSummaryCrossPlotFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCreator.cpp ${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCreator.cpp
${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCreatorSplitterUi.cpp ${CMAKE_CURRENT_LIST_DIR}/RicSummaryPlotEditorWidgetCreator.cpp
${CMAKE_CURRENT_LIST_DIR}/RicSummaryPlotEditorDialog.cpp ${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
@ -100,7 +100,7 @@ ${SOURCE_GROUP_SOURCE_FILES}
) )
list(APPEND QT_MOC_HEADERS list(APPEND QT_MOC_HEADERS
${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCreatorSplitterUi.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}/RicSummaryCurveCalculatorEditor.h
${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCalculatorDialog.h ${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCalculatorDialog.h

4
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorDialog.cpp
View File

@ -21,7 +21,7 @@
#include "RiaGuiApplication.h" #include "RiaGuiApplication.h"
#include "RicSummaryCurveCreator.h" #include "RicSummaryCurveCreator.h"
#include "RicSummaryCurveCreatorSplitterUi.h" #include "RicSummaryPlotEditorWidgetCreator.h"
#include "RifReaderEclipseSummary.h" #include "RifReaderEclipseSummary.h"
@ -36,7 +36,7 @@
RicSummaryPlotEditorDialog::RicSummaryPlotEditorDialog( QWidget* parent ) RicSummaryPlotEditorDialog::RicSummaryPlotEditorDialog( QWidget* parent )
: QDialog( parent, RiuTools::defaultDialogFlags() ) : QDialog( parent, RiuTools::defaultDialogFlags() )
{ {
m_curveCreatorSplitterUi = new RicSummaryCurveCreatorSplitterUi( this ); m_curveCreatorSplitterUi = new RicSummaryPlotEditorWidgetCreator( this );
QWidget* propertyWidget = m_curveCreatorSplitterUi->getOrCreateWidget( this ); QWidget* propertyWidget = m_curveCreatorSplitterUi->getOrCreateWidget( this );

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

@ -25,7 +25,7 @@ namespace caf
class PdmObject; class PdmObject;
}; };
class RicSummaryCurveCreatorSplitterUi; class RicSummaryPlotEditorWidgetCreator;
class RimSummaryPlot; class RimSummaryPlot;
class RimSummaryCase; class RimSummaryCase;
@ -47,5 +47,5 @@ private slots:
void slotDialogFinished(); void slotDialogFinished();
private: private:
RicSummaryCurveCreatorSplitterUi* m_curveCreatorSplitterUi; RicSummaryPlotEditorWidgetCreator* m_curveCreatorSplitterUi;
}; };

38
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreatorSplitterUi.cpp → ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorWidgetCreator.cpp
View File

@ -16,7 +16,7 @@
// //
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
#include "RicSummaryCurveCreatorSplitterUi.h" #include "RicSummaryPlotEditorWidgetCreator.h"
#include "RicSummaryCurveCreator.h" #include "RicSummaryCurveCreator.h"
#include "RimEnsembleCurveSetCollection.h" #include "RimEnsembleCurveSetCollection.h"
@ -42,7 +42,7 @@
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RicSummaryCurveCreatorSplitterUi::RicSummaryCurveCreatorSplitterUi( QWidget* parent ) RicSummaryPlotEditorWidgetCreator::RicSummaryPlotEditorWidgetCreator( QWidget* parent )
{ {
m_parentWidget = parent; m_parentWidget = parent;
@ -54,14 +54,14 @@ RicSummaryCurveCreatorSplitterUi::RicSummaryCurveCreatorSplitterUi( QWidget* par
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RicSummaryCurveCreatorSplitterUi::~RicSummaryCurveCreatorSplitterUi() RicSummaryPlotEditorWidgetCreator::~RicSummaryPlotEditorWidgetCreator()
{ {
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicSummaryCurveCreatorSplitterUi::updateFromSummaryPlot( RimSummaryPlot* summaryPlot ) void RicSummaryPlotEditorWidgetCreator::updateFromSummaryPlot( RimSummaryPlot* summaryPlot )
{ {
m_summaryCurveCreator->updateFromSummaryPlot( summaryPlot ); m_summaryCurveCreator->updateFromSummaryPlot( summaryPlot );
} }
@ -69,7 +69,7 @@ void RicSummaryCurveCreatorSplitterUi::updateFromSummaryPlot( RimSummaryPlot* su
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicSummaryCurveCreatorSplitterUi::updateFromDefaultSources( const std::vector<caf::PdmObject*> defaultSources ) void RicSummaryPlotEditorWidgetCreator::updateFromDefaultSources( const std::vector<caf::PdmObject*> defaultSources )
{ {
m_summaryCurveCreator->updateFromSummaryPlot( nullptr, defaultSources ); m_summaryCurveCreator->updateFromSummaryPlot( nullptr, defaultSources );
} }
@ -77,8 +77,8 @@ void RicSummaryCurveCreatorSplitterUi::updateFromDefaultSources( const std::vect
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicSummaryCurveCreatorSplitterUi::recursivelyConfigureAndUpdateTopLevelUiOrdering( const caf::PdmUiOrdering& topLevelUiOrdering, void RicSummaryPlotEditorWidgetCreator::recursivelyConfigureAndUpdateTopLevelUiOrdering( const caf::PdmUiOrdering& topLevelUiOrdering,
const QString& uiConfigName ) const QString& uiConfigName )
{ {
const std::vector<caf::PdmUiItem*>& topLevelUiItems = topLevelUiOrdering.uiItems(); const std::vector<caf::PdmUiItem*>& topLevelUiItems = topLevelUiOrdering.uiItems();
if ( m_summaryCurveCreator->isCloseButtonPressed() ) if ( m_summaryCurveCreator->isCloseButtonPressed() )
@ -116,7 +116,7 @@ void RicSummaryCurveCreatorSplitterUi::recursivelyConfigureAndUpdateTopLevelUiOr
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QWidget* RicSummaryCurveCreatorSplitterUi::createWidget( QWidget* parent ) QWidget* RicSummaryPlotEditorWidgetCreator::createWidget( QWidget* parent )
{ {
QWidget* widget = new QWidget( parent ); QWidget* widget = new QWidget( parent );
@ -179,9 +179,9 @@ QWidget* RicSummaryCurveCreatorSplitterUi::createWidget( QWidget* parent )
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
caf::PdmUiGroup* RicSummaryCurveCreatorSplitterUi::findGroupByKeyword( const std::vector<caf::PdmUiItem*>& topLevelUiItems, caf::PdmUiGroup* RicSummaryPlotEditorWidgetCreator::findGroupByKeyword( const std::vector<caf::PdmUiItem*>& topLevelUiItems,
const QString& keyword, const QString& keyword,
const QString& uiConfigName ) const QString& uiConfigName )
{ {
for ( auto uiItem : topLevelUiItems ) for ( auto uiItem : topLevelUiItems )
{ {
@ -203,7 +203,7 @@ caf::PdmUiGroup* RicSummaryCurveCreatorSplitterUi::findGroupByKeyword( const std
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QMinimizePanel* RicSummaryCurveCreatorSplitterUi::getOrCreateCurveTreeGroup() QMinimizePanel* RicSummaryPlotEditorWidgetCreator::getOrCreateCurveTreeGroup()
{ {
if ( !m_curvesPanel ) if ( !m_curvesPanel )
{ {
@ -234,7 +234,7 @@ QMinimizePanel* RicSummaryCurveCreatorSplitterUi::getOrCreateCurveTreeGroup()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QWidget* RicSummaryCurveCreatorSplitterUi::getOrCreatePlotWidget() QWidget* RicSummaryPlotEditorWidgetCreator::getOrCreatePlotWidget()
{ {
if ( m_summaryCurveCreator ) if ( m_summaryCurveCreator )
{ {
@ -250,10 +250,10 @@ QWidget* RicSummaryCurveCreatorSplitterUi::getOrCreatePlotWidget()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicSummaryCurveCreatorSplitterUi::configureAndUpdateFields( int widgetStartIndex, void RicSummaryPlotEditorWidgetCreator::configureAndUpdateFields( int widgetStartIndex,
QBoxLayout* layout, QBoxLayout* layout,
const std::vector<caf::PdmUiItem*>& uiItems, const std::vector<caf::PdmUiItem*>& uiItems,
const QString& uiConfigName ) const QString& uiConfigName )
{ {
int currentWidgetIndex = widgetStartIndex; int currentWidgetIndex = widgetStartIndex;
@ -319,8 +319,8 @@ void RicSummaryCurveCreatorSplitterUi::configureAndUpdateFields( int
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QMinimizePanel* RicSummaryCurveCreatorSplitterUi::createGroupBoxWithContent( caf::PdmUiGroup* group, QMinimizePanel* RicSummaryPlotEditorWidgetCreator::createGroupBoxWithContent( caf::PdmUiGroup* group,
const QString& uiConfigName ) const QString& uiConfigName )
{ {
QMinimizePanel* groupBox = findOrCreateGroupBox( this->widget(), group, uiConfigName ); QMinimizePanel* groupBox = findOrCreateGroupBox( this->widget(), group, uiConfigName );

6
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreatorSplitterUi.h → ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorWidgetCreator.h
View File

@ -45,13 +45,13 @@ class PdmUiTreeView;
/// ///
/// ///
//================================================================================================== //==================================================================================================
class RicSummaryCurveCreatorSplitterUi : public caf::PdmUiFormLayoutObjectEditor class RicSummaryPlotEditorWidgetCreator : public caf::PdmUiFormLayoutObjectEditor
{ {
Q_OBJECT Q_OBJECT
public: public:
RicSummaryCurveCreatorSplitterUi( QWidget* parent ); RicSummaryPlotEditorWidgetCreator( QWidget* parent );
~RicSummaryCurveCreatorSplitterUi() override; ~RicSummaryPlotEditorWidgetCreator() override;
void updateFromSummaryPlot( RimSummaryPlot* summaryPlot ); void updateFromSummaryPlot( RimSummaryPlot* summaryPlot );
void updateFromDefaultSources( const std::vector<caf::PdmObject*> defaultSources ); void updateFromDefaultSources( const std::vector<caf::PdmObject*> defaultSources );