DataItem: rm containsNonXmlData()

GUI/Model/Data/DataItem.cpp

@@ -93,11 +93,6 @@ QDateTime DataItem::lastModified() const
     return m_last_modified;
 }
 
-bool DataItem::containsNonXMLData() const
-{
-    return static_cast<bool>(m_datafield);
-}
-
 QString DataItem::loadDatafield(MessageService* messageService, const QString& projectDir)
 {
     if (projectDir.isEmpty())
@@ -123,7 +118,7 @@ void DataItem::saveDatafield(const QString& projectDir) const
 {
     const auto file = dataFullPath(projectDir);
 
-    if (!containsNonXMLData())
+    if (!m_datafield)
         return;
 
     if (QFile::exists(file) && !wasModifiedSinceLastSave())

GUI/Model/Data/DataItem.h

@@ -51,16 +51,15 @@ public:
     void setRawDataVector(const std::vector<double>& data);
 
     QString fileName() const;
+    void setFileName(const QString& filename);
     QString dataFullPath(const QString& projectDir) const;
 
-    void setFileName(const QString& filename);
     QDateTime lastModified() const;
-    bool containsNonXMLData() const;
+    void setLastModified(const QDateTime& dtime);
+
     QString loadDatafield(MessageService* messageService, const QString& projectDir);
     void saveDatafield(const QString& projectDir) const;
 
-    void setLastModified(const QDateTime& dtime);
-
     // Number of bins in data
     int xSize() const;
     int ySize() const;
@@ -142,6 +141,7 @@ protected:
     mutable std::mutex m_update_data_mutex;
 
     QString m_fileName;
+    QString m_fileDir;
     ComboProperty m_axesUnits;
     std::unique_ptr<BasicAxisItem> m_xAxis;
     std::unique_ptr<AmplitudeAxisItem> m_yAxis;