OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-24 15:26:48 -06:00
Code Issues Packages Projects Releases Wiki Activity

CSV import dialog. Use html table in preview text box

Browse Source
This commit is contained in:
Bjørn Erik Jensen 2017-11-28 09:28:06 +01:00
parent 6d4820a691
commit 4b14a4fdda
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -325,6 +325,7 @@ void RicPasteAsciiDataToSummaryPlotFeatureUi::defineEditorAttribute(const caf::P
QFont font("Monospace", 7); QFont font("Monospace", 7);
attrib->font = font; attrib->font = font;
attrib->textMode = caf::PdmUiTextEditorAttribute::HTML;
} }
} }
} }

20
ApplicationCode/FileInterface/RifCsvUserDataParser.cpp
View File

@ -123,17 +123,31 @@ QString RifCsvUserDataParser::previewText(int lineCount, const QString& cellSepa
QString preview; QString preview;
QTextStream outStream(&preview); QTextStream outStream(&preview);
int iLine = 0; int iLine = 0;
bool header = true;
outStream << "<Table>";
outStream << "<Style> th, td {padding-right: 15px;} </Style>";
while (iLine < lineCount && !stream->atEnd()) while (iLine < lineCount && !stream->atEnd())
{ {
QString line = stream->readLine(); QString line = stream->readLine();
if (line.isEmpty()) continue; if (line.isEmpty()) continue;
outStream << line; outStream << "<tr>";
outStream << "\n"; for (const QString& cellData : splitLineAndTrim(line, cellSeparator))
{
outStream << (header ? "<th>" : "<td>");
outStream << cellData;
outStream << (header ? "</th>" : "</td>");
}
outStream << "</tr>";
header = false;
iLine++; iLine++;
} }
outStream << "</Table>";
closeDataStream(); closeDataStream();
return columnifyText(preview, cellSeparator); return columnifyText(preview, cellSeparator);
} }
@ -405,7 +419,7 @@ QString RifCsvUserDataParser::tryDetermineDecimalSeparator(const QString& cellSe
QString line = dataStream->readLine(); QString line = dataStream->readLine();
if (line.isEmpty()) continue; if (line.isEmpty()) continue;
for (QString cellData : splitLineAndTrim(line, cellSeparator)) for (const QString& cellData : splitLineAndTrim(line, cellSeparator))
{ {
bool parseOk; bool parseOk;
QLocale locale; QLocale locale;