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
2dd09d34
Commit
2dd09d34
authored
3 years ago
by
t.knopff
Browse files
Options
Downloads
Patches
Plain Diff
Make MesoCrystalItem::P_VECTOR_(A|B|C) private
parent
8de06636
No related branches found
No related tags found
1 merge request
!168
Refactor model: ParticleItem, ParticleCoreShellItem, ParticleCompositionItem and MesoCrystalItem
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
GUI/Models/GUIDomainSampleVisitor.cpp
+7
-6
7 additions, 6 deletions
GUI/Models/GUIDomainSampleVisitor.cpp
GUI/Models/MesoCrystalItem.cpp
+15
-0
15 additions, 0 deletions
GUI/Models/MesoCrystalItem.cpp
GUI/Models/MesoCrystalItem.h
+6
-2
6 additions, 2 deletions
GUI/Models/MesoCrystalItem.h
with
28 additions
and
8 deletions
GUI/Models/GUIDomainSampleVisitor.cpp
+
7
−
6
View file @
2dd09d34
...
@@ -152,20 +152,21 @@ void GUIDomainSampleVisitor::visit(const MesoCrystal* sample)
...
@@ -152,20 +152,21 @@ void GUIDomainSampleVisitor::visit(const MesoCrystal* sample)
void
GUIDomainSampleVisitor
::
visit
(
const
Crystal
*
sample
)
void
GUIDomainSampleVisitor
::
visit
(
const
Crystal
*
sample
)
{
{
SessionItem
*
mesocrystal_
item
=
m_levelToParentItem
[
depth
()
-
1
];
SessionItem
*
item
=
m_levelToParentItem
[
depth
()
-
1
];
ASSERT
(
mesocrystal_
item
);
ASSERT
(
item
);
if
(
!
mesocrystal_
item
->
hasModelType
<
MesoCrystalItem
>
())
{
if
(
!
item
->
hasModelType
<
MesoCrystalItem
>
())
{
throw
Error
(
"GUI::Model::ObjectBuilder::visit(const Crystal*) "
throw
Error
(
"GUI::Model::ObjectBuilder::visit(const Crystal*) "
"-> Error. Parent is not a MesoCrystal"
);
"-> Error. Parent is not a MesoCrystal"
);
}
}
MesoCrystalItem
*
mesocrystal_item
=
polymorphic_cast
<
MesoCrystalItem
*>
(
item
);
auto
lattice
=
sample
->
transformedLattice
();
auto
lattice
=
sample
->
transformedLattice
();
auto
vector_a
=
lattice
.
getBasisVectorA
();
auto
vector_a
=
lattice
.
getBasisVectorA
();
auto
vector_b
=
lattice
.
getBasisVectorB
();
auto
vector_b
=
lattice
.
getBasisVectorB
();
auto
vector_c
=
lattice
.
getBasisVectorC
();
auto
vector_c
=
lattice
.
getBasisVectorC
();
mesocrystal_item
->
item
<
VectorItem
>
(
MesoCrystalItem
::
P_VECTOR_A
)
->
setVector
(
vector_a
);
mesocrystal_item
->
setVector
A
(
vector_a
);
mesocrystal_item
->
item
<
VectorItem
>
(
MesoCrystalItem
::
P_VECTOR_B
)
->
setVector
(
vector_b
);
mesocrystal_item
->
setVector
B
(
vector_b
);
mesocrystal_item
->
item
<
VectorItem
>
(
MesoCrystalItem
::
P_VECTOR_C
)
->
setVector
(
vector_c
);
mesocrystal_item
->
setVector
C
(
vector_c
);
// Since there is no CrystalItem, set the parent map to the MesoCrystalItem
// Since there is no CrystalItem, set the parent map to the MesoCrystalItem
m_levelToParentItem
[
depth
()]
=
mesocrystal_item
;
m_levelToParentItem
[
depth
()]
=
mesocrystal_item
;
...
...
This diff is collapsed.
Click to expand it.
GUI/Models/MesoCrystalItem.cpp
+
15
−
0
View file @
2dd09d34
...
@@ -135,3 +135,18 @@ ItemWithParticles* MesoCrystalItem::basisParticle() const
...
@@ -135,3 +135,18 @@ ItemWithParticles* MesoCrystalItem::basisParticle() const
{
{
return
dynamic_cast
<
ItemWithParticles
*>
(
getItem
(
T_BASIS_PARTICLE
));
return
dynamic_cast
<
ItemWithParticles
*>
(
getItem
(
T_BASIS_PARTICLE
));
}
}
void
MesoCrystalItem
::
setVectorA
(
const
kvector_t
&
vector_a
)
{
item
<
VectorItem
>
(
P_VECTOR_A
)
->
setVector
(
vector_a
);
}
void
MesoCrystalItem
::
setVectorB
(
const
kvector_t
&
vector_b
)
{
item
<
VectorItem
>
(
P_VECTOR_B
)
->
setVector
(
vector_b
);
}
void
MesoCrystalItem
::
setVectorC
(
const
kvector_t
&
vector_c
)
{
item
<
VectorItem
>
(
P_VECTOR_C
)
->
setVector
(
vector_c
);
}
This diff is collapsed.
Click to expand it.
GUI/Models/MesoCrystalItem.h
+
6
−
2
View file @
2dd09d34
...
@@ -16,6 +16,7 @@
...
@@ -16,6 +16,7 @@
#define BORNAGAIN_GUI_MODELS_MESOCRYSTALITEM_H
#define BORNAGAIN_GUI_MODELS_MESOCRYSTALITEM_H
#include
"GUI/Models/ItemWithParticles.h"
#include
"GUI/Models/ItemWithParticles.h"
#include
"Base/Vector/Vectors3D.h"
#include
"Sample/Lattice/Lattice3D.h"
#include
"Sample/Lattice/Lattice3D.h"
class
FormFactorItem
;
class
FormFactorItem
;
...
@@ -28,12 +29,11 @@ class BA_CORE_API_ MesoCrystalItem : public ItemWithParticles {
...
@@ -28,12 +29,11 @@ class BA_CORE_API_ MesoCrystalItem : public ItemWithParticles {
private:
private:
static
const
QString
P_OUTER_SHAPE
;
static
const
QString
P_OUTER_SHAPE
;
static
const
QString
T_BASIS_PARTICLE
;
static
const
QString
T_BASIS_PARTICLE
;
public:
static
const
QString
P_VECTOR_A
;
static
const
QString
P_VECTOR_A
;
static
const
QString
P_VECTOR_B
;
static
const
QString
P_VECTOR_B
;
static
const
QString
P_VECTOR_C
;
static
const
QString
P_VECTOR_C
;
public:
static
const
QString
M_TYPE
;
static
const
QString
M_TYPE
;
MesoCrystalItem
();
MesoCrystalItem
();
...
@@ -47,6 +47,10 @@ public:
...
@@ -47,6 +47,10 @@ public:
template
<
typename
T
>
T
*
setOuterShapeType
();
template
<
typename
T
>
T
*
setOuterShapeType
();
ItemWithParticles
*
basisParticle
()
const
;
ItemWithParticles
*
basisParticle
()
const
;
void
setVectorA
(
const
kvector_t
&
vector_a
);
void
setVectorB
(
const
kvector_t
&
vector_b
);
void
setVectorC
(
const
kvector_t
&
vector_c
);
};
};
template
<
typename
T
>
T
*
MesoCrystalItem
::
setOuterShapeType
()
template
<
typename
T
>
T
*
MesoCrystalItem
::
setOuterShapeType
()
...
...
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