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
e62bc063
Commit
e62bc063
authored
1 year ago
by
Wuttke, Joachim
Browse files
Options
Downloads
Patches
Plain Diff
Legacy1dDialog has all buttons
parent
86bead00
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!1649
Generic legacy 1D tables can again be read, now using new modal format dialog (#601)
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
GUI/View/Import/Legacy1dDialog.cpp
+16
-2
16 additions, 2 deletions
GUI/View/Import/Legacy1dDialog.cpp
with
16 additions
and
2 deletions
GUI/View/Import/Legacy1dDialog.cpp
+
16
−
2
View file @
e62bc063
...
@@ -13,6 +13,7 @@
...
@@ -13,6 +13,7 @@
// ************************************************************************************************
// ************************************************************************************************
#include
"GUI/View/Import/Legacy1dDialog.h"
#include
"GUI/View/Import/Legacy1dDialog.h"
#include
"Device/IO/ImportSettings.h"
#include
<QCheckBox>
#include
<QCheckBox>
#include
<QComboBox>
#include
<QComboBox>
#include
<QFormLayout>
#include
<QFormLayout>
...
@@ -20,6 +21,7 @@
...
@@ -20,6 +21,7 @@
#include
<QHBoxLayout>
#include
<QHBoxLayout>
#include
<QLabel>
#include
<QLabel>
#include
<QLineEdit>
#include
<QLineEdit>
#include
<QPushButton>
#include
<QSpinBox>
#include
<QSpinBox>
#include
<QVBoxLayout>
#include
<QVBoxLayout>
#include
<QtGui>
#include
<QtGui>
...
@@ -27,8 +29,8 @@
...
@@ -27,8 +29,8 @@
Legacy1dDialog
::
Legacy1dDialog
()
Legacy1dDialog
::
Legacy1dDialog
()
:
m_allowFactors
(
false
)
:
m_allowFactors
(
false
)
{
{
set
Geometry
(
0
,
0
,
486
,
241
);
set
WindowTitle
(
"Define legacy input format"
);
setWindow
Title
(
"Form"
);
setWindow
Flags
(
Qt
::
Dialog
);
auto
vbox
=
new
QVBoxLayout
;
auto
vbox
=
new
QVBoxLayout
;
setLayout
(
vbox
);
setLayout
(
vbox
);
...
@@ -75,6 +77,18 @@ Legacy1dDialog::Legacy1dDialog()
...
@@ -75,6 +77,18 @@ Legacy1dDialog::Legacy1dDialog()
m_qUnitCombo
->
addItem
(
"1/nm"
);
m_qUnitCombo
->
addItem
(
"1/nm"
);
m_qUnitCombo
->
addItem
(
"1/Å"
);
m_qUnitCombo
->
addItem
(
"1/Å"
);
auto
buttonline
=
new
QHBoxLayout
;
vbox
->
addLayout
(
buttonline
);
auto
cancelButton
=
new
QPushButton
(
"Cancel"
);
buttonline
->
addWidget
(
cancelButton
);
connect
(
cancelButton
,
&
QPushButton
::
clicked
,
this
,
&
Legacy1dDialog
::
reject
);
auto
okButton
=
new
QPushButton
(
"Save"
);
buttonline
->
addWidget
(
okButton
);
okButton
->
setDefault
(
true
);
connect
(
okButton
,
&
QPushButton
::
clicked
,
this
,
&
Legacy1dDialog
::
accept
);
allowFactors
(
false
);
allowFactors
(
false
);
connect
(
m_headerPrefixEdit
,
&
QLineEdit
::
textChanged
,
[
this
]()
{
emit
propertiesChanged
();
});
connect
(
m_headerPrefixEdit
,
&
QLineEdit
::
textChanged
,
[
this
]()
{
emit
propertiesChanged
();
});
...
...
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