OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-11 07:56:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

#4247 Minor improvements to export sector model UI

Browse Source
This commit is contained in:
Gaute Lindkvist 2019-03-28 20:42:29 +01:00
parent d4f3701da6
commit 47a559b3a8
7 changed files with 47 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ApplicationCode/Commands/ExportCommands/RicExportEclipseInputGridFeature.cpp
View File

@ -59,7 +59,7 @@ void RicExportEclipseInputGridFeature::openDialogAndExecuteCommand(RimEclipseVie
RigEclipseCaseData* caseData = view->eclipseCase()->eclipseCaseData();
RicExportEclipseInputGridUi exportSettings(caseData);
caf::PdmUiPropertyViewDialog propertyDialog(Riu3DMainWindowTools::mainWindowWidget(), &exportSettings, "Export Input Grid", "");
caf::PdmUiPropertyViewDialog propertyDialog(Riu3DMainWindowTools::mainWindowWidget(), &exportSettings, "Export Eclipse Sector Model", "");
RicExportFeatureImpl::configureForExport(&propertyDialog);
if (propertyDialog.exec() == QDialog::Accepted)
@ -82,7 +82,7 @@ void RicExportEclipseInputGridFeature::executeCommand(RimEclipseView* view,
int gridProgressPercentage = 100 - resultProgressPercentage - faultsProgressPercentage;
caf::ProgressInfo progress(gridProgressPercentage + resultProgressPercentage + faultsProgressPercentage,
"Export Eclipse Data");
"Export Eclipse Sector Model");
cvf::Vec3st refinement(exportSettings.cellCountI(), exportSettings.cellCountJ(), exportSettings.cellCountK());
@ -92,7 +92,7 @@ void RicExportEclipseInputGridFeature::executeCommand(RimEclipseView* view,
std::tie(min, max) = getVisibleCellRange(view);
if (exportSettings.exportGrid())
{
auto task = progress.task("Export Input Grid", gridProgressPercentage);
auto task = progress.task("Export Grid", gridProgressPercentage);
bool worked = RifEclipseInputFileTools::exportGrid(exportSettings.exportGridFilename(), view->eclipseCase()->eclipseCaseData(), min, max, refinement);
if (!worked)
{
@ -113,7 +113,7 @@ void RicExportEclipseInputGridFeature::executeCommand(RimEclipseView* view,
if (exportSettings.exportResults() != RicExportEclipseInputGridUi::EXPORT_NO_RESULTS)
{
auto task = progress.task("Export Results", resultProgressPercentage);
auto task = progress.task("Export Properties", resultProgressPercentage);
std::vector<QString> keywords = exportSettings.allSelectedKeywords();
if (exportSettings.exportResults == RicExportEclipseInputGridUi::EXPORT_TO_SEPARATE_FILE_PER_RESULT)
@ -253,7 +253,7 @@ void RicExportEclipseInputGridFeature::onActionTriggered(bool isChecked)
//--------------------------------------------------------------------------------------------------
void RicExportEclipseInputGridFeature::setupActionLook(QAction* actionToSetup)
{
actionToSetup->setText("Export Visible Cells as Eclipse Input Grid");
actionToSetup->setText("Export Visible Cells as Eclipse Sector Model");
}
//--------------------------------------------------------------------------------------------------
@ -261,17 +261,12 @@ void RicExportEclipseInputGridFeature::setupActionLook(QAction* actionToSetup)
//--------------------------------------------------------------------------------------------------
RimEclipseView* RicExportEclipseInputGridFeature::selectedView() const
{
RimEclipseView* view = dynamic_cast<RimEclipseView*>(caf::SelectionManager::instance()->selectedItem());
RimEclipseView* view = caf::SelectionManager::instance()->selectedItemAncestorOfType<RimEclipseView>();
if (view)
{
return view;
}
RimEclipseCellColors* cellResultItem = dynamic_cast<RimEclipseCellColors*>(caf::SelectionManager::instance()->selectedItem());
if (cellResultItem)
{
cellResultItem->firstAncestorOrThisOfType(view);
}
return view;
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
return dynamic_cast<RimEclipseView*>(activeView);
}

33
ApplicationCode/Commands/ExportCommands/RicExportEclipseInputGridUi.cpp
View File

@ -46,9 +46,9 @@ void RicExportEclipseInputGridUi::ResultExportOptionsEnum::setUp()
addItem(RicExportEclipseInputGridUi::EXPORT_NO_RESULTS, "NO_RESULTS", "Do not export");
addItem(RicExportEclipseInputGridUi::EXPORT_TO_GRID_FILE, "TO_GRID_FILE", "Append to grid file");
addItem(RicExportEclipseInputGridUi::EXPORT_TO_SINGLE_SEPARATE_FILE, "TO_SINGLE_RESULT_FILE", "Export to single file");
addItem(RicExportEclipseInputGridUi::EXPORT_TO_SEPARATE_FILE_PER_RESULT, "TO_SEPARATE_RESULT_FILES", "Export to a separate file per result");
addItem(RicExportEclipseInputGridUi::EXPORT_TO_SEPARATE_FILE_PER_RESULT, "TO_SEPARATE_RESULT_FILES", "Export to a separate file per property");
setDefault(RicExportEclipseInputGridUi::EXPORT_TO_GRID_FILE);
setDefault(RicExportEclipseInputGridUi::EXPORT_TO_SEPARATE_FILE_PER_RESULT);
}
} // namespace caf
@ -64,14 +64,16 @@ RicExportEclipseInputGridUi::RicExportEclipseInputGridUi(RigEclipseCaseData* cas
CAF_PDM_InitField(&exportGridFilename, "ExportGridFilename", QString(), "Grid File Name", "", "", "");
exportGridFilename.uiCapability()->setUiEditorTypeName(caf::PdmUiFilePathEditor::uiEditorTypeName());
CAF_PDM_InitFieldNoDefault(&exportResults, "ExportResults", "Export Results", "", "", "");
CAF_PDM_InitField(&exportResultsFilename, "ExportResultsFilename", QString(), "Results File Name", "", "", "");
exportResultsFilename.uiCapability()->setUiEditorTypeName(caf::PdmUiFilePathEditor::uiEditorTypeName());
CAF_PDM_InitFieldNoDefault(&exportFaults, "ExportFaults", "Export Faults", "", "", "");
exportFaults = EXPORT_TO_SINGLE_SEPARATE_FILE;
CAF_PDM_InitField(&exportFaultsFilename, "ExportFaultsFilename", QString(), "Faults File Name", "", "", "");
exportFaultsFilename.uiCapability()->setUiEditorTypeName(caf::PdmUiFilePathEditor::uiEditorTypeName());
CAF_PDM_InitFieldNoDefault(&exportResults, "ExportResults", "Export Properties", "", "", "");
CAF_PDM_InitField(&exportResultsFilename, "ExportResultsFilename", QString(), "Properties File Name", "", "", "");
exportResultsFilename.uiCapability()->setUiEditorTypeName(caf::PdmUiFilePathEditor::uiEditorTypeName());
CAF_PDM_InitFieldNoDefault(&exportMainKeywords, "ExportMainKeywords", "Main Keywords", "", "", "");
CAF_PDM_InitFieldNoDefault(&exportAdditionalKeywords, "ExportAdditionalKeywords", "Additional Keywords", "", "", "");
@ -150,6 +152,16 @@ void RicExportEclipseInputGridUi::defineUiOrdering(QString uiConfigName, caf::Pd
gridGroup->add(&exportGridFilename);
exportGridFilename.uiCapability()->setUiReadOnly(!exportGrid());
gridGroup->add(&exportFaults);
if (exportFaults() != EXPORT_NO_RESULTS)
{
if (exportFaults() == EXPORT_TO_SINGLE_SEPARATE_FILE)
{
gridGroup->add(&exportFaultsFilename);
}
}
caf::PdmUiGroup* resultsGroup = uiOrdering.addNewGroup("Results and Faults Export");
resultsGroup->add(&exportResults);
@ -161,15 +173,6 @@ void RicExportEclipseInputGridUi::defineUiOrdering(QString uiConfigName, caf::Pd
}
}
resultsGroup->add(&exportFaults);
if (exportFaults() != EXPORT_NO_RESULTS)
{
if (exportFaults() == EXPORT_TO_SINGLE_SEPARATE_FILE)
{
resultsGroup->add(&exportFaultsFilename);
}
}
if (exportResults() != EXPORT_NO_RESULTS)
{
resultsGroup->add(&exportMainKeywords);

6
ApplicationCode/Commands/ExportCommands/RicExportEclipseInputGridUi.h
View File

@ -57,12 +57,12 @@ public:
caf::PdmField<bool> exportGrid;
caf::PdmField<QString> exportGridFilename;
caf::PdmField<ResultExportOptionsEnum> exportResults;
caf::PdmField<QString> exportResultsFilename;
caf::PdmField<ResultExportOptionsEnum> exportFaults;
caf::PdmField<QString> exportFaultsFilename;
caf::PdmField<ResultExportOptionsEnum> exportResults;
caf::PdmField<QString> exportResultsFilename;
caf::PdmField<std::vector<QString>> exportMainKeywords;
caf::PdmField<std::vector<QString>> exportAdditionalKeywords;

30
ApplicationCode/Commands/ExportCommands/RicSaveEclipseInputVisibleCellsFeature.cpp
View File

@ -131,33 +131,22 @@ void RicSaveEclipseInputVisibleCellsFeature::setupActionLook(QAction* actionToSe
//--------------------------------------------------------------------------------------------------
RimEclipseView* RicSaveEclipseInputVisibleCellsFeature::selectedView() const
{
RimEclipseView* view = dynamic_cast<RimEclipseView*>(caf::SelectionManager::instance()->selectedItem());
RimEclipseView* view = caf::SelectionManager::instance()->selectedItemAncestorOfType<RimEclipseView>();
if (view)
{
return view;
}
RimEclipseCellColors* cellResultItem = dynamic_cast<RimEclipseCellColors*>(caf::SelectionManager::instance()->selectedItem());
if (cellResultItem)
{
cellResultItem->firstAncestorOrThisOfType(view);
}
return view;
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
return dynamic_cast<RimEclipseView*>(activeView);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RicSaveEclipseInputActiveVisibleCellsFeature::isCommandEnabled()
{
return true;
return selectedView() != nullptr;
}
//--------------------------------------------------------------------------------------------------
@ -165,7 +154,7 @@ bool RicSaveEclipseInputActiveVisibleCellsFeature::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
void RicSaveEclipseInputActiveVisibleCellsFeature::onActionTriggered(bool isChecked)
{
RimEclipseView* view = RicSaveEclipseInputActiveVisibleCellsFeature::getEclipseActiveView();
RimEclipseView* view = RicSaveEclipseInputActiveVisibleCellsFeature::selectedView();
RicSaveEclipseInputVisibleCellsFeature::openDialogAndExecuteCommand(view);
}
@ -180,10 +169,15 @@ void RicSaveEclipseInputActiveVisibleCellsFeature::setupActionLook(QAction* acti
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimEclipseView* RicSaveEclipseInputActiveVisibleCellsFeature::getEclipseActiveView()
RimEclipseView* RicSaveEclipseInputActiveVisibleCellsFeature::selectedView()
{
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
RimEclipseView* view = caf::SelectionManager::instance()->selectedItemAncestorOfType<RimEclipseView>();
if (view)
{
return view;
}
Rim3dView* activeView = RiaApplication::instance()->activeReservoirView();
return dynamic_cast<RimEclipseView*>(activeView);
}

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

@ -58,5 +58,5 @@ protected:
void setupActionLook( QAction* actionToSetup ) override;
private:
static RimEclipseView* getEclipseActiveView();
static RimEclipseView* selectedView();
};

3
ApplicationCode/UserInterface/RiuMainWindow.cpp
View File

@ -866,6 +866,9 @@ void RiuMainWindow::slotRefreshFileActions()
cmdFeatureMgr->action("RicWellPathsImportSsihubFeature")->setEnabled(projectFileExists);
QStringList commandIdList;
commandIdList << "RicExportEclipseInputGridFeature";
commandIdList << "RicSaveEclipseInputVisibleCellsFeature";
commandIdList << "RicSaveEclipseInputActiveVisibleCellsFeature";
commandIdList << "RicExportCompletionsForVisibleWellPathsFeature";
commandIdList << "RicExportVisibleWellPathsFeature";
cmdFeatureMgr->refreshStates(commandIdList);

1
ApplicationCode/UserInterface/RiuViewerCommands.cpp
View File

@ -496,6 +496,7 @@ void RiuViewerCommands::displayContextMenu(QMouseEvent* event)
menuBuilder << "RicCreateGridCrossPlotFeature";
}
menuBuilder.addSeparator();
menuBuilder << "RicExportEclipseInputGridFeature";
menuBuilder << "RicSaveEclipseInputActiveVisibleCellsFeature";
menuBuilder << "RicShowGridStatisticsFeature";
menuBuilder << "RicSelectColorResult";