Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
BornAgain
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mlz
BornAgain
Commits
356c3339
Commit
356c3339
authored
1 year ago
by
Wuttke, Joachim
Browse files
Options
Downloads
Patches
Plain Diff
merge GUI/View/Job/JobViewFlags into JobViewActivities
parent
51657754
No related branches found
No related tags found
1 merge request
!2075
various little corrections
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
GUI/View/Job/JobViewActivities.h
+16
-1
16 additions, 1 deletion
GUI/View/Job/JobViewActivities.h
GUI/View/Job/JobViewFlags.h
+0
-35
0 additions, 35 deletions
GUI/View/Job/JobViewFlags.h
with
16 additions
and
36 deletions
GUI/View/Job/JobViewActivities.h
+
16
−
1
View file @
356c3339
...
@@ -15,11 +15,26 @@
...
@@ -15,11 +15,26 @@
#ifndef BORNAGAIN_GUI_VIEW_JOB_JOBVIEWACTIVITIES_H
#ifndef BORNAGAIN_GUI_VIEW_JOB_JOBVIEWACTIVITIES_H
#define BORNAGAIN_GUI_VIEW_JOB_JOBVIEWACTIVITIES_H
#define BORNAGAIN_GUI_VIEW_JOB_JOBVIEWACTIVITIES_H
#include
"GUI/View/Job/JobView
Flags
.h"
#include
<Q
Flags
>
#include
<QList>
#include
<QList>
#include
<QString>
#include
<QString>
#include
<QVector>
#include
<QVector>
//! The JobViewFlags class is a namespace for various flags used in JobView.
class
JobViewFlags
{
public:
enum
EDocksId
{
JOB_LIST_DOCK
,
REAL_TIME_DOCK
,
FIT_PANEL_DOCK
,
JOB_MESSAGE_DOCK
,
};
Q_DECLARE_FLAGS
(
Dock
,
EDocksId
)
};
Q_DECLARE_OPERATORS_FOR_FLAGS
(
JobViewFlags
::
Dock
)
enum
class
JobViewActivity
{
JobView
,
RealTime
,
Fitting
};
enum
class
JobViewActivity
{
JobView
,
RealTime
,
Fitting
};
//! The JobViewActivities namespace is a helper to get info related to JobView activities
//! The JobViewActivities namespace is a helper to get info related to JobView activities
...
...
This diff is collapsed.
Click to expand it.
GUI/View/Job/JobViewFlags.h
deleted
100644 → 0
+
0
−
35
View file @
51657754
// ************************************************************************************************
//
// BornAgain: simulate and fit reflection and scattering
//
//! @file GUI/View/Job/JobViewFlags.h
//! @brief Defines class JobViewFlags
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
//! @copyright Forschungszentrum Jülich GmbH 2018
//! @authors Scientific Computing Group at MLZ (see CITATION, AUTHORS)
//
// ************************************************************************************************
#ifndef BORNAGAIN_GUI_VIEW_JOB_JOBVIEWFLAGS_H
#define BORNAGAIN_GUI_VIEW_JOB_JOBVIEWFLAGS_H
#include
<QFlags>
//! The JobViewFlags class is a namespace for various flags used in JobView.
class
JobViewFlags
{
public:
enum
EDocksId
{
JOB_LIST_DOCK
,
REAL_TIME_DOCK
,
FIT_PANEL_DOCK
,
JOB_MESSAGE_DOCK
,
};
Q_DECLARE_FLAGS
(
Dock
,
EDocksId
)
};
Q_DECLARE_OPERATORS_FOR_FLAGS
(
JobViewFlags
::
Dock
)
#endif // BORNAGAIN_GUI_VIEW_JOB_JOBVIEWFLAGS_H
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment