From 10121c4d6a0b8f888b2a22929ec55925944e85b5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Michal=20Mal=C3=BD?= Date: Fri, 11 Jul 2014 02:40:09 +0200 Subject: [PATCH] Update to changed libHPCS API --- datamanager.cpp | 3 ++- signal.cpp | 6 ++++-- signal.h | 5 ++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/datamanager.cpp b/datamanager.cpp index f80786d..4d45116 100644 --- a/datamanager.cpp +++ b/datamanager.cpp @@ -349,7 +349,8 @@ std::shared_ptr DataManager::loadSingleRun(QDir& dir) Signal::TimeValuePair stvp(md->data[idx].time, md->data[idx].value); values.push_back(stvp); } - _s = std::shared_ptr(new Signal(eqp, res, samplingRate, yu, md->dad_wavelength_msr, md->dad_wavelength_ref, values)); + _s = std::shared_ptr(new Signal(eqp, res, samplingRate, yu, md->dad_wavelength_msr.wavelength, md->dad_wavelength_msr.interval, md->dad_wavelength_ref.wavelength, + md->dad_wavelength_ref.interval, values)); if (!date.isValid()) { llog->log(Logger::WARNING, ME_SENDER_STR, QString("Date ") + date.toString() + QString("is invalid.")); diff --git a/signal.cpp b/signal.cpp index 25ed6b5..d6deaf9 100644 --- a/signal.cpp +++ b/signal.cpp @@ -34,12 +34,14 @@ const QString Signal::MILLIAU_SI("mAU"); const QString Signal::MILLIVOLTS_SI("mV"); const QString Signal::WATTS_SI("W"); -Signal::Signal(const Equipment equipment, const Resource resource, const double samplingRate, const YUnit yunit, uint16_t wavelengthAbs, uint16_t wavelengthRef, - const std::vector& values, QObject* parent) : +Signal::Signal(const Equipment equipment, const Resource resource, const double samplingRate, const YUnit yunit, uint16_t wavelengthAbs, uint16_t intervalAbs, + uint16_t wavelengthRef, uint16_t intervalRef, const std::vector& values, QObject* parent) : QObject(parent), m_equipment(equipment), m_resource(resource), m_samplingRate(samplingRate), + m_spectralIntervalAbs(intervalAbs), + m_spectralIntervalRef(intervalRef), m_values(values), m_wavelengthAbs(wavelengthAbs), m_wavelengthRef(wavelengthRef), diff --git a/signal.h b/signal.h index c18abc7..2013b17 100644 --- a/signal.h +++ b/signal.h @@ -55,7 +55,8 @@ public: }; explicit Signal(const Equipment equipment, const Resource resource, const double samplingRate, const YUnit yunit, const uint16_t wavelengthAbs, - const uint16_t wavelengthRef, const std::vector& values, QObject* parent = nullptr); + const uint16_t intervalAbs, const uint16_t wavelengthRef, const uint16_t intervalRef, const std::vector& values, + QObject* parent = nullptr); uint count() const { return m_values.size(); } QString descriptiveName() const; Equipment equipment() const { return m_equipment; } @@ -85,6 +86,8 @@ private: double m_min; const Resource m_resource; const double m_samplingRate; + const uint16_t m_spectralIntervalAbs; + const uint16_t m_spectralIntervalRef; const std::vector m_values; const uint16_t m_wavelengthAbs; const uint16_t m_wavelengthRef; -- 2.43.5