Fix for autosave bug: mutexes against saving the data on disk while tuning it in real time

GUI/coregui/Models/DataItem.cpp

@@ -16,12 +16,14 @@
 #include "BornAgainNamespace.h"
 #include "ComboProperty.h"
 #include "GUIHelpers.h"
+#include "IntensityDataIOFactory.h"
 
 const QString DataItem::P_FILE_NAME = "FileName";
 const QString DataItem::P_AXES_UNITS = "Axes Units";
 
 void DataItem::setOutputData(OutputData<double>* data)
 {
+    std::unique_lock<std::mutex> lock(m_update_data_mutex);
     m_data.reset(data);
 }
 
@@ -31,6 +33,7 @@ void DataItem::setRawDataVector(const OutputData<double>* data)
         throw GUIHelpers::Error("DataItem::setRawDataVector() -> Error. "
                                 "Different dimensions of data.");
     }
+    std::unique_lock<std::mutex> lock(m_update_data_mutex);
     m_data->setRawDataVector(data->getRawDataVector());
 }
 
@@ -56,6 +59,16 @@ QString DataItem::selectedAxesUnits() const
     return combo.getValue();
 }
 
+void DataItem::saveData(const QString& projectDir)
+{
+    if (!getOutputData())
+        return;
+
+    std::unique_lock<std::mutex> lock(m_update_data_mutex);
+    IntensityDataIOFactory::writeOutputData(*getOutputData(),
+                                            fileName(projectDir).toStdString());
+}
+
 void DataItem::resetToDefault()
 {
     ComboProperty combo = ComboProperty() << Constants::UnitsNbins;

GUI/coregui/Models/DataItem.h

@@ -18,6 +18,7 @@
 #include "SessionItem.h"
 #include "OutputData.h"
 #include <QDateTime>
+#include <mutex>
 
 class InstrumentItem;
 
@@ -50,11 +51,14 @@ public:
     //! Returns data to default state (no dimensional units, default axes' names)
     virtual void resetToDefault() = 0;
 
+    void saveData(const QString& projectDir);
+
 protected:
     DataItem(const QString& modelType);
 
     std::unique_ptr<OutputData<double>> m_data; //!< simulation results
     QDateTime m_last_modified;
+    std::mutex m_update_data_mutex;
 };
 
 #endif // DATAITEM_H

GUI/coregui/Models/JobItemUtils.cpp

@@ -115,12 +115,10 @@ void JobItemUtils::loadIntensityData(DataItem *intensityItem, const QString &pro
 
 void JobItemUtils::saveIntensityData(DataItem* intensityItem, const QString& projectDir)
 {
-    if (!intensityItem || !intensityItem->getOutputData())
+    if (!intensityItem)
         return;
 
-    QString filename = intensityItem->fileName(projectDir);
-    IntensityDataIOFactory::writeOutputData(*intensityItem->getOutputData(),
-                                            filename.toStdString());
+    intensityItem->saveData(projectDir);
 }
 
 //! Correspondance of domain detector axes types to their gui counterpart.