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

#3320 Observed data import. Line based CSV import

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2018-09-19 13:02:49 +02:00
parent c1c87a0370
commit ce59e8a0d0
12 changed files with 311 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ApplicationCode/ProjectDataModel/Summary/RimObservedDataCollection.cpp
View File

@@ -169,10 +169,13 @@ RimObservedData* RimObservedDataCollection::createAndAddCvsObservedDataFromFile(
}
parseOptions->setUiModeImport(fileName);
caf::PdmUiPropertyViewDialog propertyDialog(nullptr, parseOptions, "CSV Import Options", "");
if (propertyDialog.exec() != QDialog::Accepted)
if (parseOptions->uiModeImport() != RicPasteAsciiDataToSummaryPlotFeatureUi::UI_MODE_SILENT)
{
return nullptr;
caf::PdmUiPropertyViewDialog propertyDialog(nullptr, parseOptions, "CSV Import Options", "");
if (propertyDialog.exec() != QDialog::Accepted)
{
return nullptr;
}
}
caf::PdmSettings::writeFieldsToApplicationStore(parseOptions);