diff --git a/ApplicationCode/Commands/ExportCommands/RicAdvancedSnapshotExportFeature.cpp b/ApplicationCode/Commands/ExportCommands/RicAdvancedSnapshotExportFeature.cpp index 6115296bb0..1c08511e3c 100644 --- a/ApplicationCode/Commands/ExportCommands/RicAdvancedSnapshotExportFeature.cpp +++ b/ApplicationCode/Commands/ExportCommands/RicAdvancedSnapshotExportFeature.cpp @@ -39,7 +39,7 @@ #include "RimProject.h" #include "Rim3dView.h" -#include "RiuExportMultipleSnapshotsWidget.h" +#include "RiuAdvancedSnapshotExportWidget.h" #include "RiuViewer.h" #include "cafCmdExecCommandManager.h" @@ -78,7 +78,7 @@ void RicAdvancedSnapshotExportFeature::onActionTriggered(bool isChecked) // Enable the command system to be able to assign a value to multiple fields at the same time caf::CmdExecCommandSystemActivator activator; - RiuExportMultipleSnapshotsWidget dlg(nullptr, proj); + RiuAdvancedSnapshotExportWidget dlg(nullptr, proj); Rim3dView* activeView = RiaApplication::instance()->activeReservoirView(); if (activeView && proj->multiSnapshotDefinitions.size() == 0) diff --git a/ApplicationCode/UserInterface/CMakeLists_files.cmake b/ApplicationCode/UserInterface/CMakeLists_files.cmake index 3c0e6aba91..3e8abfa1cb 100644 --- a/ApplicationCode/UserInterface/CMakeLists_files.cmake +++ b/ApplicationCode/UserInterface/CMakeLists_files.cmake @@ -54,7 +54,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RiuPlotAnnotationTool.h ${CMAKE_CURRENT_LIST_DIR}/RiuGeoMechXfTensorResultAccessor.h ${CMAKE_CURRENT_LIST_DIR}/RiuFemTimeHistoryResultAccessor.h ${CMAKE_CURRENT_LIST_DIR}/RiuEditPerforationCollectionWidget.h -${CMAKE_CURRENT_LIST_DIR}/RiuExportMultipleSnapshotsWidget.h +${CMAKE_CURRENT_LIST_DIR}/RiuAdvancedSnapshotExportWidget.h ${CMAKE_CURRENT_LIST_DIR}/RiuWellAllocationPlot.h ${CMAKE_CURRENT_LIST_DIR}/RiuWellRftPlot.h ${CMAKE_CURRENT_LIST_DIR}/RiuWellPltPlot.h @@ -136,7 +136,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RiuPlotAnnotationTool.cpp ${CMAKE_CURRENT_LIST_DIR}/RiuGeoMechXfTensorResultAccessor.cpp ${CMAKE_CURRENT_LIST_DIR}/RiuFemTimeHistoryResultAccessor.cpp ${CMAKE_CURRENT_LIST_DIR}/RiuEditPerforationCollectionWidget.cpp -${CMAKE_CURRENT_LIST_DIR}/RiuExportMultipleSnapshotsWidget.cpp +${CMAKE_CURRENT_LIST_DIR}/RiuAdvancedSnapshotExportWidget.cpp ${CMAKE_CURRENT_LIST_DIR}/RiuWellAllocationPlot.cpp ${CMAKE_CURRENT_LIST_DIR}/RiuWellRftPlot.cpp ${CMAKE_CURRENT_LIST_DIR}/RiuWellPltPlot.cpp @@ -197,7 +197,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RiuQwtPlotWheelZoomer.h ${CMAKE_CURRENT_LIST_DIR}/RiuWidgetDragger.h ${CMAKE_CURRENT_LIST_DIR}/RiuCvfOverlayItemWidget.h ${CMAKE_CURRENT_LIST_DIR}/RiuEditPerforationCollectionWidget.h -${CMAKE_CURRENT_LIST_DIR}/RiuExportMultipleSnapshotsWidget.h +${CMAKE_CURRENT_LIST_DIR}/RiuAdvancedSnapshotExportWidget.h ${CMAKE_CURRENT_LIST_DIR}/RiuWellAllocationPlot.h ${CMAKE_CURRENT_LIST_DIR}/RiuWellRftPlot.h ${CMAKE_CURRENT_LIST_DIR}/RiuWellPltPlot.h diff --git a/ApplicationCode/UserInterface/RiuExportMultipleSnapshotsWidget.cpp b/ApplicationCode/UserInterface/RiuAdvancedSnapshotExportWidget.cpp similarity index 92% rename from ApplicationCode/UserInterface/RiuExportMultipleSnapshotsWidget.cpp rename to ApplicationCode/UserInterface/RiuAdvancedSnapshotExportWidget.cpp index d59c25b824..9fa1d6b801 100644 --- a/ApplicationCode/UserInterface/RiuExportMultipleSnapshotsWidget.cpp +++ b/ApplicationCode/UserInterface/RiuAdvancedSnapshotExportWidget.cpp @@ -16,7 +16,7 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RiuExportMultipleSnapshotsWidget.h" +#include "RiuAdvancedSnapshotExportWidget.h" #include "RiaApplication.h" @@ -52,11 +52,11 @@ //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RiuExportMultipleSnapshotsWidget::RiuExportMultipleSnapshotsWidget(QWidget* parent, RimProject* project) +RiuAdvancedSnapshotExportWidget::RiuAdvancedSnapshotExportWidget(QWidget* parent, RimProject* project) : QDialog(parent, RiuTools::defaultDialogFlags()), m_rimProject(project) { - setWindowTitle("Export Multiple Snapshots"); + setWindowTitle("Advanced Snapshot Export"); int nWidth = 1000; int nHeight = 300; @@ -127,7 +127,7 @@ RiuExportMultipleSnapshotsWidget::RiuExportMultipleSnapshotsWidget(QWidget* pare //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RiuExportMultipleSnapshotsWidget::~RiuExportMultipleSnapshotsWidget() +RiuAdvancedSnapshotExportWidget::~RiuAdvancedSnapshotExportWidget() { m_pdmTableView->setChildArrayField(nullptr); @@ -137,7 +137,7 @@ RiuExportMultipleSnapshotsWidget::~RiuExportMultipleSnapshotsWidget() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RiuExportMultipleSnapshotsWidget::addSnapshotItemFromActiveView() +void RiuAdvancedSnapshotExportWidget::addSnapshotItemFromActiveView() { if (!m_rimProject) return; @@ -172,7 +172,7 @@ void RiuExportMultipleSnapshotsWidget::addSnapshotItemFromActiveView() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RiuExportMultipleSnapshotsWidget::addEmptySnapshotItems(size_t itemCount) +void RiuAdvancedSnapshotExportWidget::addEmptySnapshotItems(size_t itemCount) { if (!m_rimProject) return; @@ -190,7 +190,7 @@ void RiuExportMultipleSnapshotsWidget::addEmptySnapshotItems(size_t itemCount) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RiuExportMultipleSnapshotsWidget::customMenuRequested(QPoint pos) +void RiuAdvancedSnapshotExportWidget::customMenuRequested(QPoint pos) { caf::CmdFeatureManager* commandManager = caf::CmdFeatureManager::instance(); @@ -215,7 +215,7 @@ void RiuExportMultipleSnapshotsWidget::customMenuRequested(QPoint pos) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RiuExportMultipleSnapshotsWidget::deleteAllSnapshotItems() +void RiuAdvancedSnapshotExportWidget::deleteAllSnapshotItems() { if (!m_rimProject) return; @@ -227,7 +227,7 @@ void RiuExportMultipleSnapshotsWidget::deleteAllSnapshotItems() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RiuExportMultipleSnapshotsWidget::exportSnapshots() +void RiuAdvancedSnapshotExportWidget::exportSnapshots() { RicAdvancedSnapshotExportFeature::exportMultipleSnapshots(m_exportFolderLineEdit->text(), m_rimProject); } @@ -235,7 +235,7 @@ void RiuExportMultipleSnapshotsWidget::exportSnapshots() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RiuExportMultipleSnapshotsWidget::folderSelectionClicked() +void RiuAdvancedSnapshotExportWidget::folderSelectionClicked() { QString defaultPath = m_exportFolderLineEdit->text(); @@ -253,7 +253,7 @@ void RiuExportMultipleSnapshotsWidget::folderSelectionClicked() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RiuExportMultipleSnapshotsWidget::addSnapshotItem() +void RiuAdvancedSnapshotExportWidget::addSnapshotItem() { addSnapshotItemFromActiveView(); } diff --git a/ApplicationCode/UserInterface/RiuExportMultipleSnapshotsWidget.h b/ApplicationCode/UserInterface/RiuAdvancedSnapshotExportWidget.h similarity index 88% rename from ApplicationCode/UserInterface/RiuExportMultipleSnapshotsWidget.h rename to ApplicationCode/UserInterface/RiuAdvancedSnapshotExportWidget.h index c45446faec..6f4a43b72c 100644 --- a/ApplicationCode/UserInterface/RiuExportMultipleSnapshotsWidget.h +++ b/ApplicationCode/UserInterface/RiuAdvancedSnapshotExportWidget.h @@ -29,12 +29,12 @@ namespace caf { class QWidget; class QLineEdit; -class RiuExportMultipleSnapshotsWidget : public QDialog +class RiuAdvancedSnapshotExportWidget : public QDialog { Q_OBJECT public: - RiuExportMultipleSnapshotsWidget(QWidget* parent, RimProject* project); - ~RiuExportMultipleSnapshotsWidget() override; + RiuAdvancedSnapshotExportWidget(QWidget* parent, RimProject* project); + ~RiuAdvancedSnapshotExportWidget() override; void addSnapshotItemFromActiveView(); void addEmptySnapshotItems(size_t itemCount);