JobModel: start

GUI/Model/Model/JobModel.cpp

@@ -80,7 +80,11 @@ JobItem* JobModel::addJob(const MultiLayerItem* sampleItem, const InstrumentItem
 
 QVector<JobItem*> JobModel::jobItems() const
 {
+#ifdef NEW_JOB_MODEL
+    return m_jobItems;
+#else
     return topItems<JobItem>();
+#endif
 }
 
 //! restore instrument and sample model from backup for given JobItem
@@ -127,7 +131,12 @@ QVector<DataItem*> JobModel::dataItems() const
 
     return result;
 }
+#ifdef NEW_JOB_MODEL
+void JobModel::writeTo_JobModel(QXmlStreamWriter *writer)
+{
 
+}
+#endif
 void JobModel::readFrom(QXmlStreamReader* reader, MessageService* messageService /*= 0*/)
 {
     SessionModel::readFrom(reader, messageService);

GUI/Model/Model/JobModel.h

@@ -25,6 +25,8 @@ class RealItem;
 class DataItem;
 class SimulationOptionsItem;
 
+#define NEW_JOB_MODEL
+
 class JobModel : public SessionModel {
     Q_OBJECT
 
@@ -45,6 +47,10 @@ public:
 
     void clear() override;
     QVector<DataItem*> dataItems() const;
+
+#ifdef NEW_JOB_MODEL
+    void writeTo_JobModel(QXmlStreamWriter* writer);
+#endif
     void readFrom(QXmlStreamReader* reader, MessageService* messageService = nullptr) override;
 
     void runJob(JobItem* jobItem);
@@ -60,6 +66,9 @@ private:
     //! generates numbered job name with new/unused number
     QString generateJobName();
     JobQueueData* m_queue_data;
+#ifdef NEW_JOB_MODEL
+    QList<JobItem*> m_jobItems;
+#endif
 };
 
 #endif // BORNAGAIN_GUI_MODEL_MODEL_JOBMODEL_H

GUI/Model/Model/RealModel.cpp

@@ -114,7 +114,7 @@ void RealModel::remove(RealItem* item)
 QStringList RealModel::realDataNames() const
 {
     QStringList result;
-    for (auto item : realItems())
+    for (auto* item : realItems())
         result.append(item->dataName());
     return result;
 }

GUI/Model/Model/RealModel.h

@@ -45,6 +45,7 @@ public:
     QStringList realDataNames() const;
 
 signals:
+    // this signal is used only for testing
     void realDataAddedOrRemoved();
 
 private: