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
75706055
Commit
75706055
authored
2 years ago
by
Mikhail Svechnikov
Browse files
Options
Downloads
Patches
Plain Diff
create map of material names
parent
ab8e4d79
No related branches found
No related tags found
1 merge request
!1346
GUI: use different materials for particles and layers by default
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
GUI/Model/Sample/MaterialModel.cpp
+13
-5
13 additions, 5 deletions
GUI/Model/Sample/MaterialModel.cpp
GUI/Model/Sample/MaterialModel.h
+5
-0
5 additions, 0 deletions
GUI/Model/Sample/MaterialModel.h
with
18 additions
and
5 deletions
GUI/Model/Sample/MaterialModel.cpp
+
13
−
5
View file @
75706055
...
...
@@ -29,13 +29,15 @@ const QString Material("Material");
QColor
suggestMaterialColor
(
const
QString
&
name
)
{
if
(
name
.
contains
(
"
Vacuum
"
))
if
(
name
.
contains
(
material_name_map
.
key
(
DefaultMaterials
::
Vacuum
)
))
return
QColor
(
179
,
242
,
255
);
if
(
name
.
contains
(
"
Substrate
"
))
if
(
name
.
contains
(
material_name_map
.
key
(
DefaultMaterials
::
Substrate
)
))
return
QColor
(
205
,
102
,
0
);
if
(
name
.
contains
(
"
Default
"
))
if
(
name
.
contains
(
material_name_map
.
key
(
DefaultMaterials
::
Default
)
))
return
QColor
(
Qt
::
green
);
if
(
name
.
contains
(
"Particle"
))
if
(
name
.
contains
(
material_name_map
.
key
(
DefaultMaterials
::
Core
)))
return
QColor
(
220
,
140
,
220
);
if
(
name
.
contains
(
material_name_map
.
key
(
DefaultMaterials
::
Particle
)))
return
QColor
(
146
,
198
,
255
);
// return a random color
...
...
@@ -48,6 +50,12 @@ QColor suggestMaterialColor(const QString& name)
}
// namespace
QMap
<
QString
,
DefaultMaterials
>
material_name_map
=
{
{
"Default"
,
DefaultMaterials
::
Default
},
{
"Vacuum"
,
DefaultMaterials
::
Vacuum
},
{
"Particle"
,
DefaultMaterials
::
Particle
},
{
"Core"
,
DefaultMaterials
::
Core
},
{
"Substrate"
,
DefaultMaterials
::
Substrate
}};
MaterialModel
::
MaterialModel
()
{}
...
...
@@ -150,7 +158,7 @@ MaterialItem* MaterialModel::defaultMaterialItem() const
MaterialItem
*
MaterialModel
::
defaultCoreMaterialItem
()
const
{
for
(
auto
*
material
:
materialItems
())
if
(
material
->
matItemName
()
==
material_name_map
.
key
(
DefaultMaterials
::
Particle_
Core
))
if
(
material
->
matItemName
()
==
material_name_map
.
key
(
DefaultMaterials
::
Core
))
return
material
;
return
defaultMaterialItem
();
...
...
This diff is collapsed.
Click to expand it.
GUI/Model/Sample/MaterialModel.h
+
5
−
0
View file @
75706055
...
...
@@ -19,6 +19,11 @@
#include
<QVector>
#include
<QXmlStreamReader>
//! Materials created by default
enum
class
DefaultMaterials
{
Default
,
Vacuum
,
Particle
,
Core
,
Substrate
};
extern
QMap
<
QString
,
DefaultMaterials
>
material_name_map
;
class
MaterialItem
;
class
MaterialModel
:
public
QObject
{
...
...
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