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

CSV import. Add argument to method. Texts in drop down

Browse Source
This commit is contained in:
Bjørn Erik Jensen 2017-11-27 09:12:53 +01:00
parent c9451dde50
commit f34b2bb612
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,8 +28,8 @@ namespace caf {
template<> template<>
void RicPasteAsciiDataToSummaryPlotFeatureUi::DecimalSeparatorEnum::setUp() void RicPasteAsciiDataToSummaryPlotFeatureUi::DecimalSeparatorEnum::setUp()
{ {
addItem(RicPasteAsciiDataToSummaryPlotFeatureUi::DECIMAL_DOT, "DOT", "Dot: ."); addItem(RicPasteAsciiDataToSummaryPlotFeatureUi::DECIMAL_DOT, "DOT", "Dot (.)");
addItem(RicPasteAsciiDataToSummaryPlotFeatureUi::DECIMAL_COMMA, "COMMA", "Comma: ,"); addItem(RicPasteAsciiDataToSummaryPlotFeatureUi::DECIMAL_COMMA, "COMMA", "Comma (,)");
setDefault(RicPasteAsciiDataToSummaryPlotFeatureUi::DECIMAL_DOT); setDefault(RicPasteAsciiDataToSummaryPlotFeatureUi::DECIMAL_DOT);
} }
@ -63,8 +63,8 @@ namespace caf {
void RicPasteAsciiDataToSummaryPlotFeatureUi::CellSeparatorEnum::setUp() void RicPasteAsciiDataToSummaryPlotFeatureUi::CellSeparatorEnum::setUp()
{ {
addItem(RicPasteAsciiDataToSummaryPlotFeatureUi::CELL_TAB, "TAB", "Tab"); addItem(RicPasteAsciiDataToSummaryPlotFeatureUi::CELL_TAB, "TAB", "Tab");
addItem(RicPasteAsciiDataToSummaryPlotFeatureUi::CELL_COMMA, "COMMA", "Comma"); addItem(RicPasteAsciiDataToSummaryPlotFeatureUi::CELL_COMMA, "COMMA", "Comma: (,)");
addItem(RicPasteAsciiDataToSummaryPlotFeatureUi::CELL_SEMICOLON, "SEMICOLON", "Semicolon"); addItem(RicPasteAsciiDataToSummaryPlotFeatureUi::CELL_SEMICOLON, "SEMICOLON", "Semicolon (;)");
setDefault(RicPasteAsciiDataToSummaryPlotFeatureUi::CELL_TAB); setDefault(RicPasteAsciiDataToSummaryPlotFeatureUi::CELL_TAB);
} }
} }
@ -72,6 +72,11 @@ namespace caf {
CAF_PDM_SOURCE_INIT(RicPasteAsciiDataToSummaryPlotFeatureUi, "RicPasteAsciiDataToSummaryPlotFeatureUi"); CAF_PDM_SOURCE_INIT(RicPasteAsciiDataToSummaryPlotFeatureUi, "RicPasteAsciiDataToSummaryPlotFeatureUi");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
#define PREVIEW_TEXT_LINE_COUNT 30
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -268,7 +273,8 @@ void RicPasteAsciiDataToSummaryPlotFeatureUi::defineUiOrdering(QString uiConfigN
} }
{ {
caf::PdmUiGroup* previewGroup = uiOrdering.addNewGroup("Preview - First 30 lines, Pretty Print"); caf::PdmUiGroup* previewGroup = uiOrdering.addNewGroup(
QString("Preview - First %1 lines, Pretty Print").arg(QString::number(PREVIEW_TEXT_LINE_COUNT)));
previewGroup->add(&m_previewText); previewGroup->add(&m_previewText);
} }
@ -333,5 +339,5 @@ void RicPasteAsciiDataToSummaryPlotFeatureUi::initialize(RifCsvUserDataParser* p
m_timeSeriesColumnName = QString::fromStdString(parser->tableData().columnInfos()[0].summaryAddress.quantityName()); m_timeSeriesColumnName = QString::fromStdString(parser->tableData().columnInfos()[0].summaryAddress.quantityName());
} }
m_previewText = parser->previewText(); m_previewText = parser->previewText(PREVIEW_TEXT_LINE_COUNT);
} }

4
ApplicationCode/FileInterface/RifCsvUserDataParser.cpp
View File

@ -97,7 +97,7 @@ bool RifCsvUserDataParser::parseColumnInfo(const QString& cellSeparator)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QString RifCsvUserDataParser::previewText() QString RifCsvUserDataParser::previewText(int lineCount)
{ {
QTextStream *stream = openDataStream(); QTextStream *stream = openDataStream();
@ -107,7 +107,7 @@ QString RifCsvUserDataParser::previewText()
QTextStream outStream(&preview); QTextStream outStream(&preview);
int iLine = 0; int iLine = 0;
while (iLine < 30 + 1 && !stream->atEnd()) while (iLine < lineCount && !stream->atEnd())
{ {
QString line = stream->readLine(); QString line = stream->readLine();

2
ApplicationCode/FileInterface/RifCsvUserDataParser.h
View File

@ -48,7 +48,7 @@ public:
const ColumnInfo* columnInfo(size_t columnIndex) const; const ColumnInfo* columnInfo(size_t columnIndex) const;
bool parseColumnInfo(const QString& cellSeparator); bool parseColumnInfo(const QString& cellSeparator);
QString previewText(); QString previewText(int lineCount);
QString tryDetermineCellSeparator(); QString tryDetermineCellSeparator();