GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation Commit - r725:91c2da56b561

23

/// Separator between values in a result line

23

/// Separator between values in a result line

24

const auto RESULT_LINE_SEPARATOR = QRegularExpression{QStringLiteral("\\s+")};

24

const auto RESULT_LINE_SEPARATOR = QRegularExpression{QStringLiteral("\\s+")};

25

26

/// Regex to find the header of the data in the file. This header indicates the end of comments in

27

/// the file

28

const auto DATA_HEADER_REGEX = QRegularExpression{QStringLiteral("#\\s*DATA\\s*:")};

29

26

/// Regex to find unit in a line. Examples of valid lines:

30

/// Regex to find unit in a line. Examples of valid lines:

27

/// ... PARAMETER_UNITS : nT ...

31

/// ... PARAMETER_UNITS : nT ...

28

/// ... PARAMETER_UNITS:nT ...

32

/// ... PARAMETER_UNITS:nT ...

75

{

79

{

76

QString line{};

80

QString line{};

77

81

78

// Searches unit in the comment lines

82

// Searches unit in the comment lines (as long as the reading has not reached the data header)

79

while (stream.readLineInto(&line) && ~~isCommentLine~~(~~line~~)) {

83

while (stream.readLineInto(&line) && !line.contains(DATA_HEADER_REGEX)) {

80

auto match = UNIT_REGEX.match(line);

84

auto match = UNIT_REGEX.match(line);

81

if (match.hasMatch()) {

85

if (match.hasMatch()) {

82

return Unit{match.captured(1), true};

86

return Unit{match.captured(1), true};

186

auto xAxisUnit = readXAxisUnit(stream);

190

auto xAxisUnit = readXAxisUnit(stream);

187

191

188

// Reads results

192

// Reads results

189

stream.seek(0); // returns to the beginning of the file

190

auto results = readResults(stream, valueType);

193

auto results = readResults(stream, valueType);

191

194

192

// Creates data series

195

// Creates data series

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

             /// Separator between values in a result line
             const auto RESULT_LINE_SEPARATOR = QRegularExpression{QStringLiteral("\\s+")};
+            /// Regex to find the header of the data in the file. This header indicates the end of comments in
+            /// the file
+            const auto DATA_HEADER_REGEX = QRegularExpression{QStringLiteral("#\\s*DATA\\s*:")};
             /// Regex to find unit in a line. Examples of valid lines:
             /// ... PARAMETER_UNITS : nT ...
             /// ... PARAMETER_UNITS:nT ...
             {
                 QString line{};
-                // Searches unit in the comment lines
+                // Searches unit in the comment lines (as long as the reading has not reached the data header)
-                while (stream.readLineInto(&line) && isCommentLine(line)) {
+                while (stream.readLineInto(&line) && !line.contains(DATA_HEADER_REGEX)) {
                     auto match = UNIT_REGEX.match(line);
                     if (match.hasMatch()) {
                         return Unit{match.captured(1), true};
                 auto xAxisUnit = readXAxisUnit(stream);
                 // Reads results
-                stream.seek(0); // returns to the beginning of the file
                 auto results = readResults(stream, valueType);
                 // Creates data series