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
8f30bef7
Commit
8f30bef7
authored
3 years ago
by
Matthias Puchner
Browse files
Options
Downloads
Patches
Plain Diff
rm obsolete code
parent
03b49745
No related branches found
No related tags found
1 merge request
!489
Material refactoring
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
GUI/Model/Material/MaterialItemUtils.cpp
+0
-20
0 additions, 20 deletions
GUI/Model/Material/MaterialItemUtils.cpp
GUI/Model/Material/MaterialItemUtils.h
+0
-7
0 additions, 7 deletions
GUI/Model/Material/MaterialItemUtils.h
with
0 additions
and
27 deletions
GUI/Model/Material/MaterialItemUtils.cpp
+
0
−
20
View file @
8f30bef7
...
...
@@ -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
())
...
...
This diff is collapsed.
Click to expand it.
GUI/Model/Material/MaterialItemUtils.h
+
0
−
7
View file @
8f30bef7
...
...
@@ -21,9 +21,6 @@
class
Material
;
class
MaterialItem
;
class
MaterialItemContainer
;
class
ItemWithMaterial
;
class
ParticleLayoutItem
;
namespace
GUI
::
MaterialUtil
{
...
...
@@ -31,10 +28,6 @@ QColor randomMaterialColor();
QString
defaultMaterialIdentifier
();
std
::
unique_ptr
<
Material
>
createDomainMaterial
(
const
QString
&
materialIdentifier
);
std
::
unique_ptr
<
Material
>
createDomainMaterial
(
const
QString
&
materialIdentifier
,
const
MaterialItemContainer
&
container
);
MaterialItem
*
findMaterial
(
const
QString
&
materialIdentifier
);
}
// namespace GUI::MaterialUtil
...
...
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