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

ASCII import dialog. Update preview when cell separator is modified

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2017-11-27 11:35:00 +01:00
parent fb63647457
commit e53059e2c8
4 changed files with 36 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ApplicationCode/FileInterface/RifCsvUserDataParser.cpp
View File

@@ -97,7 +97,7 @@ bool RifCsvUserDataParser::parseColumnInfo(const QString& cellSeparator)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RifCsvUserDataParser::previewText(int lineCount)
QString RifCsvUserDataParser::previewText(int lineCount, const QString& cellSeparator)
{
QTextStream *stream = openDataStream();
@@ -118,7 +118,7 @@ QString RifCsvUserDataParser::previewText(int lineCount)
iLine++;
}
closeDataStream();
return columnifyText(preview);
return columnifyText(preview, cellSeparator);
}
//--------------------------------------------------------------------------------------------------
@@ -291,16 +291,15 @@ bool RifCsvUserDataParser::parseData(const AsciiDataParseOptions& parseOptions)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RifCsvUserDataParser::columnifyText(const QString& text)
QString RifCsvUserDataParser::columnifyText(const QString& text, const QString& cellSeparator)
{
QString pretty = text;
QString cellSep = tryDetermineCellSeparator();
if (!cellSep.isEmpty())
if (!cellSeparator.isEmpty())
{
if (cellSep == ";" || cellSep == ",")
if (cellSeparator == ";" || cellSeparator == ",")
{
pretty = pretty.replace(cellSep, QString("\t") + cellSep);
pretty = pretty.replace(cellSeparator, QString("\t") + cellSeparator);
}
}

4
ApplicationCode/FileInterface/RifCsvUserDataParser.h
View File

@@ -48,7 +48,7 @@ public:
const ColumnInfo* columnInfo(size_t columnIndex) const;
bool parseColumnInfo(const QString& cellSeparator);
QString previewText(int lineCount);
QString previewText(int lineCount, const QString& cellSeparator);
QString tryDetermineCellSeparator();
@@ -61,7 +61,7 @@ private:
const QString& cellSeparator,
std::vector<ColumnInfo>* columnInfoList);
bool parseData(const AsciiDataParseOptions& parseOptions);
QString columnifyText(const QString& text);
QString columnifyText(const QString& text, const QString& cellSeparator);
static QStringList splitLineAndTrim(const QString& line, const QString& separator);
static QDateTime tryParseDateTime(const std::string& colData, const QString& format);