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

#8644: Avoid overwriting preferences for date and time axis format (#8725)

Browse Source 
Co-authored-by: kriben <kriben@users.noreply.github.com>
This commit is contained in:
Kristian Bendiksen
2022-03-24 11:57:05 +01:00
committed by GitHub
parent d4d79d3dec
commit 80234ca105
4 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationLibCode/ProjectDataModel/RimObservedDataCollection.cpp
View File

@@ -179,10 +179,11 @@ RimObservedSummaryData*
if ( useSavedFieldsValuesInDialog )
{
caf::PdmSettings::readFieldsFromApplicationStore( parseOptions );
caf::PdmSettings::readFieldsFromApplicationStore( parseOptions, parseOptions->contextString() );
}
parseOptions->setUiModeImport( fileName );
bool parseOptionsChanged = false;
if ( parseOptions->uiModeImport() != RicPasteAsciiDataToSummaryPlotFeatureUi::UI_MODE_SILENT )
{
caf::PdmUiPropertyViewDialog propertyDialog( nullptr, parseOptions, "CSV Import Options", "" );
@@ -190,9 +191,14 @@ RimObservedSummaryData*
{
return nullptr;
}
parseOptionsChanged = true;
}
caf::PdmSettings::writeFieldsToApplicationStore( parseOptions );
if ( useSavedFieldsValuesInDialog && parseOptionsChanged )
{
caf::PdmSettings::writeFieldsToApplicationStore( parseOptions, parseOptions->contextString() );
}
// userData->setParseOptions(parseOptionsUi.parseOptions());
userData->setSummaryHeaderFileName( fileName );