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
5f7cba22
Commit
5f7cba22
authored
1 year ago
by
Wuttke, Joachim
Browse files
Options
Downloads
Patches
Plain Diff
DetectorItem rm members that controlled collapse of x/y axis groupbox
parent
abced399
No related branches found
No related tags found
1 merge request
!2058
GUI instrument editor: detector section made more compact
Pipeline
#117424
failed
1 year ago
Stage: build
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
GUI/Model/Detector/DetectorItem.cpp
+0
-22
0 additions, 22 deletions
GUI/Model/Detector/DetectorItem.cpp
GUI/Model/Detector/DetectorItem.h
+0
-9
0 additions, 9 deletions
GUI/Model/Detector/DetectorItem.h
with
0 additions
and
31 deletions
GUI/Model/Detector/DetectorItem.cpp
+
0
−
22
View file @
5f7cba22
...
...
@@ -25,8 +25,6 @@ const QString Alignment("Alignment");
const
QString
DirectionVector
(
"DirectionVector"
);
const
QString
Distance
(
"Distance"
);
const
QString
ExpandResolutionFuncGroupbox
(
"ExpandResolutionFuncGroupbox"
);
const
QString
ExpandXaxisGroupBox
(
"ExpandXaxisGroupBox"
);
const
QString
ExpandYaxisGroupBox
(
"ExpandYaxisGroupBox"
);
const
QString
Height
(
"Height"
);
const
QString
NormalVector
(
"NormalVector"
);
const
QString
ResolutionFunction
(
"ResolutionFunction"
);
...
...
@@ -200,16 +198,6 @@ void DetectorItem::writeTo(QXmlStreamWriter* w) const
w
->
writeStartElement
(
Tag
::
Distance
);
m_distance
.
writeTo
(
w
);
w
->
writeEndElement
();
// x axis groupbox: is expanded?
w
->
writeStartElement
(
Tag
::
ExpandXaxisGroupBox
);
XML
::
writeAttribute
(
w
,
XML
::
Attrib
::
value
,
m_expandXaxis
);
w
->
writeEndElement
();
// y axis groupbox: is expanded?
w
->
writeStartElement
(
Tag
::
ExpandYaxisGroupBox
);
XML
::
writeAttribute
(
w
,
XML
::
Attrib
::
value
,
m_expandYaxis
);
w
->
writeEndElement
();
}
void
DetectorItem
::
readFrom
(
QXmlStreamReader
*
r
)
...
...
@@ -280,16 +268,6 @@ void DetectorItem::readFrom(QXmlStreamReader* r)
m_distance
.
readFrom
(
r
);
XML
::
gotoEndElementOfTag
(
r
,
tag
);
// x axis groupbox: is expanded?
}
else
if
(
tag
==
Tag
::
ExpandXaxisGroupBox
)
{
XML
::
readAttribute
(
r
,
XML
::
Attrib
::
value
,
&
m_expandXaxis
);
XML
::
gotoEndElementOfTag
(
r
,
tag
);
// y axis groupbox: is expanded?
}
else
if
(
tag
==
Tag
::
ExpandYaxisGroupBox
)
{
XML
::
readAttribute
(
r
,
XML
::
Attrib
::
value
,
&
m_expandYaxis
);
XML
::
gotoEndElementOfTag
(
r
,
tag
);
}
else
r
->
skipCurrentElement
();
}
...
...
This diff is collapsed.
Click to expand it.
GUI/Model/Detector/DetectorItem.h
+
0
−
9
View file @
5f7cba22
...
...
@@ -92,12 +92,6 @@ public:
const
DoubleProperty
&
distance
()
const
{
return
m_distance
;
}
void
setDistance
(
double
v
)
{
m_distance
.
setValue
(
v
);
}
bool
isExpandXaxis
()
const
{
return
m_expandXaxis
;
}
void
setExpandXaxis
(
bool
b
)
{
m_expandXaxis
=
b
;
}
bool
isExpandYaxis
()
const
{
return
m_expandYaxis
;
}
void
setExpandYaxis
(
bool
b
)
{
m_expandYaxis
=
b
;
}
private
:
std
::
unique_ptr
<
IResolutionFunction2D
>
createResolutionFunction
()
const
;
...
...
@@ -122,9 +116,6 @@ private:
DoubleProperty
m_u0
;
DoubleProperty
m_v0
;
DoubleProperty
m_distance
;
bool
m_expandXaxis
=
true
;
bool
m_expandYaxis
=
true
;
};
template
<
typename
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