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
967c01b6
"GUI/View/Instrument/InstrumentListing.h" did not exist on "7ca376a0ab79515a2f4500c8b5f7169cc398108e"
Commit
967c01b6
authored
2 years ago
by
Mikhail Svechnikov
Browse files
Options
Downloads
Plain Diff
[i358] GUI: add missing material form for core and shell (Closes
#358
)
Merging branch 'i358' into 'main'. See merge request
!1217
parents
85f048bf
7e08f810
No related branches found
No related tags found
1 merge request
!1217
GUI: add missing material form for core and shell
Pipeline
#84219
passed
2 years ago
Stage: build
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
GUI/View/SampleDesigner/CoreAndShellForm.cpp
+3
-0
3 additions, 0 deletions
GUI/View/SampleDesigner/CoreAndShellForm.cpp
with
3 additions
and
0 deletions
GUI/View/SampleDesigner/CoreAndShellForm.cpp
+
3
−
0
View file @
967c01b6
...
...
@@ -19,6 +19,7 @@
#include
"GUI/Model/Sample/ParticleItem.h"
#include
"GUI/Util/ActionFactory.h"
#include
"GUI/View/SampleDesigner/FormLayouter.h"
#include
"GUI/View/SampleDesigner/MaterialInplaceForm.h"
#include
"GUI/View/SampleDesigner/SampleEditorController.h"
#include
"GUI/View/SampleDesigner/SelectionContainerForm.h"
#include
"GUI/View/Tool/GroupBoxCollapser.h"
...
...
@@ -162,6 +163,7 @@ void CoreAndShellForm::createCoreWidgets()
const
QString
formfactor
=
FormFactorItemCatalog
::
menuEntry
(
particle
->
formfactorItem
());
groupTitle
+=
" ("
+
formfactor
+
")"
;
core
.
layouter
->
addRow
(
"Material"
,
new
MaterialInplaceForm
(
this
,
particle
,
m_ec
));
core
.
layouter
->
addGroupOfValues
(
"Geometry"
,
particle
->
formfactorItem
()
->
geometryProperties
());
core
.
layouter
->
addVector
(
particle
->
position
(),
false
);
...
...
@@ -180,6 +182,7 @@ void CoreAndShellForm::createShellWidgets()
const
QString
formfactor
=
FormFactorItemCatalog
::
menuEntry
(
particle
->
formfactorItem
());
groupTitle
+=
" ("
+
formfactor
+
")"
;
shell
.
layouter
->
addRow
(
"Material"
,
new
MaterialInplaceForm
(
this
,
particle
,
m_ec
));
shell
.
layouter
->
addGroupOfValues
(
"Geometry"
,
particle
->
formfactorItem
()
->
geometryProperties
());
shell
.
layouter
->
addSelection
(
particle
->
rotation
());
...
...
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