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
5b82e7d7
Commit
5b82e7d7
authored
8 months ago
by
Wuttke, Joachim
Browse files
Options
Downloads
Patches
Plain Diff
disambiguate fct name SourceItem::setFootprintItem
parent
eee03cf0
No related branches found
No related tags found
1 merge request
!2695
minor, while studying footprint and roughness items
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
GUI/Model/Beam/SourceItems.cpp
+2
-2
2 additions, 2 deletions
GUI/Model/Beam/SourceItems.cpp
GUI/Model/Beam/SourceItems.h
+1
-1
1 addition, 1 deletion
GUI/Model/Beam/SourceItems.h
GUI/Model/FromCore/ItemizeSimulation.cpp
+1
-1
1 addition, 1 deletion
GUI/Model/FromCore/ItemizeSimulation.cpp
with
4 additions
and
4 deletions
GUI/Model/Beam/SourceItems.cpp
+
2
−
2
View file @
5b82e7d7
...
@@ -145,7 +145,7 @@ void SourceItem::setSquareFootprint(double value)
...
@@ -145,7 +145,7 @@ void SourceItem::setSquareFootprint(double value)
m_footprint
.
setCertainItem
(
new
FootprintSquareItem
(
value
));
m_footprint
.
setCertainItem
(
new
FootprintSquareItem
(
value
));
}
}
void
SourceItem
::
setFootprint
(
const
IFootprint
*
footprint
)
void
SourceItem
::
setFootprint
Item
(
const
IFootprint
*
footprint
)
{
{
if
(
!
footprint
)
if
(
!
footprint
)
return
;
return
;
...
@@ -241,7 +241,7 @@ void ScanItem::setScan(const BeamScan* scan)
...
@@ -241,7 +241,7 @@ void ScanItem::setScan(const BeamScan* scan)
axis_item
->
setMin
(
axis
->
min
()
/
Units
::
deg
);
axis_item
->
setMin
(
axis
->
min
()
/
Units
::
deg
);
axis_item
->
setMax
(
axis
->
max
()
/
Units
::
deg
);
axis_item
->
setMax
(
axis
->
max
()
/
Units
::
deg
);
setFootprint
(
scan
->
commonFootprint
());
setFootprint
Item
(
scan
->
commonFootprint
());
}
}
void
ScanItem
::
writeTo
(
QXmlStreamWriter
*
w
)
const
void
ScanItem
::
writeTo
(
QXmlStreamWriter
*
w
)
const
...
...
This diff is collapsed.
Click to expand it.
GUI/Model/Beam/SourceItems.h
+
1
−
1
View file @
5b82e7d7
...
@@ -44,7 +44,7 @@ public:
...
@@ -44,7 +44,7 @@ public:
void
setAzimuthalAngle
(
double
value
);
void
setAzimuthalAngle
(
double
value
);
PolyItem
<
FootprintCatalog
>&
footprintSelection
()
{
return
m_footprint
;
}
PolyItem
<
FootprintCatalog
>&
footprintSelection
()
{
return
m_footprint
;
}
void
setFootprint
(
const
IFootprint
*
footprint
);
void
setFootprint
Item
(
const
IFootprint
*
footprint
);
void
setGaussianFootprint
(
double
value
);
void
setGaussianFootprint
(
double
value
);
void
setSquareFootprint
(
double
value
);
void
setSquareFootprint
(
double
value
);
...
...
This diff is collapsed.
Click to expand it.
GUI/Model/FromCore/ItemizeSimulation.cpp
+
1
−
1
View file @
5b82e7d7
...
@@ -185,7 +185,7 @@ void setGISASBeamItem(BeamItem* beam_item, const ScatteringSimulation& simulatio
...
@@ -185,7 +185,7 @@ void setGISASBeamItem(BeamItem* beam_item, const ScatteringSimulation& simulatio
beam_item
->
setWavelength
(
beam
.
wavelength
());
beam_item
->
setWavelength
(
beam
.
wavelength
());
beam_item
->
setInclinationAngle
(
Units
::
rad2deg
(
beam
.
alpha_i
()));
beam_item
->
setInclinationAngle
(
Units
::
rad2deg
(
beam
.
alpha_i
()));
beam_item
->
setAzimuthalAngle
(
Units
::
rad2deg
(
beam
.
phi_i
()));
beam_item
->
setAzimuthalAngle
(
Units
::
rad2deg
(
beam
.
phi_i
()));
beam_item
->
setFootprint
(
beam
.
footprint
());
beam_item
->
setFootprint
Item
(
beam
.
footprint
());
for
(
const
ParameterDistribution
&
pd
:
simulation
.
paramDistributions
())
{
for
(
const
ParameterDistribution
&
pd
:
simulation
.
paramDistributions
())
{
if
(
pd
.
whichParameter
()
==
ParameterDistribution
::
BeamWavelength
)
if
(
pd
.
whichParameter
()
==
ParameterDistribution
::
BeamWavelength
)
...
...
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