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
Merge requests
!489
Material refactoring
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Material refactoring
materialRefactoring
into
develop
Overview
1
Commits
14
Pipelines
3
Changes
2
Merged
m.puchner
requested to merge
materialRefactoring
into
develop
3 years ago
Overview
1
Commits
14
Pipelines
3
Changes
2
Expand
reduce SessionModel exposure
reduce SessionModel usage
avoid global access to material model
minor changes
Edited
3 years ago
by
m.puchner
0
0
Merge request reports
Viewing commit
8f30bef7
Prev
Next
Show latest version
2 files
+
0
−
27
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
2
Search (e.g. *.vue) (Ctrl+P)
8f30bef7
rm obsolete code
· 8f30bef7
Matthias Puchner
authored
3 years ago
GUI/Model/Material/MaterialItemUtils.cpp
+
0
−
20
Options
@@ -14,11 +14,9 @@
#include
"GUI/Model/Material/MaterialItemUtils.h"
#include
"GUI/Model/Material/MaterialItem.h"
#include
"GUI/Model/Material/MaterialItemContainer.h"
#include
"GUI/Model/Material/MaterialModel.h"
#include
"GUI/Model/Material/MaterialModelStore.h"
#include
"GUI/Util/Error.h"
#include
"Sample/Material/Material.h"
#include
<deque>
#include
<random>
@@ -41,24 +39,6 @@ QString GUI::MaterialUtil::defaultMaterialIdentifier()
return
materials
.
isEmpty
()
?
QString
()
:
materials
.
front
()
->
identifier
();
}
std
::
unique_ptr
<
Material
>
GUI
::
MaterialUtil
::
createDomainMaterial
(
const
QString
&
materialIdentifier
)
{
MaterialItem
*
materialItem
=
findMaterial
(
materialIdentifier
);
return
materialItem
->
createMaterial
();
}
std
::
unique_ptr
<
Material
>
GUI
::
MaterialUtil
::
createDomainMaterial
(
const
QString
&
materialIdentifier
,
const
MaterialItemContainer
&
container
)
{
const
MaterialItem
*
material_item
=
container
.
findMaterialById
(
materialIdentifier
);
if
(
!
material_item
)
throw
Error
(
"MaterialUtils::createDomainMaterial() -> Error. Can't find "
"material with identifier '"
+
materialIdentifier
+
"'."
);
return
material_item
->
createMaterial
();
}
MaterialItem
*
GUI
::
MaterialUtil
::
findMaterial
(
const
QString
&
materialIdentifier
)
{
if
(
!
GUI
::
Model
::
MaterialModelStore
::
materialModel
())
Loading