Skip to content
Snippets Groups Projects
Commit 5a9d608b authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

rename class and sources GUI/View/JobControl/JobSelector -> GUI/View/JobControl/JobsPanel

parent bb669e63
No related branches found
No related tags found
1 merge request!2345renaming classes and variables, mainly in jobs context
......@@ -23,7 +23,7 @@
#include "GUI/View/Fit/FitActivityPanel.h"
#include "GUI/View/FitMessage/JobMessagePanel.h"
#include "GUI/View/Job/JobViewActivities.h"
#include "GUI/View/JobControl/JobSelector.h"
#include "GUI/View/JobControl/JobsPanel.h"
#include "GUI/View/Manager/ProjectManager.h"
#include "GUI/View/Tuning/JobRealTimeWidget.h"
......@@ -56,7 +56,7 @@ JobView::JobView(QProgressBar* progressBar)
//... Subwindows
m_job_selector = new JobSelector(gDoc->jobsSet(), this);
m_job_selector = new JobsPanel(gDoc->jobsSet(), this);
m_job_real_time_widget = new JobRealTimeWidget(gDoc->jobsSet(), this);
m_docks->addWidget(JobViewFlags::JOB_LIST_DOCK, m_job_selector, Qt::LeftDockWidgetArea);
......@@ -77,9 +77,8 @@ JobView::JobView(QProgressBar* progressBar)
// Focus request: JobsSet -> this
connect(gDoc->jobsSet(), &JobsSet::jobSelected, this, &JobView::onJobSelected);
// JobItem selection: JobSelector -> this
connect(m_job_selector, &JobSelector::selectedJobsChanged, this,
&JobView::onJobSelectionChanged);
// JobItem selection: JobsPanel -> this
connect(m_job_selector, &JobsPanel::selectedJobsChanged, this, &JobView::onJobSelectionChanged);
connect(m_fit_activity_panel, &FitActivityPanel::showLog, m_job_message_panel,
&JobMessagePanel::setLog);
......
......@@ -26,7 +26,7 @@ class FitActivityPanel;
class JobItem;
class JobMessagePanel;
class JobRealTimeWidget;
class JobSelector;
class JobsPanel;
class JobView;
class StackedJobFrames;
......@@ -58,7 +58,7 @@ private:
DocksController* m_docks;
JobSelector* m_job_selector;
JobsPanel* m_job_selector;
StackedJobFrames* m_data_frames;
JobRealTimeWidget* m_job_real_time_widget;
FitActivityPanel* m_fit_activity_panel;
......
......@@ -23,7 +23,7 @@
class JobItem;
class JobparQModel;
//! The JobEditor class holds component editor for JobItem. Part of JobSelector,
//! The JobEditor class holds component editor for JobItem. Part of JobsPanel,
//! resides at lower left corner of JobView.
class JobEditor : public QWidget {
......
......@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit reflection and scattering
//
//! @file GUI/View/JobControl/JobSelector.cpp
//! @brief Implements class JobSelector.
//! @file GUI/View/JobControl/JobsPanel.cpp
//! @brief Implements class JobsPanel.
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
......@@ -12,7 +12,7 @@
//
// ************************************************************************************************
#include "GUI/View/JobControl/JobSelector.h"
#include "GUI/View/JobControl/JobsPanel.h"
#include "Base/Util/Assert.h"
#include "GUI/View/JobControl/JobEditor.h"
#include "GUI/View/JobControl/JobListing.h"
......@@ -42,14 +42,14 @@ QList<int> qVariantToList(const QVariant& var)
} // namespace
JobSelector::JobSelector(JobsSet* jobs, QWidget* parent)
JobsPanel::JobsPanel(JobsSet* jobs, QWidget* parent)
: QWidget(parent)
, m_splitter(new QSplitter(Qt::Vertical, this))
, m_job_editor(new JobEditor(this))
, m_jobs(jobs)
{
setWindowTitle(GUI::Style::JobSelectorName);
setObjectName("JobSelector");
setWindowTitle(GUI::Style::JobsPanelName);
setObjectName("JobsPanel");
auto* layout = new QVBoxLayout(this);
layout->setContentsMargins(0, 0, 0, 0);
......@@ -67,7 +67,7 @@ JobSelector::JobSelector(JobsSet* jobs, QWidget* parent)
m_splitter->setCollapsible(1, false);
m_splitter->setStretchFactor(1, 0);
connect(m_listing, &JobListing::selectedJobsChanged, this, &JobSelector::onSelectedJobsChanged);
connect(m_listing, &JobListing::selectedJobsChanged, this, &JobsPanel::onSelectedJobsChanged);
onSelectedJobsChanged(selectedJobItems());
......@@ -75,30 +75,30 @@ JobSelector::JobSelector(JobsSet* jobs, QWidget* parent)
applySettings();
}
JobSelector::~JobSelector()
JobsPanel::~JobsPanel()
{
saveSettings();
}
void JobSelector::resizeEvent(QResizeEvent* event)
void JobsPanel::resizeEvent(QResizeEvent* event)
{
QWidget::resizeEvent(event);
setMinimumWidth(0);
setMaximumWidth(QWIDGETSIZE_MAX);
}
QVector<JobItem*> JobSelector::selectedJobItems() const
QVector<JobItem*> JobsPanel::selectedJobItems() const
{
return m_listing->selectedJobItems();
}
void JobSelector::makeJobItemSelected(JobItem* item)
void JobsPanel::makeJobItemSelected(JobItem* item)
{
ASSERT(item);
m_listing->selectJob(item);
}
void JobSelector::onSelectedJobsChanged(const QVector<JobItem*>& jobs)
void JobsPanel::onSelectedJobsChanged(const QVector<JobItem*>& jobs)
{
if (jobs.size() == 1)
m_job_editor->setJobItem(jobs.front());
......@@ -107,7 +107,7 @@ void JobSelector::onSelectedJobsChanged(const QVector<JobItem*>& jobs)
emit selectedJobsChanged();
}
void JobSelector::applySettings()
void JobsPanel::applySettings()
{
QSettings settings;
if (settings.childGroups().contains(GUI::Style::S_JOB_SELECTOR_PANEL)) {
......@@ -119,7 +119,7 @@ void JobSelector::applySettings()
}
}
void JobSelector::saveSettings()
void JobsPanel::saveSettings()
{
QSettings settings;
settings.beginGroup(GUI::Style::S_JOB_SELECTOR_PANEL);
......
......@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit reflection and scattering
//
//! @file GUI/View/JobControl/JobSelector.h
//! @brief Defines class JobSelector.
//! @file GUI/View/JobControl/JobsPanel.h
//! @brief Defines class JobsPanel.
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
......@@ -12,8 +12,8 @@
//
// ************************************************************************************************
#ifndef BORNAGAIN_GUI_VIEW_JOBCONTROL_JOBSELECTOR_H
#define BORNAGAIN_GUI_VIEW_JOBCONTROL_JOBSELECTOR_H
#ifndef BORNAGAIN_GUI_VIEW_JOBCONTROL_JOBSPANEL_H
#define BORNAGAIN_GUI_VIEW_JOBCONTROL_JOBSPANEL_H
#include <QSplitter>
#include <QWidget>
......@@ -25,11 +25,11 @@ class JobsSet;
//! A panel with a JobListing on top and a JobEditor an bottom.
class JobSelector : public QWidget {
class JobsPanel : public QWidget {
Q_OBJECT
public:
explicit JobSelector(JobsSet* jobs, QWidget* parent = nullptr);
~JobSelector();
explicit JobsPanel(JobsSet* jobs, QWidget* parent = nullptr);
~JobsPanel();
void resizeEvent(QResizeEvent* event) override;
......@@ -53,4 +53,4 @@ private:
JobsSet* m_jobs;
};
#endif // BORNAGAIN_GUI_VIEW_JOBCONTROL_JOBSELECTOR_H
#endif // BORNAGAIN_GUI_VIEW_JOBCONTROL_JOBSPANEL_H
......@@ -22,7 +22,7 @@ namespace GUI::Style {
// Settings groups
const char S_MAIN_WINDOW[] = "MainWindow";
const char S_JOB_MESSAGE_PANEL[] = "JobMessagePanel";
const char S_JOB_SELECTOR_PANEL[] = "JobSelectorPanel";
const char S_JOB_SELECTOR_PANEL[] = "JobsPanelPanel";
const char S_FIT_ACTIVITY_PANEL[] = "FitActivityPanel";
const char S_FIT_SESSION_WIDGET[] = "FitSessionWidget";
const char S_JOB_PROPERTIES_WIDGET[] = "JobEditor";
......@@ -64,7 +64,7 @@ const unsigned int INSTRUMENT_LIBRARY_EDITOR_TREE_WIDTH = 250;
const QString JobRealTimeWidgetName = "Job Real Time";
const QString JobEditorName = "Job Properties";
const QString JobFitPanelName = "Fit Panel";
const QString JobSelectorName = "Job Selector";
const QString JobsPanelName = "Job Selector";
const int toolbar_icon_size = 32;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment