Made DataItem derived from SaveLoadInterface

Redmine: #2177

GUI/coregui/Models/DataItem.cpp

@@ -37,10 +37,9 @@ void DataItem::setRawDataVector(std::vector<double> data)
     emitDataChanged();
 }
 
-QString DataItem::fileName(const QString& projectDir) const
+QString DataItem::fileName() const
 {
-    QString filename = getItemValue(DataItem::P_FILE_NAME).toString();
-    return projectDir.isEmpty() ? filename : projectDir + QStringLiteral("/") + filename;
+    return getItemValue(DataItem::P_FILE_NAME).toString();
 }
 
 QDateTime DataItem::lastModified() const
@@ -48,6 +47,33 @@ QDateTime DataItem::lastModified() const
     return m_last_modified;
 }
 
+bool DataItem::containsNonXMLData() const
+{
+    return static_cast<bool>(m_data);
+}
+
+bool DataItem::load(const QString &projectDir)
+{
+    QString filename = fileName(projectDir);
+    auto data = IntensityDataIOFactory::readOutputData(filename.toStdString());
+    if (!data)
+        return false;
+    setOutputData(data);
+    return true;
+}
+
+bool DataItem::save(const QString& projectDir)
+{
+    if (!containsNonXMLData())
+        return false;
+
+    std::unique_lock<std::mutex> lock(m_update_data_mutex);
+    std::unique_ptr<OutputData<double>> clone(getOutputData()->clone());
+    lock.unlock();
+    IntensityDataIOFactory::writeOutputData(*clone, fileName(projectDir).toStdString());
+    return true;
+}
+
 void DataItem::setLastModified(const QDateTime& dtime)
 {
     m_last_modified = dtime;

GUI/coregui/Models/DataItem.h

@@ -15,6 +15,7 @@
 #ifndef DATAITEM_H
 #define DATAITEM_H
 
+#include "SaveLoadInterface.h"
 #include "SessionItem.h"
 #include "OutputData.h"
 #include <QDateTime>
@@ -24,7 +25,7 @@ class InstrumentItem;
 
 //! Provides common functionality for IntensityDataItem and SpecularDataItem
 
-class BA_CORE_API_ DataItem : public SessionItem
+class BA_CORE_API_ DataItem : public SessionItem, public SaveLoadInterface
 {
 public:
     static const QString P_FILE_NAME;
@@ -39,9 +40,13 @@ public:
     //! no dimension checks are applied.
     void setRawDataVector(std::vector<double> data);
 
-    QString fileName(const QString& projectDir = QString()) const;
+    using SaveLoadInterface::fileName;
+    QString fileName() const override;
+    QDateTime lastModified() const override;
+    bool containsNonXMLData() const override;
+    bool load(const QString& projectDir) override;
+    bool save(const QString& projectDir) override;
 
-    QDateTime lastModified() const;
     void setLastModified(const QDateTime& dtime);
 
     QString selectedAxesUnits() const;