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
88e97a7e
Commit
88e97a7e
authored
8 months ago
by
Wuttke, Joachim
Browse files
Options
Downloads
Patches
Plain Diff
rename class and sources GUI/View/Device/SpanPropertyForm -> GUI/View/Device/SpanForm
parent
b84d0c2f
No related branches found
No related tags found
1 merge request
!2637
rename form-related classes; simplify span property construction
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
GUI/View/Device/DetectorEditor.cpp
+3
-5
3 additions, 5 deletions
GUI/View/Device/DetectorEditor.cpp
GUI/View/Device/SpanForm.cpp
+5
-5
5 additions, 5 deletions
GUI/View/Device/SpanForm.cpp
GUI/View/Device/SpanForm.h
+8
-8
8 additions, 8 deletions
GUI/View/Device/SpanForm.h
with
16 additions
and
18 deletions
GUI/View/Device/DetectorEditor.cpp
+
3
−
5
View file @
88e97a7e
...
...
@@ -17,7 +17,7 @@
#include
"GUI/Model/Detector/DetectorItem.h"
#include
"GUI/Model/Detector/ResolutionFunctionItems.h"
#include
"GUI/Model/Sim/InstrumentItems.h"
#include
"GUI/View/Device/Span
Property
Form.h"
#include
"GUI/View/Device/SpanForm.h"
#include
"GUI/View/Numeric/ComboUtil.h"
#include
"GUI/View/Numeric/DoubleSpinBox.h"
#include
"GUI/View/Numeric/NumWidgetUtil.h"
...
...
@@ -36,12 +36,10 @@ DetectorEditor::DetectorEditor(QWidget* parent, Scatter2DInstrumentItem* instrIt
auto
*
xyrow
=
new
QHBoxLayout
;
layout
->
addLayout
(
xyrow
);
auto
*
phiForm
=
new
SpanPropertyForm
(
this
,
u8"\u03c6 axis"
,
&
detectorItem
->
phiAxis
(),
"phi axis"
);
auto
*
phiForm
=
new
SpanForm
(
this
,
u8"\u03c6 axis"
,
&
detectorItem
->
phiAxis
(),
"phi axis"
);
xyrow
->
addWidget
(
phiForm
);
auto
*
alphaForm
=
new
SpanPropertyForm
(
this
,
u8"\u03b1 axis"
,
&
detectorItem
->
alphaAxis
(),
"alpha axis"
);
auto
*
alphaForm
=
new
SpanForm
(
this
,
u8"\u03b1 axis"
,
&
detectorItem
->
alphaAxis
(),
"alpha axis"
);
xyrow
->
addWidget
(
alphaForm
);
//... resolution controls
...
...
This diff is collapsed.
Click to expand it.
GUI/View/Device/Span
Property
Form.cpp
→
GUI/View/Device/SpanForm.cpp
+
5
−
5
View file @
88e97a7e
...
...
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit reflection and scattering
//
//! @file GUI/View/Device/Span
Property
Form.cpp
//! @brief Implement class Span
Property
Form
//! @file GUI/View/Device/SpanForm.cpp
//! @brief Implement class SpanForm
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
...
...
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
#include
"GUI/View/Device/Span
Property
Form.h"
#include
"GUI/View/Device/SpanForm.h"
#include
"Base/Util/Assert.h"
#include
"GUI/Model/Descriptor/SpanProperty.h"
#include
"GUI/Model/Project/ProjectDocument.h"
...
...
@@ -20,8 +20,8 @@
#include
"GUI/View/Numeric/NumWidgetUtil.h"
#include
<QFormLayout>
Span
Property
Form
::
Span
Property
Form
(
QWidget
*
parent
,
const
QString
&
group_title
,
SpanProperty
*
span_property
,
QString
nbins_tooltip
)
SpanForm
::
SpanForm
(
QWidget
*
parent
,
const
QString
&
group_title
,
SpanProperty
*
span_property
,
QString
nbins_tooltip
)
:
StaticGroupBox
(
group_title
,
parent
)
,
m_span_property
(
span_property
)
{
...
...
This diff is collapsed.
Click to expand it.
GUI/View/Device/Span
Property
Form.h
→
GUI/View/Device/SpanForm.h
+
8
−
8
View file @
88e97a7e
...
...
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit reflection and scattering
//
//! @file GUI/View/Device/Span
Property
Form.h
//! @brief Defines class Span
Property
Form.
//! @file GUI/View/Device/SpanForm.h
//! @brief Defines class SpanForm.
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
...
...
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
#ifndef BORNAGAIN_GUI_VIEW_DEVICE_SPAN
PROPERTY
FORM_H
#define BORNAGAIN_GUI_VIEW_DEVICE_SPAN
PROPERTY
FORM_H
#ifndef BORNAGAIN_GUI_VIEW_DEVICE_SPANFORM_H
#define BORNAGAIN_GUI_VIEW_DEVICE_SPANFORM_H
#include
"GUI/View/Widget/GroupBoxes.h"
#include
<QSpinBox>
...
...
@@ -26,11 +26,11 @@ class SpanProperty;
//! An SpanProperty handles values for a EquiDivision. The values will be already written into the
//! data element. For each change of values, a signal will be emitted. Use this e.g. to update
//! dependent values or to set the document to modified.
class
Span
Property
Form
:
public
StaticGroupBox
{
class
SpanForm
:
public
StaticGroupBox
{
Q_OBJECT
public:
Span
Property
Form
(
QWidget
*
parent
,
const
QString
&
group_title
,
SpanProperty
*
span_property
,
QString
nbins_tooltip
=
""
);
SpanForm
(
QWidget
*
parent
,
const
QString
&
group_title
,
SpanProperty
*
span_property
,
QString
nbins_tooltip
=
""
);
signals:
void
changedSpanData
();
// TODO is UNUSED
...
...
@@ -45,4 +45,4 @@ private:
};
#endif // BORNAGAIN_GUI_VIEW_DEVICE_SPAN
PROPERTY
FORM_H
#endif // BORNAGAIN_GUI_VIEW_DEVICE_SPANFORM_H
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