diff --git a/GUI/Model/Job/JobModel.cpp b/GUI/Model/Job/JobModel.cpp index 83e0339a108ee893b16939f1732bbffaa1db113b..0cd310819d38c4c114cda48b3643f8be4051273e 100644 --- a/GUI/Model/Job/JobModel.cpp +++ b/GUI/Model/Job/JobModel.cpp @@ -16,8 +16,6 @@ #include "GUI/Model/Data/IntensityDataItem.h" #include "GUI/Model/Data/PointwiseAxisItem.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/Job/JobItem.h" #include "GUI/Model/Job/JobModelFunctions.h" @@ -25,7 +23,6 @@ #include "GUI/Model/Job/ParameterTreeUtils.h" #include "GUI/Model/Sample/ItemWithMaterial.h" #include "GUI/Model/Sample/MultiLayerItem.h" -#include "GUI/Util/Path.h" JobModel::JobModel(QObject* parent) : SessionModel(GUI::Session::XML::JobModelTag, parent), m_queue_data(nullptr) @@ -41,20 +38,6 @@ JobModel::~JobModel() 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) { for (auto* jobItem : jobItems()) @@ -175,11 +158,6 @@ void JobModel::readFrom(QXmlStreamReader* reader, MessageService* messageService } } -void JobModel::onCancelAllJobs() -{ - m_queue_data->onCancelAllJobs(); -} - void JobModel::runJob(JobItem* jobItem) { m_queue_data->runJob(jobItem); @@ -195,7 +173,6 @@ void JobModel::removeJob(JobItem* jobItem) ASSERT(jobItem); m_queue_data->removeJob(jobItem->getIdentifier()); - emit aboutToDeleteJobItem(jobItem); removeRows(jobItem->index().row(), 1, QModelIndex()); } diff --git a/GUI/Model/Job/JobModel.h b/GUI/Model/Job/JobModel.h index 128986a06814ea1328d7a4d0c1841f1f9dbddc61..82fa631d9a7f9e8ebd7672d3fe9be1908de971c4 100644 --- a/GUI/Model/Job/JobModel.h +++ b/GUI/Model/Job/JobModel.h @@ -31,9 +31,6 @@ public: explicit JobModel(QObject* parent = nullptr); ~JobModel() override; - const JobItem* getJobItemForIndex(const QModelIndex& index) const; - JobItem* getJobItemForIndex(const QModelIndex& index); - JobItem* getJobItemForIdentifier(const QString& identifier); JobItem* addJob(const MultiLayerItem* multiLayerItem, const InstrumentItem* instrumentItem, @@ -49,17 +46,14 @@ public: QVector<SessionItem*> nonXMLItems() const 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 cancelJob(JobItem* jobItem); void removeJob(JobItem* jobItem); +signals: + void focusRequest(JobItem* item); + void globalProgress(int); + private: //! generates numbered job name with new/unused number QString generateJobName();