From f34b2bb61222c5f6c766fc54278826382515a4c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Jensen?= Date: Mon, 27 Nov 2017 09:12:53 +0100 Subject: [PATCH] CSV import. Add argument to method. Texts in drop down --- ...RicPasteAsciiDataToSummaryPlotFeatureUi.cpp | 18 ++++++++++++------ .../FileInterface/RifCsvUserDataParser.cpp | 4 ++-- .../FileInterface/RifCsvUserDataParser.h | 2 +- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/ApplicationCode/Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeatureUi.cpp b/ApplicationCode/Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeatureUi.cpp index 79c70bd6ce..0bd67ae540 100644 --- a/ApplicationCode/Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeatureUi.cpp +++ b/ApplicationCode/Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeatureUi.cpp @@ -28,8 +28,8 @@ namespace caf { template<> void RicPasteAsciiDataToSummaryPlotFeatureUi::DecimalSeparatorEnum::setUp() { - addItem(RicPasteAsciiDataToSummaryPlotFeatureUi::DECIMAL_DOT, "DOT", "Dot: ."); - addItem(RicPasteAsciiDataToSummaryPlotFeatureUi::DECIMAL_COMMA, "COMMA", "Comma: ,"); + addItem(RicPasteAsciiDataToSummaryPlotFeatureUi::DECIMAL_DOT, "DOT", "Dot (.)"); + addItem(RicPasteAsciiDataToSummaryPlotFeatureUi::DECIMAL_COMMA, "COMMA", "Comma (,)"); setDefault(RicPasteAsciiDataToSummaryPlotFeatureUi::DECIMAL_DOT); } @@ -63,8 +63,8 @@ namespace caf { void RicPasteAsciiDataToSummaryPlotFeatureUi::CellSeparatorEnum::setUp() { addItem(RicPasteAsciiDataToSummaryPlotFeatureUi::CELL_TAB, "TAB", "Tab"); - addItem(RicPasteAsciiDataToSummaryPlotFeatureUi::CELL_COMMA, "COMMA", "Comma"); - addItem(RicPasteAsciiDataToSummaryPlotFeatureUi::CELL_SEMICOLON, "SEMICOLON", "Semicolon"); + addItem(RicPasteAsciiDataToSummaryPlotFeatureUi::CELL_COMMA, "COMMA", "Comma: (,)"); + addItem(RicPasteAsciiDataToSummaryPlotFeatureUi::CELL_SEMICOLON, "SEMICOLON", "Semicolon (;)"); setDefault(RicPasteAsciiDataToSummaryPlotFeatureUi::CELL_TAB); } } @@ -72,6 +72,11 @@ namespace caf { 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); } @@ -333,5 +339,5 @@ void RicPasteAsciiDataToSummaryPlotFeatureUi::initialize(RifCsvUserDataParser* p m_timeSeriesColumnName = QString::fromStdString(parser->tableData().columnInfos()[0].summaryAddress.quantityName()); } - m_previewText = parser->previewText(); + m_previewText = parser->previewText(PREVIEW_TEXT_LINE_COUNT); } diff --git a/ApplicationCode/FileInterface/RifCsvUserDataParser.cpp b/ApplicationCode/FileInterface/RifCsvUserDataParser.cpp index 797ae085f0..c505da08c6 100644 --- a/ApplicationCode/FileInterface/RifCsvUserDataParser.cpp +++ b/ApplicationCode/FileInterface/RifCsvUserDataParser.cpp @@ -97,7 +97,7 @@ bool RifCsvUserDataParser::parseColumnInfo(const QString& cellSeparator) //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QString RifCsvUserDataParser::previewText() +QString RifCsvUserDataParser::previewText(int lineCount) { QTextStream *stream = openDataStream(); @@ -107,7 +107,7 @@ QString RifCsvUserDataParser::previewText() QTextStream outStream(&preview); int iLine = 0; - while (iLine < 30 + 1 && !stream->atEnd()) + while (iLine < lineCount && !stream->atEnd()) { QString line = stream->readLine(); diff --git a/ApplicationCode/FileInterface/RifCsvUserDataParser.h b/ApplicationCode/FileInterface/RifCsvUserDataParser.h index b21756e3ee..d69f7ef5e4 100644 --- a/ApplicationCode/FileInterface/RifCsvUserDataParser.h +++ b/ApplicationCode/FileInterface/RifCsvUserDataParser.h @@ -48,7 +48,7 @@ public: const ColumnInfo* columnInfo(size_t columnIndex) const; bool parseColumnInfo(const QString& cellSeparator); - QString previewText(); + QString previewText(int lineCount); QString tryDetermineCellSeparator();