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
0c19fc3b
Commit
0c19fc3b
authored
1 year ago
by
Wuttke, Joachim
Browse files
Options
Downloads
Patches
Plain Diff
replace 'pushSample' by 'pushItem'
parent
14e761ea
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!2389
cleanup ctd; start revision of data view
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
GUI/View/List/SamplesQModel.cpp
+2
-2
2 additions, 2 deletions
GUI/View/List/SamplesQModel.cpp
GUI/View/List/SamplesQModel.h
+1
-1
1 addition, 1 deletion
GUI/View/List/SamplesQModel.h
GUI/View/Views/SampleView.cpp
+3
-3
3 additions, 3 deletions
GUI/View/Views/SampleView.cpp
with
6 additions
and
6 deletions
GUI/View/List/SamplesQModel.cpp
+
2
−
2
View file @
0c19fc3b
...
...
@@ -78,10 +78,10 @@ QModelIndex SamplesQModel::copySample()
const
SampleItem
*
t
=
set
()
->
currentItem
();
ASSERT
(
t
);
SampleItem
*
t2
=
t
->
clone
();
return
push
Sample
(
t2
);
return
push
Item
(
t2
);
}
QModelIndex
SamplesQModel
::
push
Sample
(
SampleItem
*
t
)
QModelIndex
SamplesQModel
::
push
Item
(
SampleItem
*
t
)
{
if
(
!
t
)
return
{};
...
...
This diff is collapsed.
Click to expand it.
GUI/View/List/SamplesQModel.h
+
1
−
1
View file @
0c19fc3b
...
...
@@ -32,7 +32,7 @@ public:
void
removeSample
();
QModelIndex
copySample
();
QModelIndex
push
Sample
(
SampleItem
*
);
QModelIndex
push
Item
(
SampleItem
*
);
private:
SamplesSet
*
set
();
...
...
This diff is collapsed.
Click to expand it.
GUI/View/Views/SampleView.cpp
+
3
−
3
View file @
0c19fc3b
...
...
@@ -129,7 +129,7 @@ void SampleView::setToolbarActions(QToolBar* toolbar)
toolbar
->
addAction
(
new_sample_action
);
connect
(
new_sample_action
,
&
QAction
::
triggered
,
[
this
]
{
m_qlistmodel
->
push
Sample
(
new
SampleItem
);
m_qlistmodel
->
push
Item
(
new
SampleItem
);
// TODO call new_item->addStandardMaterials() ??
});
...
...
@@ -142,7 +142,7 @@ void SampleView::setToolbarActions(QToolBar* toolbar)
"Import sample from a Python script that contains a function that returns a multi-layer"
);
toolbar
->
addAction
(
import_sample_action
);
connect
(
import_sample_action
,
&
QAction
::
triggered
,
[
this
]
{
m_qlistmodel
->
push
Sample
(
PyImportAssistant
::
importMultiLayer
());
});
[
this
]
{
m_qlistmodel
->
push
Item
(
PyImportAssistant
::
importMultiLayer
());
});
#endif
auto
*
choose_from_library_action
=
new
QAction
(
"Examples"
,
this
);
...
...
@@ -166,7 +166,7 @@ void SampleView::setToolbarActions(QToolBar* toolbar)
return
;
t
->
setName
(
title
);
t
->
setDescription
(
description
);
m_qlistmodel
->
push
Sample
(
t
);
m_qlistmodel
->
push
Item
(
t
);
});
}
...
...
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