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

#4259 Tweaks to Export Sector Model UI

Browse Source
This commit is contained in:
Gaute Lindkvist
2019-04-01 14:15:50 +02:00
parent 29e2305c05
commit e2278493ad
4 changed files with 60 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ApplicationCode/Commands/ExportCommands/RicExportEclipseSectorModelFeature.cpp
View File

@@ -75,8 +75,8 @@ void RicExportEclipseSectorModelFeature::executeCommand(RimEclipseView* view,
const RicExportEclipseSectorModelUi& exportSettings,
const QString& logPrefix)
{
int resultProgressPercentage = exportSettings.exportResults() ?
std::min((int) exportSettings.exportMainKeywords().size(), 20) : 0;
int resultProgressPercentage = exportSettings.exportParameters() ?
std::min((int) exportSettings.selectedKeywords().size(), 20) : 0;
int faultsProgressPercentage = exportSettings.exportFaults() ? 10 : 0;
@@ -123,12 +123,12 @@ void RicExportEclipseSectorModelFeature::executeCommand(RimEclipseView* view,
}
}
if (exportSettings.exportResults() != RicExportEclipseSectorModelUi::EXPORT_NO_RESULTS)
if (exportSettings.exportParameters() != RicExportEclipseSectorModelUi::EXPORT_NO_RESULTS)
{
auto task = progress.task("Export Properties", resultProgressPercentage);
std::vector<QString> keywords = exportSettings.allSelectedKeywords();
std::vector<QString> keywords = exportSettings.selectedKeywords;
if (exportSettings.exportResults == RicExportEclipseSectorModelUi::EXPORT_TO_SEPARATE_FILE_PER_RESULT)
if (exportSettings.exportParameters == RicExportEclipseSectorModelUi::EXPORT_TO_SEPARATE_FILE_PER_RESULT)
{
QFileInfo info(exportSettings.exportGridFilename());
QDir dirPath = info.absoluteDir();
@@ -152,8 +152,8 @@ void RicExportEclipseSectorModelFeature::executeCommand(RimEclipseView* view,
else
{
QString fileWriteMode = "w";
QString fileName = exportSettings.exportResultsFilename();
if (exportSettings.exportResults() == RicExportEclipseSectorModelUi::EXPORT_TO_GRID_FILE)
QString fileName = exportSettings.exportParametersFilename();
if (exportSettings.exportParameters() == RicExportEclipseSectorModelUi::EXPORT_TO_GRID_FILE)
{
fileWriteMode = "a";
fileName = exportSettings.exportGridFilename();
@@ -194,7 +194,7 @@ void RicExportEclipseSectorModelFeature::executeCommand(RimEclipseView* view,
{
QString fileName = exportSettings.exportFaultsFilename();
QIODevice::OpenMode openFlag = QIODevice::Truncate;
if (exportSettings.exportResults() == RicExportEclipseSectorModelUi::EXPORT_TO_GRID_FILE)
if (exportSettings.exportParameters() == RicExportEclipseSectorModelUi::EXPORT_TO_GRID_FILE)
{
openFlag = QIODevice::Append;
fileName = exportSettings.exportGridFilename();