Merge branch 'fix94' into 'main'

allow values greater 1.0 for 1d import

Closes #94

See merge request !696

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;
         }

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;