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
fa0f5472
Commit
fa0f5472
authored
1 year ago
by
Wuttke, Joachim
Browse files
Options
Downloads
Patches
Plain Diff
replace 'projnItem' by 'prjnsSet'
parent
54495208
No related branches found
No related tags found
1 merge request
!2381
rm class and source pair ProjectionsSet
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
GUI/Model/Data/Data2DItem.cpp
+4
-4
4 additions, 4 deletions
GUI/Model/Data/Data2DItem.cpp
GUI/Model/Mask/MasksQModel.cpp
+2
-2
2 additions, 2 deletions
GUI/Model/Mask/MasksQModel.cpp
GUI/Model/Mask/MasksQModel.h
+2
-2
2 additions, 2 deletions
GUI/Model/Mask/MasksQModel.h
with
8 additions
and
8 deletions
GUI/Model/Data/Data2DItem.cpp
+
4
−
4
View file @
fa0f5472
...
...
@@ -290,7 +290,7 @@ void Data2DItem::writeTo(QXmlStreamWriter* w) const
// projections
if
(
m_proj_model
)
{
if
(
auto
*
pi
=
m_proj_model
->
pr
o
jn
Item
())
{
if
(
auto
*
pi
=
m_proj_model
->
prjn
sSet
())
{
w
->
writeStartElement
(
Tag
::
ProjectionContainer
);
pi
->
writeTo
(
w
);
w
->
writeEndElement
();
...
...
@@ -333,7 +333,7 @@ void Data2DItem::readFrom(QXmlStreamReader* r)
// projections
}
else
if
(
tag
==
Tag
::
ProjectionContainer
)
{
getOrCreateProjectionModel
()
->
pr
o
jn
Item
()
->
readFrom
(
r
);
getOrCreateProjectionModel
()
->
prjn
sSet
()
->
readFrom
(
r
);
XML
::
gotoEndElementOfTag
(
r
,
tag
);
}
else
...
...
@@ -396,12 +396,12 @@ Datafield* Data2DItem::createMaskedField() const
ProjectionsSet
*
Data2DItem
::
projectionsSet
()
{
return
m_proj_model
?
m_proj_model
->
pr
o
jn
Item
()
:
nullptr
;
return
m_proj_model
?
m_proj_model
->
prjn
sSet
()
:
nullptr
;
}
const
ProjectionsSet
*
Data2DItem
::
projectionsSet
()
const
{
return
m_proj_model
?
m_proj_model
->
pr
o
jn
Item
()
:
nullptr
;
return
m_proj_model
?
m_proj_model
->
prjn
sSet
()
:
nullptr
;
}
MasksQModel
*
Data2DItem
::
getOrCreateProjectionModel
()
...
...
This diff is collapsed.
Click to expand it.
GUI/Model/Mask/MasksQModel.cpp
+
2
−
2
View file @
fa0f5472
...
...
@@ -105,12 +105,12 @@ void MasksQModel::clear()
QAbstractListModel
::
endResetModel
();
}
ProjectionsSet
*
MasksQModel
::
pr
o
jn
Item
()
ProjectionsSet
*
MasksQModel
::
prjn
sSet
()
{
return
dynamic_cast
<
ProjectionsSet
*>
(
m_masks
);
}
const
ProjectionsSet
*
MasksQModel
::
pr
o
jn
Item
()
const
const
ProjectionsSet
*
MasksQModel
::
prjn
sSet
()
const
{
return
dynamic_cast
<
const
ProjectionsSet
*>
(
m_masks
);
}
...
...
This diff is collapsed.
Click to expand it.
GUI/Model/Mask/MasksQModel.h
+
2
−
2
View file @
fa0f5472
...
...
@@ -60,8 +60,8 @@ public:
MasksSet
*
masksSet
()
{
return
m_masks
;
}
const
MasksSet
*
masksSet
()
const
{
return
m_masks
;
}
ProjectionsSet
*
pr
o
jn
Item
();
const
ProjectionsSet
*
pr
o
jn
Item
()
const
;
ProjectionsSet
*
prjn
sSet
();
const
ProjectionsSet
*
prjn
sSet
()
const
;
private
:
MasksSet
*
m_masks
;
...
...
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