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
21a4d28e
Commit
21a4d28e
authored
1 year ago
by
Wuttke, Joachim
Browse files
Options
Downloads
Patches
Plain Diff
rename -> HeinzGroupBox
parent
2e44a508
No related branches found
No related tags found
1 merge request
!2063
rename -> HeinzGroupBox; don't inherit QGroupBox; don't require layout as c'tor arg; expose body()
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
GUI/View/Instrument/DetectorEditor.cpp
+3
-3
3 additions, 3 deletions
GUI/View/Instrument/DetectorEditor.cpp
GUI/View/Widget/GroupBoxes.cpp
+2
-2
2 additions, 2 deletions
GUI/View/Widget/GroupBoxes.cpp
GUI/View/Widget/GroupBoxes.h
+2
-2
2 additions, 2 deletions
GUI/View/Widget/GroupBoxes.h
with
7 additions
and
7 deletions
GUI/View/Instrument/DetectorEditor.cpp
+
3
−
3
View file @
21a4d28e
...
@@ -87,7 +87,7 @@ DetectorEditor::DetectorEditor(QWidget* parent, GISASInstrumentItem* instrItem)
...
@@ -87,7 +87,7 @@ DetectorEditor::DetectorEditor(QWidget* parent, GISASInstrumentItem* instrItem)
::
createSpinBox
(
xAxisFormLayout
,
detectorItem
->
u0
(),
this
);
::
createSpinBox
(
xAxisFormLayout
,
detectorItem
->
u0
(),
this
);
auto
*
xAxisGroupBox
=
new
GroupBox
(
"X axis"
,
xAxisFormLayout
,
this
);
auto
*
xAxisGroupBox
=
new
Heinz
GroupBox
(
"X axis"
,
xAxisFormLayout
,
this
);
xyrow
->
addWidget
(
xAxisGroupBox
);
xyrow
->
addWidget
(
xAxisGroupBox
);
//... y-axis controls
//... y-axis controls
...
@@ -112,7 +112,7 @@ DetectorEditor::DetectorEditor(QWidget* parent, GISASInstrumentItem* instrItem)
...
@@ -112,7 +112,7 @@ DetectorEditor::DetectorEditor(QWidget* parent, GISASInstrumentItem* instrItem)
::
createSpinBox
(
yAxisFormLayout
,
detectorItem
->
v0
(),
this
);
::
createSpinBox
(
yAxisFormLayout
,
detectorItem
->
v0
(),
this
);
auto
*
yAxisGroupBox
=
new
GroupBox
(
"Y axis"
,
yAxisFormLayout
,
this
);
auto
*
yAxisGroupBox
=
new
Heinz
GroupBox
(
"Y axis"
,
yAxisFormLayout
,
this
);
xyrow
->
addWidget
(
yAxisGroupBox
);
xyrow
->
addWidget
(
yAxisGroupBox
);
//... resolution controls
//... resolution controls
...
@@ -120,7 +120,7 @@ DetectorEditor::DetectorEditor(QWidget* parent, GISASInstrumentItem* instrItem)
...
@@ -120,7 +120,7 @@ DetectorEditor::DetectorEditor(QWidget* parent, GISASInstrumentItem* instrItem)
auto
resolutionLayout
=
new
QFormLayout
;
auto
resolutionLayout
=
new
QFormLayout
;
resolutionLayout
->
setFieldGrowthPolicy
(
QFormLayout
::
FieldsStayAtSizeHint
);
resolutionLayout
->
setFieldGrowthPolicy
(
QFormLayout
::
FieldsStayAtSizeHint
);
auto
*
resolutionForm
=
new
GroupBox
(
"Resolution function"
,
resolutionLayout
,
this
);
auto
*
resolutionForm
=
new
Heinz
GroupBox
(
"Resolution function"
,
resolutionLayout
,
this
);
auto
updateResolutionForm
=
[
parent
=
this
,
layout
=
resolutionLayout
,
auto
updateResolutionForm
=
[
parent
=
this
,
layout
=
resolutionLayout
,
item
=
detectorItem
]()
->
void
{
item
=
detectorItem
]()
->
void
{
...
...
This diff is collapsed.
Click to expand it.
GUI/View/Widget/GroupBoxes.cpp
+
2
−
2
View file @
21a4d28e
...
@@ -21,10 +21,10 @@
...
@@ -21,10 +21,10 @@
#include
<QVariant>
#include
<QVariant>
// ************************************************************************************************
// ************************************************************************************************
// class GroupBox
// class
Heinz
GroupBox
// ************************************************************************************************
// ************************************************************************************************
GroupBox
::
GroupBox
(
const
QString
&
title
,
QLayout
*
content_layout
,
QWidget
*
parent
)
Heinz
GroupBox
::
Heinz
GroupBox
(
const
QString
&
title
,
QLayout
*
content_layout
,
QWidget
*
parent
)
:
QGroupBox
(
parent
)
:
QGroupBox
(
parent
)
{
{
auto
*
label
=
new
QLabel
(
this
);
auto
*
label
=
new
QLabel
(
this
);
...
...
This diff is collapsed.
Click to expand it.
GUI/View/Widget/GroupBoxes.h
+
2
−
2
View file @
21a4d28e
...
@@ -24,9 +24,9 @@ class QToolButton;
...
@@ -24,9 +24,9 @@ class QToolButton;
//! A QGroupBox with given title and layout, and some standard styling.
//! A QGroupBox with given title and layout, and some standard styling.
class
GroupBox
:
public
QGroupBox
{
class
Heinz
GroupBox
:
public
QGroupBox
{
public:
public:
GroupBox
(
const
QString
&
title
,
QLayout
*
content_layout
,
QWidget
*
parent
);
Heinz
GroupBox
(
const
QString
&
title
,
QLayout
*
content_layout
,
QWidget
*
parent
);
};
};
...
...
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