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
bc5dad22
Commit
bc5dad22
authored
3 years ago
by
Matthias Puchner
Browse files
Options
Downloads
Patches
Plain Diff
simplify material copying
parent
65a9fdf1
No related branches found
No related tags found
1 merge request
!494
Remove SessionModel/SessionItem from MaterialModel/MaterialItem
Pipeline
#51057
failed
3 years ago
Stage: build
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
GUI/Model/Job/JobModelFunctions.cpp
+2
-5
2 additions, 5 deletions
GUI/Model/Job/JobModelFunctions.cpp
with
2 additions
and
5 deletions
GUI/Model/Job/JobModelFunctions.cpp
+
2
−
5
View file @
bc5dad22
...
...
@@ -131,11 +131,8 @@ void GUI::Model::JobFunctions::setupJobItemSampleData(JobItem* jobItem,
// copy used materials into material container
for
(
auto
*
itemWithMaterial
:
sampleItem
->
itemsWithMaterial
())
{
auto
*
material
=
itemWithMaterial
->
materialItem
();
if
(
!
jobItem
->
materialItems
().
findMaterialItem
(
material
->
identifier
()))
{
auto
*
materialCopy
=
jobItem
->
materialItems
().
insertCopy
(
*
material
);
materialCopy
->
setIdentifier
(
material
->
identifier
());
// insertCopy() doesn't do this
materialCopy
->
setMaterialName
(
material
->
materialName
());
// insertCopy() doesn't do this
}
if
(
!
jobItem
->
materialItems
().
findMaterialItem
(
material
->
identifier
()))
jobItem
->
materialItems
().
addMaterial
(
new
MaterialItem
(
*
material
));
}
}
...
...
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