From 82e857a289ec34839546bc15b7395bd19fd55189 Mon Sep 17 00:00:00 2001
From: Mikhail Svechnikov <m.svechnikov@fz-juelich.de>
Date: Wed, 15 Feb 2023 13:34:08 +0100
Subject: [PATCH 1/3] clear simulation for failed jobs
---
GUI/Model/Model/JobQueueData.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/GUI/Model/Model/JobQueueData.cpp b/GUI/Model/Model/JobQueueData.cpp
index ebeca2cfed6..26476051803 100644
--- a/GUI/Model/Model/JobQueueData.cpp
+++ b/GUI/Model/Model/JobQueueData.cpp
@@ -57,6 +57,7 @@ void JobQueueData::runJob(JobItem* jobItem)
jobItem->setComments(message);
jobItem->setProgress(100);
jobItem->setStatus(JobStatus::Failed);
+ clearSimulation(identifier);
emit focusRequest(jobItem);
return;
}
--
GitLab
From 57d1ddac21ebfc89c24a75d33e22f94cee7ad89f Mon Sep 17 00:00:00 2001
From: Mikhail Svechnikov <m.svechnikov@fz-juelich.de>
Date: Wed, 15 Feb 2023 13:42:36 +0100
Subject: [PATCH 2/3] switch to message tab on failure
---
GUI/View/Job/JobPropertiesWidget.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/GUI/View/Job/JobPropertiesWidget.cpp b/GUI/View/Job/JobPropertiesWidget.cpp
index 52065fbe611..c5c24a883fb 100644
--- a/GUI/View/Job/JobPropertiesWidget.cpp
+++ b/GUI/View/Job/JobPropertiesWidget.cpp
@@ -86,9 +86,10 @@ void JobPropertiesWidget::setJobItem(JobItem* jobItem)
m_jobItem = jobItem;
m_propertiesModel->setJobItem(m_jobItem);
if (m_jobItem) {
- if (m_jobItem->isFailed())
+ if (m_jobItem->isFailed()) {
m_tabWidget->tabBar()->setTabTextColor(JOB_MESSAGES, Qt::red);
- else
+ m_tabWidget->setCurrentIndex(JOB_MESSAGES);
+ } else
m_tabWidget->tabBar()->setTabTextColor(JOB_MESSAGES, Qt::black);
m_commentsEditor->setText(m_jobItem->comments());
--
GitLab
From 539e936b4ad64c89a53f79102bafe1da048dc364 Mon Sep 17 00:00:00 2001
From: Mikhail Svechnikov <m.svechnikov@fz-juelich.de>
Date: Wed, 15 Feb 2023 15:09:20 +0100
Subject: [PATCH 3/3] JobView: reselect jobItem even if only one item is
selected
---
GUI/View/Job/JobView.cpp | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/GUI/View/Job/JobView.cpp b/GUI/View/Job/JobView.cpp
index cd5844c53be..a5203af14f5 100644
--- a/GUI/View/Job/JobView.cpp
+++ b/GUI/View/Job/JobView.cpp
@@ -59,11 +59,8 @@ void JobView::onFocusRequest(JobItem* jobItem)
if (jobItem->runInBackground())
return;
- QVector<JobItem*> jobs = m_jobSelector->selectedJobItems();
- if (jobs.size() != 1 || jobItem != jobs.front()) {
- m_jobSelector->makeJobItemSelected(jobItem);
- setActivityAndPresentationForNewJob(jobItem);
- }
+ m_jobSelector->makeJobItemSelected(jobItem);
+ setActivityAndPresentationForNewJob(jobItem);
emit focusRequest(GUI::ID::Job);
}
--
GitLab