GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation Commit - r730:8ee7b4704910

24

/// the file

24

/// the file

25

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

25

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

26

27

/// Format for dates in result files

28

const auto DATE_FORMAT = QStringLiteral("yyyy-MM-ddThh:mm:ss.zzz");

29

27

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

30

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

28

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

31

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

29

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

32

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

31

/// ... PARAMETER_UNITS : m/s ...

34

/// ... PARAMETER_UNITS : m/s ...

32

const auto UNIT_REGEX = QRegularExpression{QStringLiteral("\\s*PARAMETER_UNITS\\s*:\\s*(.+)")};

35

const auto UNIT_REGEX = QRegularExpression{QStringLiteral("\\s*PARAMETER_UNITS\\s*:\\s*(.+)")};

33

36

37

QDateTime dateTimeFromString(const QString &stringDate) noexcept

38

{

39

#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)

40

return QDateTime::fromString(stringDate, Qt::ISODateWithMs);

41

#else

42

return QDateTime::fromString(stringDate, DATE_FORMAT);

43

#endif

44

}

45

34

/// Converts a string date to a double date

46

/// Converts a string date to a double date

35

/// @return a double that represents the date in seconds, NaN if the string date can't be converted

47

/// @return a double that represents the date in seconds, NaN if the string date can't be converted

36

double doubleDate(const QString &stringDate) noexcept

48

double doubleDate(const QString &stringDate) noexcept

37

{

49

{

38

// Format: yyyy-MM-ddThh:mm:ss.zzz

50

// Format: yyyy-MM-ddThh:mm:ss.zzz

39

auto dateTime = ~~QDateTime~~::fromString(stringDate, Qt::~~ISODateWithMs~~);

51

auto dateTime = dateTimeFromString(stringDate);

40

dateTime.setTimeSpec(Qt::UTC);

52

dateTime.setTimeSpec(Qt::UTC);

41

return dateTime.isValid() ? DateUtils::secondsSinceEpoch(dateTime)

53

return dateTime.isValid() ? DateUtils::secondsSinceEpoch(dateTime)

42

: std::numeric_limits<double>::quiet_NaN();

54

: std::numeric_limits<double>::quiet_NaN();

	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

             /// the file
             const auto DATA_HEADER_REGEX = QRegularExpression{QStringLiteral("#\\s*DATA\\s*:")};
+            /// Format for dates in result files
+            const auto DATE_FORMAT = QStringLiteral("yyyy-MM-ddThh:mm:ss.zzz");
             /// Regex to find unit in a line. Examples of valid lines:
             /// ... PARAMETER_UNITS : nT ...
             /// ... PARAMETER_UNITS:nT ...
             /// ... PARAMETER_UNITS : m/s ...
             const auto UNIT_REGEX = QRegularExpression{QStringLiteral("\\s*PARAMETER_UNITS\\s*:\\s*(.+)")};
+            QDateTime dateTimeFromString(const QString &stringDate) noexcept
+            {
+            #if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
+                return QDateTime::fromString(stringDate, Qt::ISODateWithMs);
+            #else
+                return QDateTime::fromString(stringDate, DATE_FORMAT);
+            #endif
+            }
             /// Converts a string date to a double date
             /// @return a double that represents the date in seconds, NaN if the string date can't be converted
             double doubleDate(const QString &stringDate) noexcept
             {
                 // Format: yyyy-MM-ddThh:mm:ss.zzz
-                auto dateTime = QDateTime::fromString(stringDate, Qt::ISODateWithMs);
+                auto dateTime = dateTimeFromString(stringDate);
                 dateTime.setTimeSpec(Qt::UTC);
                 return dateTime.isValid() ? DateUtils::secondsSinceEpoch(dateTime)
                                           : std::numeric_limits<double>::quiet_NaN();