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

rm unnecessary SessionModel index calculation

parent 19512212
No related branches found
No related tags found
1 merge request!570remove SessionModel/Item from SampleModel and all related items
......@@ -123,8 +123,8 @@ bool JobModel::hasUnfinishedJobs()
void JobModel::clear()
{
for (auto* item : topItems())
removeJob(item->index());
for (auto* job : jobItems())
removeJob(job);
SessionModel::clear();
}
......@@ -182,24 +182,23 @@ void JobModel::onCancelAllJobs()
m_queue_data->onCancelAllJobs();
}
void JobModel::runJob(const QModelIndex& index)
void JobModel::runJob(JobItem* jobItem)
{
m_queue_data->runJob(getJobItemForIndex(index));
m_queue_data->runJob(jobItem);
}
void JobModel::cancelJob(const QModelIndex& index)
void JobModel::cancelJob(JobItem* jobItem)
{
m_queue_data->cancelJob(getJobItemForIndex(index)->getIdentifier());
m_queue_data->cancelJob(jobItem->getIdentifier());
}
void JobModel::removeJob(const QModelIndex& index)
void JobModel::removeJob(JobItem* jobItem)
{
JobItem* jobItem = getJobItemForIndex(index);
ASSERT(jobItem);
m_queue_data->removeJob(jobItem->getIdentifier());
emit aboutToDeleteJobItem(jobItem);
removeRows(index.row(), 1, QModelIndex());
removeRows(jobItem->index().row(), 1, QModelIndex());
}
//! generates job name
......
......@@ -56,9 +56,9 @@ signals:
public slots:
void onCancelAllJobs();
void runJob(const QModelIndex& index);
void cancelJob(const QModelIndex& index);
void removeJob(const QModelIndex& index);
void runJob(JobItem* jobItem);
void cancelJob(JobItem* jobItem);
void removeJob(JobItem* jobItem);
private:
QString generateJobName();
......
......@@ -97,7 +97,7 @@ void ParameterTuningWidget::onCurrentLinkChanged(ParameterItem* item)
if (item) {
// link.updateItem(); // FIXME circular dependency if uncomment
m_jobModel->runJob(jobItem()->index());
m_jobModel->runJob(jobItem());
}
}
......@@ -151,7 +151,7 @@ void ParameterTuningWidget::restoreModelsOfCurrentJobItem()
closeActiveEditors();
m_jobModel->restore(jobItem());
m_jobModel->runJob(jobItem()->index());
m_jobModel->runJob(jobItem());
}
void ParameterTuningWidget::makeSelected(ParameterItem* item)
......
......@@ -78,7 +78,7 @@ QModelIndex JobListModel::indexForJob(JobItem* job)
void JobListModel::runJob(const QModelIndex& index)
{
m_jobs->runJob(m_jobs->indexOfItem(jobForIndex(index)));
m_jobs->runJob(jobForIndex(index));
}
void JobListModel::removeJob(const QModelIndex& index)
......@@ -86,13 +86,13 @@ void JobListModel::removeJob(const QModelIndex& index)
beginRemoveRows(QModelIndex(), index.row(), index.row());
JobItem* job = jobForIndex(index);
detachFromJob(job);
m_jobs->removeJob(m_jobs->indexOfItem(job));
m_jobs->removeJob(job);
endRemoveRows();
}
void JobListModel::cancelJob(const QModelIndex& index)
{
m_jobs->cancelJob(m_jobs->indexOfItem(jobForIndex(index)));
m_jobs->cancelJob(jobForIndex(index));
}
//--------------------------------------------------------------------------------------------------
......
......@@ -146,7 +146,7 @@ void SimulationView::runSimulation()
JobModel* jobModel = m_document->jobModel();
JobItem* jobItem = jobModel->addJob(selectedSample(), selectedInstrument(), selectedRealData(),
*optionsItem());
jobModel->runJob(jobItem->index());
jobModel->runJob(jobItem);
}
void SimulationView::exportPythonScript()
......
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