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

#3133 CSV import. Assume that all data columns are numeric columns

Browse Source
This commit is contained in:
Bjørn Erik Jensen 2018-07-02 15:14:32 +02:00
parent ec26d8638a
commit 9fd38064df
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -211,6 +211,7 @@ const AsciiDataParseOptions RicPasteAsciiDataToSummaryPlotFeatureUi::parseOption
{ {
AsciiDataParseOptions parseOptions; AsciiDataParseOptions parseOptions;
parseOptions.assumeNumericDataColumns = true;
parseOptions.plotTitle = m_plotTitle(); parseOptions.plotTitle = m_plotTitle();
parseOptions.curvePrefix = m_curvePrefix(); parseOptions.curvePrefix = m_curvePrefix();

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

@ -38,7 +38,7 @@
class AsciiDataParseOptions class AsciiDataParseOptions
{ {
public: public:
AsciiDataParseOptions() : useCustomDateTimeFormat(false) { } AsciiDataParseOptions() : useCustomDateTimeFormat(false), assumeNumericDataColumns(false) { }
QString plotTitle; QString plotTitle;
QString curvePrefix; QString curvePrefix;
@ -52,6 +52,8 @@ public:
QString cellSeparator; QString cellSeparator;
QString timeSeriesColumnName; QString timeSeriesColumnName;
bool assumeNumericDataColumns;
RimPlotCurve::LineStyleEnum curveLineStyle; RimPlotCurve::LineStyleEnum curveLineStyle;
RimPlotCurve::PointSymbolEnum curveSymbol; RimPlotCurve::PointSymbolEnum curveSymbol;
float curveSymbolSkipDistance; float curveSymbolSkipDistance;

2
ApplicationCode/FileInterface/RifCsvUserDataParser.cpp
View File

@ -256,7 +256,7 @@ bool RifCsvUserDataParser::parseData(const AsciiDataParseOptions& parseOptions)
} }
else else
{ {
if (RiaStdStringTools::isNumber(colData, parseOptions.locale.decimalPoint().toAscii())) if (parseOptions.assumeNumericDataColumns || RiaStdStringTools::isNumber(colData, parseOptions.locale.decimalPoint().toAscii()))
{ {
col.dataType = Column::NUMERIC; col.dataType = Column::NUMERIC;
} }