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 RicSummaryCurveCreatorDialog to RicSummaryPlotEditorDialog

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

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

@ -26,7 +26,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RicEditSummaryPlotFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicEditSummaryCrossPlotFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCreator.h
${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCreatorSplitterUi.h
${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCreatorDialog.h
${CMAKE_CURRENT_LIST_DIR}/RicSummaryPlotEditorDialog.h
${CMAKE_CURRENT_LIST_DIR}/RicShowSummaryCurveCalculatorFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicEditSummaryCurveCalculationFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCalculatorDialog.h
@ -72,7 +72,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RicEditSummaryPlotFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicEditSummaryCrossPlotFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCreator.cpp
${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCreatorSplitterUi.cpp
${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCreatorDialog.cpp
${CMAKE_CURRENT_LIST_DIR}/RicSummaryPlotEditorDialog.cpp
${CMAKE_CURRENT_LIST_DIR}/RicShowSummaryCurveCalculatorFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicEditSummaryCurveCalculationFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCalculatorDialog.cpp
@ -101,7 +101,7 @@ ${SOURCE_GROUP_SOURCE_FILES}
list(APPEND QT_MOC_HEADERS
${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCreatorSplitterUi.h
${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCreatorDialog.h
${CMAKE_CURRENT_LIST_DIR}/RicSummaryPlotEditorDialog.h
${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCalculatorEditor.h
${CMAKE_CURRENT_LIST_DIR}/RicSummaryCurveCalculatorDialog.h
)

6
ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryCrossPlotFeature.cpp
View File

@ -22,7 +22,7 @@
#include "RiaPreferences.h"
#include "RicSummaryCurveCreator.h"
#include "RicSummaryCurveCreatorDialog.h"
#include "RicSummaryPlotEditorDialog.h"
#include "cafPdmUiPropertyViewDialog.h"
#include "cafSelectionManager.h"
@ -58,9 +58,9 @@ void RicEditSummaryCrossPlotFeature::closeDialogAndResetTargetPlot()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicSummaryCurveCreatorDialog* RicEditSummaryCrossPlotFeature::curveCreatorDialog()
RicSummaryPlotEditorDialog* RicEditSummaryCrossPlotFeature::curveCreatorDialog()
{
static RicSummaryCurveCreatorDialog* singletonDialog = new RicSummaryCurveCreatorDialog( nullptr );
static RicSummaryPlotEditorDialog* singletonDialog = new RicSummaryPlotEditorDialog( nullptr );
return singletonDialog;
}

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

@ -21,7 +21,7 @@
#include "cafCmdFeature.h"
class RimSummaryPlot;
class RicSummaryCurveCreatorDialog;
class RicSummaryPlotEditorDialog;
//==================================================================================================
///
@ -34,7 +34,7 @@ class RicEditSummaryCrossPlotFeature : public caf::CmdFeature
public:
void closeDialogAndResetTargetPlot();
static RicSummaryCurveCreatorDialog* curveCreatorDialog();
static RicSummaryPlotEditorDialog* curveCreatorDialog();
protected:
// Overrides

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

@ -23,7 +23,7 @@
#include "RiaSummaryTools.h"
#include "RicSummaryCurveCreator.h"
#include "RicSummaryCurveCreatorDialog.h"
#include "RicSummaryPlotEditorDialog.h"
#include "RimSummaryPlot.h"
@ -64,7 +64,7 @@ void RicEditSummaryPlotFeature::closeDialogAndResetTargetPlot()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicSummaryCurveCreatorDialog* RicEditSummaryPlotFeature::curveCreatorDialog()
RicSummaryPlotEditorDialog* RicEditSummaryPlotFeature::curveCreatorDialog()
{
RiuPlotMainWindow* mainPlotWindow = RiaGuiApplication::instance()->mainPlotWindow();

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

@ -21,7 +21,7 @@
#include "cafCmdFeature.h"
class RimSummaryPlot;
class RicSummaryCurveCreatorDialog;
class RicSummaryPlotEditorDialog;
//==================================================================================================
///
@ -34,7 +34,7 @@ class RicEditSummaryPlotFeature : public caf::CmdFeature
public:
void closeDialogAndResetTargetPlot();
static RicSummaryCurveCreatorDialog* curveCreatorDialog();
static RicSummaryPlotEditorDialog* curveCreatorDialog();
static void editSummaryPlot( RimSummaryPlot* plot );
protected:

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

@ -24,7 +24,7 @@
#include "RicEditSummaryPlotFeature.h"
#include "RicSummaryCurveCreator.h"
#include "RicSummaryCurveCreatorDialog.h"
#include "RicSummaryPlotEditorDialog.h"
#include "RimMainPlotCollection.h"
#include "RimProject.h"

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

@ -25,7 +25,7 @@
#include "RicEditSummaryPlotFeature.h"
#include "RicNewSummaryEnsembleCurveSetFeature.h"
#include "RicSummaryCurveCreator.h"
#include "RicSummaryCurveCreatorDialog.h"
#include "RicSummaryPlotEditorDialog.h"
#include "RimEnsembleCurveFilter.h"
#include "RimEnsembleCurveFilterCollection.h"

12
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreatorDialog.cpp → ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorDialog.cpp
View File

@ -16,7 +16,7 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RicSummaryCurveCreatorDialog.h"
#include "RicSummaryPlotEditorDialog.h"
#include "RiaGuiApplication.h"
@ -33,7 +33,7 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicSummaryCurveCreatorDialog::RicSummaryCurveCreatorDialog( QWidget* parent )
RicSummaryPlotEditorDialog::RicSummaryPlotEditorDialog( QWidget* parent )
: QDialog( parent, RiuTools::defaultDialogFlags() )
{
m_curveCreatorSplitterUi = new RicSummaryCurveCreatorSplitterUi( this );
@ -54,7 +54,7 @@ RicSummaryCurveCreatorDialog::RicSummaryCurveCreatorDialog( QWidget* parent )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicSummaryCurveCreatorDialog::~RicSummaryCurveCreatorDialog()
RicSummaryPlotEditorDialog::~RicSummaryPlotEditorDialog()
{
m_curveCreatorSplitterUi->setPdmObject( nullptr );
}
@ -62,7 +62,7 @@ RicSummaryCurveCreatorDialog::~RicSummaryCurveCreatorDialog()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicSummaryCurveCreatorDialog::updateFromSummaryPlot( RimSummaryPlot* summaryPlot )
void RicSummaryPlotEditorDialog::updateFromSummaryPlot( RimSummaryPlot* summaryPlot )
{
m_curveCreatorSplitterUi->updateFromSummaryPlot( summaryPlot );
m_curveCreatorSplitterUi->updateUi();
@ -71,7 +71,7 @@ void RicSummaryCurveCreatorDialog::updateFromSummaryPlot( RimSummaryPlot* summar
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicSummaryCurveCreatorDialog::updateFromDefaultCases( const std::vector<caf::PdmObject*> defaultSources )
void RicSummaryPlotEditorDialog::updateFromDefaultCases( const std::vector<caf::PdmObject*> defaultSources )
{
m_curveCreatorSplitterUi->updateFromDefaultSources( defaultSources );
m_curveCreatorSplitterUi->updateUi();
@ -80,7 +80,7 @@ void RicSummaryCurveCreatorDialog::updateFromDefaultCases( const std::vector<caf
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicSummaryCurveCreatorDialog::slotDialogFinished()
void RicSummaryPlotEditorDialog::slotDialogFinished()
{
RiuPlotMainWindow* plotwindow = RiaGuiApplication::instance()->mainPlotWindow();
if ( plotwindow )

6
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreatorDialog.h → ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorDialog.h
View File

@ -33,12 +33,12 @@ class RimSummaryCase;
///
///
//==================================================================================================
class RicSummaryCurveCreatorDialog : public QDialog
class RicSummaryPlotEditorDialog : public QDialog
{
Q_OBJECT
public:
RicSummaryCurveCreatorDialog( QWidget* parent );
~RicSummaryCurveCreatorDialog() override;
RicSummaryPlotEditorDialog( QWidget* parent );
~RicSummaryPlotEditorDialog() override;
void updateFromSummaryPlot( RimSummaryPlot* summaryPlot );
void updateFromDefaultCases( const std::vector<caf::PdmObject*> defaultSources );

6
ApplicationCode/UserInterface/RiuPlotMainWindow.cpp
View File

@ -39,7 +39,7 @@
#include "RimWellRftPlot.h"
#include "SummaryPlotCommands/RicSummaryCurveCalculatorDialog.h"
#include "SummaryPlotCommands/RicSummaryCurveCreatorDialog.h"
#include "SummaryPlotCommands/RicSummaryPlotEditorDialog.h"
#include "RiuDockWidgetTools.h"
#include "RiuDragDrop.h"
@ -652,11 +652,11 @@ void RiuPlotMainWindow::setFocusToLineEditInSummaryToolBar()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicSummaryCurveCreatorDialog* RiuPlotMainWindow::summaryCurveCreatorDialog()
RicSummaryPlotEditorDialog* RiuPlotMainWindow::summaryCurveCreatorDialog()
{
if ( m_summaryCurveCreatorDialog.isNull() )
{
m_summaryCurveCreatorDialog = new RicSummaryCurveCreatorDialog( this );
m_summaryCurveCreatorDialog = new RicSummaryPlotEditorDialog( this );
}
return m_summaryCurveCreatorDialog;

6
ApplicationCode/UserInterface/RiuPlotMainWindow.h
View File

@ -34,7 +34,7 @@ class RiuViewer;
struct RimMdiWindowGeometry;
class RimViewWindow;
class RicSummaryCurveCreatorDialog;
class RicSummaryPlotEditorDialog;
class RicSummaryCurveCalculatorDialog;
namespace caf
@ -88,7 +88,7 @@ public:
void updateSummaryPlotToolBar( bool forceUpdateUi = false );
void setFocusToLineEditInSummaryToolBar();
RicSummaryCurveCreatorDialog* summaryCurveCreatorDialog();
RicSummaryPlotEditorDialog* summaryCurveCreatorDialog();
RicSummaryCurveCalculatorDialog* summaryCurveCalculatorDialog();
protected:
@ -134,7 +134,7 @@ private:
caf::PdmUiPropertyView* m_pdmUiPropertyView;
QPointer<RicSummaryCurveCreatorDialog> m_summaryCurveCreatorDialog;
QPointer<RicSummaryPlotEditorDialog> m_summaryCurveCreatorDialog;
QPointer<RicSummaryCurveCalculatorDialog> m_summaryCurveCalculatorDialog;
std::vector<QWidget*> m_temporaryWidgets;