Skip to content
Snippets Groups Projects
Commit 9f6c9b1f authored by Mikhail Svechnikov's avatar Mikhail Svechnikov
Browse files

rm/rename one-time setJob methods and signals

parent 8077beb4
No related branches found
No related tags found
1 merge request!2761Fix serialization and plotting jobs without loaded data
...@@ -92,7 +92,7 @@ CentralWidget::CentralWidget() ...@@ -92,7 +92,7 @@ CentralWidget::CentralWidget()
m_views_stack->insertWidget(ViewId::Simulation, m_simulation_view); m_views_stack->insertWidget(ViewId::Simulation, m_simulation_view);
m_views_stack->insertWidget(ViewId::Job, m_job_view); m_views_stack->insertWidget(ViewId::Job, m_job_view);
connect(m_job_view, &JobView::jobSelected, connect(m_job_view, &JobView::newJobActivated,
[this]() { m_view_selection_buttons->button(ViewId::Job)->click(); }); [this]() { m_view_selection_buttons->button(ViewId::Job)->click(); });
m_job_view->onJobSelectionChanged(); m_job_view->onJobSelectionChanged();
} }
......
...@@ -75,7 +75,7 @@ JobView::JobView(QProgressBar* progressBar) ...@@ -75,7 +75,7 @@ JobView::JobView(QProgressBar* progressBar)
// Focus request: JobsSet -> this // Focus request: JobsSet -> this
connect(gDoc->jobs(), &JobsSet::jobMeritsAttention, connect(gDoc->jobs(), &JobsSet::jobMeritsAttention,
[this](JobItem* job_item) { onJobSelected(job_item); }); [this](JobItem* job_item) { switchToNewJob(job_item); });
// JobItem selection: JobsPanel -> this // JobItem selection: JobsPanel -> this
connect(m_jobs_panel, &JobsPanel::selectedJobsChanged, this, &JobView::onJobSelectionChanged); connect(m_jobs_panel, &JobsPanel::selectedJobsChanged, this, &JobView::onJobSelectionChanged);
...@@ -112,7 +112,7 @@ void JobView::fillViewMenu(QMenu* menu) ...@@ -112,7 +112,7 @@ void JobView::fillViewMenu(QMenu* menu)
void JobView::onJobSelectionChanged() void JobView::onJobSelectionChanged()
{ {
setJob(); m_data_frames->showCurrentFrame();
m_job_real_time_widget->setJobItem(selectedJobItem()); m_job_real_time_widget->setJobItem(selectedJobItem());
m_fit_activity_panel->setJobItem(selectedJobItem()); m_fit_activity_panel->setJobItem(selectedJobItem());
...@@ -125,7 +125,7 @@ void JobView::onJobSelectionChanged() ...@@ -125,7 +125,7 @@ void JobView::onJobSelectionChanged()
setActivity(JobViewActivities::activityFromName(jobActivity)); setActivity(JobViewActivities::activityFromName(jobActivity));
} }
void JobView::onJobSelected(JobItem* job_item) void JobView::switchToNewJob(JobItem* job_item)
{ {
ASSERT(job_item); ASSERT(job_item);
if (!job_item->simulationOptionsItem()->runImmediately()) if (!job_item->simulationOptionsItem()->runImmediately())
...@@ -143,14 +143,9 @@ void JobView::onJobSelected(JobItem* job_item) ...@@ -143,14 +143,9 @@ void JobView::onJobSelected(JobItem* job_item)
setActivity(newActivity); setActivity(newActivity);
setJob();
emit jobSelected();
}
void JobView::setJob()
{
m_data_frames->showCurrentFrame(); m_data_frames->showCurrentFrame();
emit newJobActivated();
} }
......
...@@ -41,7 +41,7 @@ public: ...@@ -41,7 +41,7 @@ public:
void fillViewMenu(QMenu* menu); void fillViewMenu(QMenu* menu);
signals: signals:
void jobSelected(); void newJobActivated();
public slots: public slots:
void onJobSelectionChanged(); void onJobSelectionChanged();
...@@ -49,8 +49,7 @@ public slots: ...@@ -49,8 +49,7 @@ public slots:
private: private:
JobItem* selectedJobItem(); JobItem* selectedJobItem();
void setActivity(JobViewActivity activity); void setActivity(JobViewActivity activity);
void setJob(); void switchToNewJob(JobItem* job_item);
void onJobSelected(JobItem* job_item);
void resetLayout(); void resetLayout();
......
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