Skip to content
Snippets Groups Projects
Commit 3d260ee9 authored by Matthias Puchner's avatar Matthias Puchner
Browse files

rm obsolete SessionModel code

parent e4a33055
No related branches found
No related tags found
1 merge request!570remove SessionModel/Item from SampleModel and all related items
...@@ -16,8 +16,6 @@ ...@@ -16,8 +16,6 @@
#include "GUI/Model/Data/IntensityDataItem.h" #include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Model/Data/PointwiseAxisItem.h" #include "GUI/Model/Data/PointwiseAxisItem.h"
#include "GUI/Model/Data/RealDataItem.h" #include "GUI/Model/Data/RealDataItem.h"
#include "GUI/Model/Fit/ParameterTreeItems.h"
#include "GUI/Model/Group/GroupItem.h"
#include "GUI/Model/Instrument/InstrumentItems.h" #include "GUI/Model/Instrument/InstrumentItems.h"
#include "GUI/Model/Job/JobItem.h" #include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Job/JobModelFunctions.h" #include "GUI/Model/Job/JobModelFunctions.h"
...@@ -25,7 +23,6 @@ ...@@ -25,7 +23,6 @@
#include "GUI/Model/Job/ParameterTreeUtils.h" #include "GUI/Model/Job/ParameterTreeUtils.h"
#include "GUI/Model/Sample/ItemWithMaterial.h" #include "GUI/Model/Sample/ItemWithMaterial.h"
#include "GUI/Model/Sample/MultiLayerItem.h" #include "GUI/Model/Sample/MultiLayerItem.h"
#include "GUI/Util/Path.h"
JobModel::JobModel(QObject* parent) JobModel::JobModel(QObject* parent)
: SessionModel(GUI::Session::XML::JobModelTag, parent), m_queue_data(nullptr) : SessionModel(GUI::Session::XML::JobModelTag, parent), m_queue_data(nullptr)
...@@ -41,20 +38,6 @@ JobModel::~JobModel() ...@@ -41,20 +38,6 @@ JobModel::~JobModel()
delete m_queue_data; delete m_queue_data;
} }
const JobItem* JobModel::getJobItemForIndex(const QModelIndex& index) const
{
const auto* result = dynamic_cast<const JobItem*>(itemForIndex(index));
ASSERT(result);
return result;
}
JobItem* JobModel::getJobItemForIndex(const QModelIndex& index)
{
auto* result = dynamic_cast<JobItem*>(itemForIndex(index));
ASSERT(result);
return result;
}
JobItem* JobModel::getJobItemForIdentifier(const QString& identifier) JobItem* JobModel::getJobItemForIdentifier(const QString& identifier)
{ {
for (auto* jobItem : jobItems()) for (auto* jobItem : jobItems())
...@@ -175,11 +158,6 @@ void JobModel::readFrom(QXmlStreamReader* reader, MessageService* messageService ...@@ -175,11 +158,6 @@ void JobModel::readFrom(QXmlStreamReader* reader, MessageService* messageService
} }
} }
void JobModel::onCancelAllJobs()
{
m_queue_data->onCancelAllJobs();
}
void JobModel::runJob(JobItem* jobItem) void JobModel::runJob(JobItem* jobItem)
{ {
m_queue_data->runJob(jobItem); m_queue_data->runJob(jobItem);
...@@ -195,7 +173,6 @@ void JobModel::removeJob(JobItem* jobItem) ...@@ -195,7 +173,6 @@ void JobModel::removeJob(JobItem* jobItem)
ASSERT(jobItem); ASSERT(jobItem);
m_queue_data->removeJob(jobItem->getIdentifier()); m_queue_data->removeJob(jobItem->getIdentifier());
emit aboutToDeleteJobItem(jobItem);
removeRows(jobItem->index().row(), 1, QModelIndex()); removeRows(jobItem->index().row(), 1, QModelIndex());
} }
......
...@@ -31,9 +31,6 @@ public: ...@@ -31,9 +31,6 @@ public:
explicit JobModel(QObject* parent = nullptr); explicit JobModel(QObject* parent = nullptr);
~JobModel() override; ~JobModel() override;
const JobItem* getJobItemForIndex(const QModelIndex& index) const;
JobItem* getJobItemForIndex(const QModelIndex& index);
JobItem* getJobItemForIdentifier(const QString& identifier); JobItem* getJobItemForIdentifier(const QString& identifier);
JobItem* addJob(const MultiLayerItem* multiLayerItem, const InstrumentItem* instrumentItem, JobItem* addJob(const MultiLayerItem* multiLayerItem, const InstrumentItem* instrumentItem,
...@@ -49,17 +46,14 @@ public: ...@@ -49,17 +46,14 @@ public:
QVector<SessionItem*> nonXMLItems() const override; QVector<SessionItem*> nonXMLItems() const override;
void readFrom(QXmlStreamReader* reader, MessageService* messageService = nullptr) override; void readFrom(QXmlStreamReader* reader, MessageService* messageService = nullptr) override;
signals:
void aboutToDeleteJobItem(JobItem* item);
void focusRequest(JobItem* item);
void globalProgress(int);
public slots:
void onCancelAllJobs();
void runJob(JobItem* jobItem); void runJob(JobItem* jobItem);
void cancelJob(JobItem* jobItem); void cancelJob(JobItem* jobItem);
void removeJob(JobItem* jobItem); void removeJob(JobItem* jobItem);
signals:
void focusRequest(JobItem* item);
void globalProgress(int);
private: private:
//! generates numbered job name with new/unused number //! generates numbered job name with new/unused number
QString generateJobName(); QString generateJobName();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment