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
ea8e45b1
Commit
ea8e45b1
authored
1 year ago
by
Wuttke, Joachim
Browse files
Options
Downloads
Patches
Plain Diff
clang-format
parent
c1cf8c17
No related branches found
No related tags found
1 merge request
!2142
numerous renamings for clearer layering of GUI/View
Pipeline
#120402
passed
1 year ago
Stage: build
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
GUI/Model/Sample/FormFactorItemCatalog.cpp
+9
-18
9 additions, 18 deletions
GUI/Model/Sample/FormFactorItemCatalog.cpp
GUI/Model/Sample/InterferenceItemCatalog.cpp
+2
-4
2 additions, 4 deletions
GUI/Model/Sample/InterferenceItemCatalog.cpp
with
11 additions
and
22 deletions
GUI/Model/Sample/FormFactorItemCatalog.cpp
+
9
−
18
View file @
ea8e45b1
...
...
@@ -139,19 +139,16 @@ UiInfo FormFactorItemCatalog::uiInfo(Type type)
":/images/ff_Pyramid2_64x64.png"
};
case
Type
::
BarGauss
:
return
{
"BarGauss"
,
"Rectangular cuboid"
,
":/images/ff_Box_64x64.png"
};
return
{
"BarGauss"
,
"Rectangular cuboid"
,
":/images/ff_Box_64x64.png"
};
case
Type
::
BarLorentz
:
return
{
"BarLorentz"
,
"Rectangular cuboid"
,
":/images/ff_Box_64x64.png"
};
return
{
"BarLorentz"
,
"Rectangular cuboid"
,
":/images/ff_Box_64x64.png"
};
case
Type
::
Box
:
return
{
"Box"
,
"Rectangular cuboid"
,
":/images/ff_Box_64x64.png"
};
case
Type
::
Cone
:
return
{
"Cone"
,
"Truncated cone with circular base"
,
":/images/ff_Cone_64x64.png"
};
return
{
"Cone"
,
"Truncated cone with circular base"
,
":/images/ff_Cone_64x64.png"
};
case
Type
::
Pyramid6
:
return
{
"Pyramid6"
,
"A truncated pyramid, based on a regular hexagon"
,
...
...
@@ -164,12 +161,10 @@ UiInfo FormFactorItemCatalog::uiInfo(Type type)
":/images/ff_Bipyramid4_64x64.png"
};
case
Type
::
Dodecahedron
:
return
{
"Dodecahedron"
,
"Dodecahedron"
,
":/images/ff_Dodecahedron_64x64.png"
};
return
{
"Dodecahedron"
,
"Dodecahedron"
,
":/images/ff_Dodecahedron_64x64.png"
};
case
Type
::
Cylinder
:
return
{
"Cylinder"
,
"Cylinder with a circular base"
,
":/images/ff_Cylinder_64x64.png"
};
return
{
"Cylinder"
,
"Cylinder with a circular base"
,
":/images/ff_Cylinder_64x64.png"
};
case
Type
::
EllipsoidalCylinder
:
return
{
"Ellipsoidal cylinder"
,
"Cylinder with an ellipse cross section"
,
...
...
@@ -189,16 +184,14 @@ UiInfo FormFactorItemCatalog::uiInfo(Type type)
":/images/ff_HemiEllipsoid_64x64.png"
};
case
Type
::
Icosahedron
:
return
{
"Icosahedron"
,
"Icosahedron"
,
":/images/ff_Icosahedron_64x64.png"
};
return
{
"Icosahedron"
,
"Icosahedron"
,
":/images/ff_Icosahedron_64x64.png"
};
case
Type
::
Prism3
:
return
{
"Prism3"
,
"Prism with an equilateral triangle base"
,
":/images/ff_Prism3_64x64.png"
};
case
Type
::
Prism6
:
return
{
"Prism6"
,
"Prism with a regular hexagonal base"
,
":/images/ff_Prism6_64x64.png"
};
return
{
"Prism6"
,
"Prism with a regular hexagonal base"
,
":/images/ff_Prism6_64x64.png"
};
case
Type
::
Pyramid4
:
return
{
"Pyramid4"
,
"Truncated pyramid with a square base"
,
...
...
@@ -241,12 +234,10 @@ UiInfo FormFactorItemCatalog::uiInfo(Type type)
":/images/ff_TruncatedCube_64x64.png"
};
case
Type
::
TruncatedSphere
:
return
{
"Truncated sphere"
,
"Spherical dome"
,
":/images/ff_TruncatedSphere_64x64.png"
};
return
{
"Truncated sphere"
,
"Spherical dome"
,
":/images/ff_TruncatedSphere_64x64.png"
};
case
Type
::
TruncatedSpheroid
:
return
{
"Truncated spheroid"
,
"Spheroidal dome"
,
":/images/ff_TruncatedSpheroid_64x64.png"
};
return
{
"Truncated spheroid"
,
"Spheroidal dome"
,
":/images/ff_TruncatedSpheroid_64x64.png"
};
case
Type
::
CantellatedCube
:
return
{
"Cantellated cube"
,
"A cube with truncated edges and vertices"
,
...
...
This diff is collapsed.
Click to expand it.
GUI/Model/Sample/InterferenceItemCatalog.cpp
+
2
−
4
View file @
ea8e45b1
...
...
@@ -57,11 +57,9 @@ UiInfo InterferenceItemCatalog::uiInfo(Type type)
return
{
"2D paracrystal"
,
"Interference function of two-dimensional paracrystal"
,
":/images/Paracrystal2D.png"
};
case
Type
::
Lattice1D
:
return
{
"1D lattice"
,
"Interference function of 1D lattice"
,
":/images/Lattice1D.png"
};
return
{
"1D lattice"
,
"Interference function of 1D lattice"
,
":/images/Lattice1D.png"
};
case
Type
::
Lattice2D
:
return
{
"2D lattice"
,
"Interference function of 2D lattice"
,
":/images/Lattice2D.png"
};
return
{
"2D lattice"
,
"Interference function of 2D lattice"
,
":/images/Lattice2D.png"
};
case
Type
::
FiniteLattice2D
:
return
{
"Finite 2D lattice"
,
"Interference function of finite 2D lattice"
,
":/images/Lattice2DFinite.png"
};
...
...
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