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
3d260ee9
Commit
3d260ee9
authored
3 years ago
by
Matthias Puchner
Browse files
Options
Downloads
Patches
Plain Diff
rm obsolete SessionModel code
parent
e4a33055
No related branches found
No related tags found
1 merge request
!570
remove SessionModel/Item from SampleModel and all related items
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
GUI/Model/Job/JobModel.cpp
+0
-23
0 additions, 23 deletions
GUI/Model/Job/JobModel.cpp
GUI/Model/Job/JobModel.h
+4
-10
4 additions, 10 deletions
GUI/Model/Job/JobModel.h
with
4 additions
and
33 deletions
GUI/Model/Job/JobModel.cpp
+
0
−
23
View file @
3d260ee9
...
@@ -16,8 +16,6 @@
...
@@ -16,8 +16,6 @@
#include
"GUI/Model/Data/IntensityDataItem.h"
#include
"GUI/Model/Data/IntensityDataItem.h"
#include
"GUI/Model/Data/PointwiseAxisItem.h"
#include
"GUI/Model/Data/PointwiseAxisItem.h"
#include
"GUI/Model/Data/RealDataItem.h"
#include
"GUI/Model/Data/RealDataItem.h"
#include
"GUI/Model/Fit/ParameterTreeItems.h"
#include
"GUI/Model/Group/GroupItem.h"
#include
"GUI/Model/Instrument/InstrumentItems.h"
#include
"GUI/Model/Instrument/InstrumentItems.h"
#include
"GUI/Model/Job/JobItem.h"
#include
"GUI/Model/Job/JobItem.h"
#include
"GUI/Model/Job/JobModelFunctions.h"
#include
"GUI/Model/Job/JobModelFunctions.h"
...
@@ -25,7 +23,6 @@
...
@@ -25,7 +23,6 @@
#include
"GUI/Model/Job/ParameterTreeUtils.h"
#include
"GUI/Model/Job/ParameterTreeUtils.h"
#include
"GUI/Model/Sample/ItemWithMaterial.h"
#include
"GUI/Model/Sample/ItemWithMaterial.h"
#include
"GUI/Model/Sample/MultiLayerItem.h"
#include
"GUI/Model/Sample/MultiLayerItem.h"
#include
"GUI/Util/Path.h"
JobModel
::
JobModel
(
QObject
*
parent
)
JobModel
::
JobModel
(
QObject
*
parent
)
:
SessionModel
(
GUI
::
Session
::
XML
::
JobModelTag
,
parent
),
m_queue_data
(
nullptr
)
:
SessionModel
(
GUI
::
Session
::
XML
::
JobModelTag
,
parent
),
m_queue_data
(
nullptr
)
...
@@ -41,20 +38,6 @@ JobModel::~JobModel()
...
@@ -41,20 +38,6 @@ JobModel::~JobModel()
delete
m_queue_data
;
delete
m_queue_data
;
}
}
const
JobItem
*
JobModel
::
getJobItemForIndex
(
const
QModelIndex
&
index
)
const
{
const
auto
*
result
=
dynamic_cast
<
const
JobItem
*>
(
itemForIndex
(
index
));
ASSERT
(
result
);
return
result
;
}
JobItem
*
JobModel
::
getJobItemForIndex
(
const
QModelIndex
&
index
)
{
auto
*
result
=
dynamic_cast
<
JobItem
*>
(
itemForIndex
(
index
));
ASSERT
(
result
);
return
result
;
}
JobItem
*
JobModel
::
getJobItemForIdentifier
(
const
QString
&
identifier
)
JobItem
*
JobModel
::
getJobItemForIdentifier
(
const
QString
&
identifier
)
{
{
for
(
auto
*
jobItem
:
jobItems
())
for
(
auto
*
jobItem
:
jobItems
())
...
@@ -175,11 +158,6 @@ void JobModel::readFrom(QXmlStreamReader* reader, MessageService* messageService
...
@@ -175,11 +158,6 @@ void JobModel::readFrom(QXmlStreamReader* reader, MessageService* messageService
}
}
}
}
void
JobModel
::
onCancelAllJobs
()
{
m_queue_data
->
onCancelAllJobs
();
}
void
JobModel
::
runJob
(
JobItem
*
jobItem
)
void
JobModel
::
runJob
(
JobItem
*
jobItem
)
{
{
m_queue_data
->
runJob
(
jobItem
);
m_queue_data
->
runJob
(
jobItem
);
...
@@ -195,7 +173,6 @@ void JobModel::removeJob(JobItem* jobItem)
...
@@ -195,7 +173,6 @@ void JobModel::removeJob(JobItem* jobItem)
ASSERT
(
jobItem
);
ASSERT
(
jobItem
);
m_queue_data
->
removeJob
(
jobItem
->
getIdentifier
());
m_queue_data
->
removeJob
(
jobItem
->
getIdentifier
());
emit
aboutToDeleteJobItem
(
jobItem
);
removeRows
(
jobItem
->
index
().
row
(),
1
,
QModelIndex
());
removeRows
(
jobItem
->
index
().
row
(),
1
,
QModelIndex
());
}
}
...
...
This diff is collapsed.
Click to expand it.
GUI/Model/Job/JobModel.h
+
4
−
10
View file @
3d260ee9
...
@@ -31,9 +31,6 @@ public:
...
@@ -31,9 +31,6 @@ public:
explicit
JobModel
(
QObject
*
parent
=
nullptr
);
explicit
JobModel
(
QObject
*
parent
=
nullptr
);
~
JobModel
()
override
;
~
JobModel
()
override
;
const
JobItem
*
getJobItemForIndex
(
const
QModelIndex
&
index
)
const
;
JobItem
*
getJobItemForIndex
(
const
QModelIndex
&
index
);
JobItem
*
getJobItemForIdentifier
(
const
QString
&
identifier
);
JobItem
*
getJobItemForIdentifier
(
const
QString
&
identifier
);
JobItem
*
addJob
(
const
MultiLayerItem
*
multiLayerItem
,
const
InstrumentItem
*
instrumentItem
,
JobItem
*
addJob
(
const
MultiLayerItem
*
multiLayerItem
,
const
InstrumentItem
*
instrumentItem
,
...
@@ -49,17 +46,14 @@ public:
...
@@ -49,17 +46,14 @@ public:
QVector
<
SessionItem
*>
nonXMLItems
()
const
override
;
QVector
<
SessionItem
*>
nonXMLItems
()
const
override
;
void
readFrom
(
QXmlStreamReader
*
reader
,
MessageService
*
messageService
=
nullptr
)
override
;
void
readFrom
(
QXmlStreamReader
*
reader
,
MessageService
*
messageService
=
nullptr
)
override
;
signals:
void
aboutToDeleteJobItem
(
JobItem
*
item
);
void
focusRequest
(
JobItem
*
item
);
void
globalProgress
(
int
);
public
slots
:
void
onCancelAllJobs
();
void
runJob
(
JobItem
*
jobItem
);
void
runJob
(
JobItem
*
jobItem
);
void
cancelJob
(
JobItem
*
jobItem
);
void
cancelJob
(
JobItem
*
jobItem
);
void
removeJob
(
JobItem
*
jobItem
);
void
removeJob
(
JobItem
*
jobItem
);
signals:
void
focusRequest
(
JobItem
*
item
);
void
globalProgress
(
int
);
private:
private:
//! generates numbered job name with new/unused number
//! generates numbered job name with new/unused number
QString
generateJobName
();
QString
generateJobName
();
...
...
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