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
7272c8af
Commit
7272c8af
authored
1 year ago
by
Wuttke, Joachim
Browse files
Options
Downloads
Patches
Plain Diff
rm Img3D::Model::newParticle
parent
2267ce2c
No related branches found
No related tags found
1 merge request
!2257
rm unused fcts, detected by xunused
Pipeline
#124245
passed
1 year ago
Stage: build
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Img3D/Model/Model.cpp
+0
-75
0 additions, 75 deletions
Img3D/Model/Model.cpp
Img3D/Model/Model.h
+0
-2
0 additions, 2 deletions
Img3D/Model/Model.h
with
0 additions
and
77 deletions
Img3D/Model/Model.cpp
+
0
−
75
View file @
7272c8af
...
...
@@ -24,81 +24,6 @@ Model::Model()
Model
::~
Model
()
=
default
;
PlotParticle
*
Model
::
newParticle
(
EShape
k
,
float
R
)
{
using
namespace
Particles
;
float
D
=
2
*
R
;
switch
(
k
)
{
case
EShape
::
None
:
return
nullptr
;
case
EShape
::
BarGauss
:
return
new
BarGauss
(
D
,
D
,
5
*
D
);
case
EShape
::
BarLorentz
:
return
new
BarLorentz
(
D
,
D
,
5
*
D
);
case
EShape
::
Box
:
return
new
Box
(
D
,
D
,
D
);
case
EShape
::
Sphere
:
return
new
Sphere
(
R
);
case
EShape
::
Spheroid
:
return
new
Spheroid
(
R
/
2
,
D
);
case
EShape
::
Cylinder
:
return
new
Cylinder
(
R
,
D
);
case
EShape
::
TruncatedSphere
:
return
new
TruncatedSphere
(
R
,
D
/
3
);
case
EShape
::
TruncatedSpheroid
:
return
new
TruncatedSpheroid
(
R
,
2
*
R
,
1.5
);
case
EShape
::
Cone
:
return
new
Cone
(
R
,
D
,
1.3
f
);
case
EShape
::
Icosahedron
:
return
new
Icosahedron
(
R
*
IcosahedronL2R
);
case
EShape
::
Dodecahedron
:
return
new
Dodecahedron
(
R
*
DodecahedronL2R
);
case
EShape
::
TruncatedCube
:
return
new
TruncatedCube
(
D
,
D
/
3
);
case
EShape
::
Prism6
:
return
new
Prism6
(
R
,
D
);
case
EShape
::
Pyramid6
:
return
new
Pyramid6
(
R
,
D
,
1.3
f
);
case
EShape
::
Pyramid4
:
return
new
Pyramid4
(
D
,
D
,
1.3
f
);
case
EShape
::
Bipyramid4
:
return
new
Bipyramid4
(
D
,
R
*
3
/
2
,
2.
f
/
3
,
2
);
case
EShape
::
Prism3
:
return
new
Prism3
(
R
,
D
);
case
EShape
::
Pyramid3
:
return
new
Pyramid3
(
R
,
D
,
1.3
f
);
case
EShape
::
EllipsoidalCylinder
:
return
new
EllipsoidalCylinder
(
R
,
R
/
2
,
D
);
case
EShape
::
HemiEllipsoid
:
return
new
HemiEllipsoid
(
R
,
R
,
D
);
case
EShape
::
CosineRippleBox
:
return
new
CosineRippleBox
(
D
,
D
,
D
);
// TODO ripples should be elongated
case
EShape
::
CosineRippleGauss
:
return
new
CosineRippleGauss
(
D
,
D
,
D
);
// TODO ripples should be elongated
case
EShape
::
CosineRippleLorentz
:
return
new
CosineRippleLorentz
(
D
,
D
,
D
);
// TODO ripples should be elongated
case
EShape
::
SawtoothRippleBox
:
return
new
SawtoothRippleBox
(
D
,
D
,
D
);
// TODO ripples should be elongated
case
EShape
::
SawtoothRippleGauss
:
return
new
SawtoothRippleGauss
(
D
,
D
,
D
);
// TODO ripples should be elongated
case
EShape
::
SawtoothRippleLorentz
:
return
new
SawtoothRippleLorentz
(
D
,
D
,
D
);
// TODO ripples should be elongated
case
EShape
::
CantellatedCube
:
return
new
CantellatedCube
(
D
,
D
/
3
);
case
EShape
::
HorizontalCylinder
:
return
new
HorizontalCylinder
(
R
,
D
,
-
R
,
R
);
case
EShape
::
PlatonicOctahedron
:
return
new
PlatonicOctahedron
(
D
);
case
EShape
::
PlatonicTetrahedron
:
return
new
PlatonicTetrahedron
(
D
);
case
EShape
::
Pyramid2
:
return
new
Pyramid2
(
R
,
D
,
D
,
1.3
f
);
}
return
nullptr
;
}
void
Model
::
emplaceSolidBody
(
PlottableBody
*
o
)
{
ASSERT
(
o
);
...
...
This diff is collapsed.
Click to expand it.
Img3D/Model/Model.h
+
0
−
2
View file @
7272c8af
...
...
@@ -32,8 +32,6 @@ public:
Model
();
~
Model
()
override
;
static
PlotParticle
*
newParticle
(
EShape
k
,
float
R
);
void
emplaceSolidBody
(
PlottableBody
*
);
//!< adds an opaque object, takes ownership
void
emplaceTransparentBody
(
PlottableBody
*
);
//!< adds a transparent object, takes ownership
...
...
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