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

#2218 observed data. Save ascii parse options to project file and use settings on project load

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2017-12-04 11:48:59 +01:00
parent 8ab70887c3
commit 2a32760132
3 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ApplicationCode/ProjectDataModel/Summary/RimCsvUserData.cpp
View File

@@ -38,6 +38,11 @@ RimCsvUserData::RimCsvUserData()
{
CAF_PDM_InitObject("Observed CSV Data File", ":/Default.png", "", "");
m_summaryHeaderFilename.uiCapability()->setUiName("File");
CAF_PDM_InitFieldNoDefault(&m_parseOptions, "ParseOptions", "", "", "", "");
m_parseOptions = new RicPasteAsciiDataToSummaryPlotFeatureUi();
m_parseOptions->uiCapability()->setUiHidden(true);
m_parseOptions->uiCapability()->setUiTreeHidden(true);
}
//--------------------------------------------------------------------------------------------------
@@ -58,7 +63,7 @@ void RimCsvUserData::createSummaryReaderInterface()
if (caf::Utils::fileExists(this->summaryHeaderFilename()))
{
RifCsvUserData* csvUserData = new RifCsvUserData();
if (csvUserData->parse(this->summaryHeaderFilename(), m_parseOptions, &m_errorText))
if (csvUserData->parse(this->summaryHeaderFilename(), m_parseOptions->parseOptions() , &m_errorText))
{
m_summaryReader = csvUserData;
}
@@ -88,7 +93,7 @@ QString RimCsvUserData::errorMessagesFromReader()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimCsvUserData::setParseOptions(const AsciiDataParseOptions &parseOptions)
RicPasteAsciiDataToSummaryPlotFeatureUi* RimCsvUserData::parseOptions() const
{
m_parseOptions = parseOptions;
return m_parseOptions();
}