diff --git a/ApplicationCode/Commands/SummaryPlotCommands/CMakeLists_files.cmake b/ApplicationCode/Commands/SummaryPlotCommands/CMakeLists_files.cmake index 635563e018..a97b523186 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/CMakeLists_files.cmake +++ b/ApplicationCode/Commands/SummaryPlotCommands/CMakeLists_files.cmake @@ -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 ) diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryCrossPlotFeature.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryCrossPlotFeature.cpp index f3d4b09e86..b7c9013570 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryCrossPlotFeature.cpp +++ b/ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryCrossPlotFeature.cpp @@ -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; } diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryCrossPlotFeature.h b/ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryCrossPlotFeature.h index 6ac19ed668..eb1f98e365 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryCrossPlotFeature.h +++ b/ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryCrossPlotFeature.h @@ -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 diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryPlotFeature.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryPlotFeature.cpp index 647c263326..d0c0471360 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryPlotFeature.cpp +++ b/ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryPlotFeature.cpp @@ -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(); diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryPlotFeature.h b/ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryPlotFeature.h index cb245a4902..a51d6e3982 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryPlotFeature.h +++ b/ApplicationCode/Commands/SummaryPlotCommands/RicEditSummaryPlotFeature.h @@ -21,7 +21,7 @@ #include "cafCmdFeature.h" class RimSummaryPlot; -class RicSummaryCurveCreatorDialog; +class RicSummaryPlotEditorDialog; //================================================================================================== /// @@ -34,8 +34,8 @@ class RicEditSummaryPlotFeature : public caf::CmdFeature public: void closeDialogAndResetTargetPlot(); - static RicSummaryCurveCreatorDialog* curveCreatorDialog(); - static void editSummaryPlot( RimSummaryPlot* plot ); + static RicSummaryPlotEditorDialog* curveCreatorDialog(); + static void editSummaryPlot( RimSummaryPlot* plot ); protected: bool isCommandEnabled() override; diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryCrossPlotFeature.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryCrossPlotFeature.cpp index 55ca41304e..d727535a17 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryCrossPlotFeature.cpp +++ b/ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryCrossPlotFeature.cpp @@ -24,7 +24,7 @@ #include "RicEditSummaryPlotFeature.h" #include "RicSummaryCurveCreator.h" -#include "RicSummaryCurveCreatorDialog.h" +#include "RicSummaryPlotEditorDialog.h" #include "RimMainPlotCollection.h" #include "RimProject.h" diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryPlotFeature.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryPlotFeature.cpp index e4fb57a145..58963f3b87 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryPlotFeature.cpp +++ b/ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryPlotFeature.cpp @@ -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" diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreatorDialog.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorDialog.cpp similarity index 87% rename from ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreatorDialog.cpp rename to ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorDialog.cpp index a451787c10..d65256b11a 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreatorDialog.cpp +++ b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorDialog.cpp @@ -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 defaultSources ) +void RicSummaryPlotEditorDialog::updateFromDefaultCases( const std::vector defaultSources ) { m_curveCreatorSplitterUi->updateFromDefaultSources( defaultSources ); m_curveCreatorSplitterUi->updateUi(); @@ -80,7 +80,7 @@ void RicSummaryCurveCreatorDialog::updateFromDefaultCases( const std::vectormainPlotWindow(); if ( plotwindow ) diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreatorDialog.h b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorDialog.h similarity index 90% rename from ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreatorDialog.h rename to ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorDialog.h index 1c154052f4..b4f78502ee 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreatorDialog.h +++ b/ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorDialog.h @@ -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 defaultSources ); diff --git a/ApplicationCode/UserInterface/RiuPlotMainWindow.cpp b/ApplicationCode/UserInterface/RiuPlotMainWindow.cpp index 9494231ec0..b24d76094f 100644 --- a/ApplicationCode/UserInterface/RiuPlotMainWindow.cpp +++ b/ApplicationCode/UserInterface/RiuPlotMainWindow.cpp @@ -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; diff --git a/ApplicationCode/UserInterface/RiuPlotMainWindow.h b/ApplicationCode/UserInterface/RiuPlotMainWindow.h index 48264fae18..f27f148cf3 100644 --- a/ApplicationCode/UserInterface/RiuPlotMainWindow.h +++ b/ApplicationCode/UserInterface/RiuPlotMainWindow.h @@ -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 m_summaryCurveCreatorDialog; + QPointer m_summaryCurveCreatorDialog; QPointer m_summaryCurveCalculatorDialog; std::vector m_temporaryWidgets;