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

#3494 LGR export. Set correct dialog title

Browse Source
This commit is contained in:
Bjørn Erik Jensen 2018-10-19 12:40:52 +02:00
parent d239b3e6b3
commit e06de21e88
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/Commands/ExportCommands/RicExportLgrFeature.cpp
View File

@ -62,7 +62,7 @@ CAF_CMD_SOURCE_INIT(RicExportLgrFeature, "RicExportLgrFeature");
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RicExportLgrUi* RicExportLgrFeature::openDialog(RimEclipseCase* defaultCase, int defaultTimeStep) RicExportLgrUi* RicExportLgrFeature::openDialog(const QString& dialogTitle, RimEclipseCase* defaultCase, int defaultTimeStep)
{ {
RiaApplication* app = RiaApplication::instance(); RiaApplication* app = RiaApplication::instance();
RimProject* proj = app->project(); RimProject* proj = app->project();
@ -97,7 +97,7 @@ RicExportLgrUi* RicExportLgrFeature::openDialog(RimEclipseCase* defaultCase, int
if (defaultCase) featureUi->setCase(defaultCase); if (defaultCase) featureUi->setCase(defaultCase);
featureUi->setTimeStep(defaultTimeStep); featureUi->setTimeStep(defaultTimeStep);
caf::PdmUiPropertyViewDialog propertyDialog(nullptr, featureUi, "LGR Export", "", QDialogButtonBox::Ok | QDialogButtonBox::Cancel); caf::PdmUiPropertyViewDialog propertyDialog(nullptr, featureUi, dialogTitle, "", QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
propertyDialog.resize(QSize(600, 275)); propertyDialog.resize(QSize(600, 275));
if (propertyDialog.exec() == QDialog::Accepted && !featureUi->exportFolder().isEmpty()) if (propertyDialog.exec() == QDialog::Accepted && !featureUi->exportFolder().isEmpty())
@ -354,7 +354,7 @@ void RicExportLgrFeature::onActionTriggered(bool isChecked)
defaultTimeStep = activeView->currentTimeStep(); defaultTimeStep = activeView->currentTimeStep();
} }
auto dialogData = openDialog(defaultEclipseCase, defaultTimeStep); auto dialogData = openDialog("LGR Export", defaultEclipseCase, defaultTimeStep);
if (dialogData) if (dialogData)
{ {
auto eclipseCase = dialogData->caseToApply(); auto eclipseCase = dialogData->caseToApply();

2
ApplicationCode/Commands/ExportCommands/RicExportLgrFeature.h
View File

@ -83,7 +83,7 @@ class RicExportLgrFeature : public caf::CmdFeature
typedef std::pair<size_t, size_t> Range; typedef std::pair<size_t, size_t> Range;
static Range initRange() { return std::make_pair(std::numeric_limits<size_t>::max(), 0); } static Range initRange() { return std::make_pair(std::numeric_limits<size_t>::max(), 0); }
static RicExportLgrUi* openDialog(RimEclipseCase* defaultCase = nullptr, int defaultTimeStep = 0); static RicExportLgrUi* openDialog(const QString& dialogTitle, RimEclipseCase* defaultCase = nullptr, int defaultTimeStep = 0);
static bool openFileForExport(const QString& folderName, const QString& fileName, QFile* exportFile); static bool openFileForExport(const QString& folderName, const QString& fileName, QFile* exportFile);
static void exportLgrs(QTextStream& stream, const std::vector<LgrInfo>& lgrInfos); static void exportLgrs(QTextStream& stream, const std::vector<LgrInfo>& lgrInfos);

2
ApplicationCode/Commands/RicCreateTemporaryLgrFeature.cpp
View File

@ -95,7 +95,7 @@ void RicCreateTemporaryLgrFeature::onActionTriggered(bool isChecked)
defaultTimeStep = activeView->currentTimeStep(); defaultTimeStep = activeView->currentTimeStep();
} }
auto dialogData = RicExportLgrFeature::openDialog(defaultEclipseCase, defaultTimeStep); auto dialogData = RicExportLgrFeature::openDialog(dialogTitle, defaultEclipseCase, defaultTimeStep);
if (dialogData) if (dialogData)
{ {
auto eclipseCase = dialogData->caseToApply(); auto eclipseCase = dialogData->caseToApply();