Merge branch 'master' of devoid-pointer.net:anyanka

Conflicts:
	datamanager.cpp
	signal.h

diff --cc datafilesloader.cpp
index b5fdfd8f65704d4c2bf3e12fb65a296ad7ede277,b907b9989b9dc66247e5930fc7bafabe102776e9..31240941a0df039a0e00bda6cf5c8cbacb2e2019
--- 1/datafilesloader.cpp
--- 2/datafilesloader.cpp
+++ b/datafilesloader.cpp
@@@ -34,9 -34,10 +34,10 @@@ DataFilesLoader::DataFilesLoader(QObjec
    m_supportedFileTypes << "*.ch";
  }
  
 -DataFilesLoader::ReturnCode DataFilesLoader::loadSingleRun(const QDir& path, std::vector<struct HPCS_MeasuredData*>& loadedData)
 +DataFilesLoader::ReturnCode DataFilesLoader::loadSingleRun(const QDir& path, std::vector<struct HPCS_MeasuredData* >& loadedData)
  {
    ReturnCode ret = ReturnCode::SUCCESS;
+   std::vector<CQStringPair> failedFiles;
  
    for (const QString& s : path.entryList(m_supportedFileTypes, QDir::Files | QDir::NoDotAndDotDot)) {
      struct HPCS_MeasuredData* mdata = hpcs_alloc();

diff --cc datamanager.cpp
Simple merge

diff --cc datamanager.h
index 84713a517f51452b16460653377b28163031d201,fc1a740f1013d5e6477c3c09033c675b1b3112e9..7756b05fe168d48ed34be068a6984cdf74c84707
--- 1/datamanager.h
--- 2/datamanager.h
+++ b/datamanager.h
@@@ -74,12 -74,15 +74,15 @@@ private
    std::vector<NameSequencePair> m_sequences;
    DataFilesLoader m_dfl;
  
 -  ExportGraphToImageDialog::Parameters m_oldExportToImageParams;
 +  ExportGraphToImageDialog m_graphToImageExportDialog;
  
    static const QString ME_SENDER_STR;
+   static const QString UNIT_DEGREES_CELSIUS_TEXT;
    static const QString UNIT_KILOVOLTS_TEXT;
    static const QString UNIT_MICROAMPERES_TEXT;
+   static const QString UNIT_MICROAMPERES_ALT1_TEXT;
    static const QString UNIT_MILLIAU_TEXT;
+   static const QString UNIT_MILLIBARS_TEXT;
    static const QString UNIT_MILLIVOLTS_TEXT;
    static const QString UNIT_WATTS_TEXT;
  

diff --cc signal.cpp
index 1792715d3e8ff90b4aa4ba134b3725779e36e677,b520ce20919509d1092a0243852ea57a5cf0a674..f62be9e7824f46ca0e8d3fdfe5215c0124baff30
--- 1/signal.cpp
--- 2/signal.cpp
+++ b/signal.cpp
@@@ -34,18 -38,17 +38,25 @@@ const QString Signal::MILLIBARS_SI("mba
  const QString Signal::MILLIVOLTS_SI("mV");
  const QString Signal::WATTS_SI("W");
  
++<<<<<<< HEAD
 +Signal::Signal(const Equipment equipment, const Resource resource, const double samplingRate, const YUnit yunit,
 +               const uint16_t wlMsr, const uint16_t wlMsrInt, const uint16_t wlRef, const uint16_t wlRefInt,
 +               const std::vector<TimeValuePair>& 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<TimeValuePair>& values, QObject* parent) :
++>>>>>>> 4c21316481208fda42850d889396470de9707deb
    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),
 +  m_wavelengthMeasured(wlMsr),
 +  m_wavelengthMeasuredInterval(wlMsrInt),
 +  m_wavelengthReference(wlRef),
 +  m_wavelengthReferenceInterval(wlRefInt),
    m_xunit(XUnit::MINUTE),
    m_yunit(yunit)
  {

diff --cc signal.h
index 367a946d22eb9067a5bc0d4494ba429979d408e7,087a4fb34d59c17b178d685ef24676427f4f085b..9c285c99f3b5e8ae7673080590558a722a41f5a5
--- 1/signal.h
--- 2/signal.h
+++ b/signal.h
@@@ -91,11 -90,11 +95,13 @@@ 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<TimeValuePair> m_values;
 -  const uint16_t m_wavelengthAbs;
 -  const uint16_t m_wavelengthRef;
 +  const uint16_t m_wavelengthMeasured;
 +  const uint16_t m_wavelengthMeasuredInterval;
 +  const uint16_t m_wavelengthReference;
 +  const uint16_t m_wavelengthReferenceInterval;
    const XUnit m_xunit;
    const YUnit m_yunit;