diff --git a/GUI/View/Loaders/QREDataLoader.cpp b/GUI/View/Loaders/QREDataLoader.cpp index 5ed3b8a80823ee04883b981f756f0b0b58848d4f..70f9399d12df7ff59c82302cb7316e5c10c5438e 100644 --- a/GUI/View/Loaders/QREDataLoader.cpp +++ b/GUI/View/Loaders/QREDataLoader.cpp @@ -500,7 +500,7 @@ void QREDataLoader::calculateFromParseResult() const continue; } - if (r > 1.0) { + if (r > 1.0 && !m_importSettings.allowValuesGreaterOne) { m_importResult.addError(lineNr, ErrorDefinition::RGreaterOne, r); continue; } diff --git a/GUI/View/Loaders/QREDataLoader.h b/GUI/View/Loaders/QREDataLoader.h index ab2ce283b27cfbc7d05e985bb4773d0375ff07b8..2944c652b14c43ee33a84c7610937caae3ed4ed0 100644 --- a/GUI/View/Loaders/QREDataLoader.h +++ b/GUI/View/Loaders/QREDataLoader.h @@ -67,9 +67,11 @@ private: //! Settings for importing the file struct ImportSettings { - QString separator; //!< column separator - QString headerPrefix; //!< prefix denoting header line - QString linesToSkip; //!< pattern denoting line to skip (i.e. '1,10-12,42') + QString separator; //!< column separator + QString headerPrefix; //!< prefix denoting header line + QString linesToSkip; //!< pattern denoting line to skip (i.e. '1,10-12,42') + bool allowValuesGreaterOne = true; //!< always true for now (see ##94); could + //!< be made configurable later on QMap<DataType, ColumnDefinition> columnDefinitions; bool operator!=(const ImportSettings& other) const;