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

2
ApplicationCode/Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeature.cpp
View File

@@ -184,7 +184,7 @@ std::vector<RimAsciiDataCurve*> RicPasteAsciiDataToSummaryPlotFeature::parseCurv
if (col->dataType != Column::NUMERIC) continue;
RimAsciiDataCurve* curve = new RimAsciiDataCurve();
curve->setTimeSteps(parser.dateTimeColumn()->dateTimeValues);
curve->setTimeSteps(parser.dateTimeColumn()->qDateTimeValues());
curve->setValues(parser.columnInfo(i)->values);
if (curvePrefix.isEmpty())
{

21
ApplicationCode/Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeatureUi.cpp
View File

@@ -188,10 +188,17 @@ RicPasteAsciiDataToSummaryPlotFeatureUi::RicPasteAsciiDataToSummaryPlotFeatureUi
//--------------------------------------------------------------------------------------------------
void RicPasteAsciiDataToSummaryPlotFeatureUi::setUiModeImport(const QString& fileName)
{
m_uiMode = UI_MODE_IMPORT;
m_parser = std::unique_ptr<RifCsvUserDataParser>(new RifCsvUserDataFileParser(fileName));
initialize(m_parser.get());
if (m_parser->determineCsvLayout() != RifCsvUserDataParser::LineBased)
{
m_uiMode = UI_MODE_IMPORT;
initialize(m_parser.get());
}
else
{
m_uiMode = UI_MODE_SILENT;
}
}
//--------------------------------------------------------------------------------------------------
@@ -205,6 +212,14 @@ void RicPasteAsciiDataToSummaryPlotFeatureUi::setUiModePasteText(const QString&
initialize(m_parser.get());
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicPasteAsciiDataToSummaryPlotFeatureUi::UiMode RicPasteAsciiDataToSummaryPlotFeatureUi::uiModeImport() const
{
return m_uiMode;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

4
ApplicationCode/Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeatureUi.h
View File

@@ -73,7 +73,8 @@ public:
{
UI_MODE_NONE,
UI_MODE_IMPORT,
UI_MODE_PASTE
UI_MODE_PASTE,
UI_MODE_SILENT
};
enum DecimalSeparator
@@ -123,6 +124,7 @@ public:
void setUiModeImport(const QString& fileName);
void setUiModePasteText(const QString& text);
UiMode uiModeImport() const;
const AsciiDataParseOptions parseOptions() const;
void createNewPlot();