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
a48b5302
Commit
a48b5302
authored
2 years ago
by
Wuttke, Joachim
Committed by
Wuttke, Joachim
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
disambiguate fct name addParticle in Img3D
parent
cec3f0da
No related branches found
No related tags found
1 merge request
!1203
merge exec_spanZ into spanZ; add "Item" to some function names in GUI
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Img3D/Build/BuilderUtils.cpp
+6
-6
6 additions, 6 deletions
Img3D/Build/BuilderUtils.cpp
Img3D/Build/Particle3DContainer.cpp
+1
-1
1 addition, 1 deletion
Img3D/Build/Particle3DContainer.cpp
Img3D/Build/Particle3DContainer.h
+1
-1
1 addition, 1 deletion
Img3D/Build/Particle3DContainer.h
with
8 additions
and
8 deletions
Img3D/Build/BuilderUtils.cpp
+
6
−
6
View file @
a48b5302
...
...
@@ -148,7 +148,7 @@ Particle3DContainer Img3D::BuilderUtils::singleParticle3DContainer(const Particl
applyParticleColor
(
*
P_clone
,
*
particle3D
);
Particle3DContainer
result
;
result
.
addParticle
(
particle3D
.
release
());
result
.
addParticle
3D
(
particle3D
.
release
());
result
.
setCumulativeAbundance
(
P_clone
->
abundance
()
/
total_abundance
);
return
result
;
...
...
@@ -179,8 +179,8 @@ Img3D::BuilderUtils::particleCoreShell3DContainer(const CoreAndShell& particleCo
Particle3DContainer
result
;
result
.
addParticle
(
outCore
.
release
());
// index 0
result
.
addParticle
(
outShell
.
release
());
// index 1
result
.
addParticle
3D
(
outCore
.
release
());
// index 0
result
.
addParticle
3D
(
outShell
.
release
());
// index 1
result
.
setCumulativeAbundance
(
PCS_clone
->
abundance
()
/
total_abundance
);
return
result
;
...
...
@@ -211,7 +211,7 @@ Img3D::BuilderUtils::particleComposition3DContainer(const Compound& particleComp
// keep result flat
for
(
size_t
i
=
0
;
i
<
particle3DContainer
.
containerSize
();
++
i
)
{
result
.
addParticle
(
particle3DContainer
.
createParticle
(
i
).
release
());
result
.
addParticle
3D
(
particle3DContainer
.
createParticle
(
i
).
release
());
}
}
...
...
@@ -275,7 +275,7 @@ Particle3DContainer Img3D::BuilderUtils::mesocrystal3DContainer(Mesocrystal* con
particle3D
->
addTranslation
(
Img3D
::
F3fromR3
(
mesocrystal_translation
));
result
.
addParticle
(
particle3D
.
release
());
result
.
addParticle
3D
(
particle3D
.
release
());
}
}
}
...
...
@@ -291,7 +291,7 @@ Particle3DContainer Img3D::BuilderUtils::mesocrystal3DContainer(Mesocrystal* con
QColor
color
=
{};
color
.
setAlphaF
(
0.3
);
outerShape3D
->
setColor
(
color
);
result
.
addParticle
(
outerShape3D
.
release
());
result
.
addParticle
3D
(
outerShape3D
.
release
());
// set the correct abundance for the Mesocrystal
result
.
setCumulativeAbundance
(
M_clone
->
abundance
()
/
total_abundance
);
...
...
This diff is collapsed.
Click to expand it.
Img3D/Build/Particle3DContainer.cpp
+
1
−
1
View file @
a48b5302
...
...
@@ -24,7 +24,7 @@ void Particle3DContainer::clearContainer()
m_containerParticles
.
clear
();
}
void
Particle3DContainer
::
addParticle
(
Img3D
::
PlotParticle
*
particle3D
)
void
Particle3DContainer
::
addParticle
3D
(
Img3D
::
PlotParticle
*
particle3D
)
{
m_containerParticles
.
emplace_back
(
particle3D
);
}
...
...
This diff is collapsed.
Click to expand it.
Img3D/Build/Particle3DContainer.h
+
1
−
1
View file @
a48b5302
...
...
@@ -41,7 +41,7 @@ public:
size_t
containerSize
()
const
{
return
m_containerParticles
.
size
();
}
double
cumulativeAbundance
()
const
{
return
m_cumulativeAbundance
;
}
void
addParticle
(
Img3D
::
PlotParticle
*
particle3D
);
void
addParticle
3D
(
Img3D
::
PlotParticle
*
particle3D
);
void
setCumulativeAbundance
(
double
cumulativeAbundance
);
std
::
unique_ptr
<
Img3D
::
PlotParticle
>
createParticle
(
const
size_t
&
index
)
const
;
...
...
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