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
853ff741
Commit
853ff741
authored
2 years ago
by
Mikhail Svechnikov
Browse files
Options
Downloads
Patches
Plain Diff
reverted commit
e87de6bc
to separate Jobs Activity and Presentation
parent
13e8f300
No related branches found
No related tags found
1 merge request
!837
GUI: fixed crashes when rerun jobs with 2D reference data
Pipeline
#64148
passed
2 years ago
Stage: build
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
GUI/View/Job/JobResultsPresenter.cpp
+0
-12
0 additions, 12 deletions
GUI/View/Job/JobResultsPresenter.cpp
GUI/View/Job/JobResultsPresenter.h
+0
-4
0 additions, 4 deletions
GUI/View/Job/JobResultsPresenter.h
with
0 additions
and
16 deletions
GUI/View/Job/JobResultsPresenter.cpp
+
0
−
12
View file @
853ff741
...
...
@@ -49,11 +49,6 @@ QString JobResultsPresenter::itemPresentation() const
void
JobResultsPresenter
::
setItem
(
SessionItem
*
item
)
{
if
(
currentItem
())
currentItem
()
->
mapper
()
->
unsubscribe
(
this
);
if
(
item
)
item
->
mapper
()
->
setOnPropertyChange
(
[
this
](
auto
&&
PH1
)
{
notifyJobPropertyChanged
(
std
::
forward
<
decltype
(
PH1
)
>
(
PH1
));
});
ItemComboWidget
::
setItem
(
item
);
}
...
...
@@ -67,7 +62,6 @@ void JobResultsPresenter::setPresentation(const QString& presentationType)
void
JobResultsPresenter
::
setPresentation
(
JobViewActivity
activity
)
{
m_activity
=
activity
;
QString
presentation
;
auto
*
jobItem
=
dynamic_cast
<
JobItem
*>
(
currentItem
());
if
(
jobItem
&&
!
jobItem
->
isRunning
())
{
...
...
@@ -144,9 +138,3 @@ QString JobResultsPresenter::fitPresentationOfInstrument(InstrumentItem* instrum
return
"Fit 2D Data"
;
}
void
JobResultsPresenter
::
notifyJobPropertyChanged
(
const
QString
&
property
)
{
if
(
JobItem
::
isStatusPropertyName
(
property
))
setPresentation
(
m_activity
);
}
This diff is collapsed.
Click to expand it.
GUI/View/Job/JobResultsPresenter.h
+
0
−
4
View file @
853ff741
...
...
@@ -45,10 +45,6 @@ private:
QString
defaultPresentationOfInstrument
(
InstrumentItem
*
instrumentItem
);
QStringList
defaultActivePresentationsOfInstrument
(
InstrumentItem
*
instrumentItem
);
QString
fitPresentationOfInstrument
(
InstrumentItem
*
instrumentItem
);
void
notifyJobPropertyChanged
(
const
QString
&
property
);
private:
JobViewActivity
m_activity
;
};
#endif // BORNAGAIN_GUI_VIEW_JOB_JOBRESULTSPRESENTER_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