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
1a951ba1
Commit
1a951ba1
authored
1 year ago
by
Wuttke, Joachim
Browse files
Options
Downloads
Patches
Plain Diff
fct -> local ns
parent
9b86c598
No related branches found
No related tags found
1 merge request
!1571
minor cleanup in AxisItem context
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
GUI/Model/Data/JobItemUtil.cpp
+14
-13
14 additions, 13 deletions
GUI/Model/Data/JobItemUtil.cpp
GUI/Model/Data/JobItemUtil.h
+0
-2
0 additions, 2 deletions
GUI/Model/Data/JobItemUtil.h
with
14 additions
and
15 deletions
GUI/Model/Data/JobItemUtil.cpp
+
14
−
13
View file @
1a951ba1
...
@@ -30,6 +30,20 @@ void updateAxesTitle(DataItem* intensityItem, const ICoordSystem& converter, Coo
...
@@ -30,6 +30,20 @@ void updateAxesTitle(DataItem* intensityItem, const ICoordSystem& converter, Coo
intensityItem
->
setYaxisTitle
(
QString
::
fromStdString
(
converter
.
nameOfAxis
(
1
,
units
)));
intensityItem
->
setYaxisTitle
(
QString
::
fromStdString
(
converter
.
nameOfAxis
(
1
,
units
)));
}
}
ComboProperty
availableUnits
(
const
ICoordSystem
&
converter
)
{
ComboProperty
result
;
for
(
auto
units
:
converter
.
availableUnits
())
{
auto
unit_name
=
GUI
::
Util
::
CoordName
::
nameFromCoord
(
units
);
if
(
!
unit_name
.
isEmpty
())
result
<<
unit_name
;
}
result
.
setCurrentValue
(
GUI
::
Util
::
CoordName
::
nameFromCoord
(
converter
.
defaultUnits
()));
return
result
;
}
}
// namespace
}
// namespace
...
@@ -101,16 +115,3 @@ void GUI::Model::JobItemUtil::setResults(DataItem* dataItem, const SimulationRes
...
@@ -101,16 +115,3 @@ void GUI::Model::JobItemUtil::setResults(DataItem* dataItem, const SimulationRes
auto
selected_units
=
GUI
::
Util
::
CoordName
::
coordFromName
(
dataItem
->
currentAxesUnits
());
auto
selected_units
=
GUI
::
Util
::
CoordName
::
coordFromName
(
dataItem
->
currentAxesUnits
());
dataItem
->
setDatafield
(
result
.
datafield
(
selected_units
));
dataItem
->
setDatafield
(
result
.
datafield
(
selected_units
));
}
}
ComboProperty
GUI
::
Model
::
JobItemUtil
::
availableUnits
(
const
ICoordSystem
&
converter
)
{
ComboProperty
result
;
for
(
auto
units
:
converter
.
availableUnits
())
{
auto
unit_name
=
GUI
::
Util
::
CoordName
::
nameFromCoord
(
units
);
if
(
!
unit_name
.
isEmpty
())
result
<<
unit_name
;
}
result
.
setCurrentValue
(
GUI
::
Util
::
CoordName
::
nameFromCoord
(
converter
.
defaultUnits
()));
return
result
;
}
This diff is collapsed.
Click to expand it.
GUI/Model/Data/JobItemUtil.h
+
0
−
2
View file @
1a951ba1
...
@@ -41,8 +41,6 @@ void createDefaultDetectorMap(DataItem* dataItem, const InstrumentItem* instrume
...
@@ -41,8 +41,6 @@ void createDefaultDetectorMap(DataItem* dataItem, const InstrumentItem* instrume
//! Sets simulation results into the DataItem
//! Sets simulation results into the DataItem
void
setResults
(
DataItem
*
dataItem
,
const
SimulationResult
&
result
);
void
setResults
(
DataItem
*
dataItem
,
const
SimulationResult
&
result
);
ComboProperty
availableUnits
(
const
ICoordSystem
&
converter
);
}
// namespace GUI::Model::JobItemUtil
}
// namespace GUI::Model::JobItemUtil
#endif // BORNAGAIN_GUI_MODEL_DATA_JOBITEMUTIL_H
#endif // BORNAGAIN_GUI_MODEL_DATA_JOBITEMUTIL_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