Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Scientific Software
Takin
core
Commits
bbffa3ff
Verified
Commit
bbffa3ff
authored
Apr 23, 2021
by
Tobias WEBER
Browse files
using expression parser in dead angles dialog
parent
fb3a9a40
Changes
1
Hide whitespace changes
Inline
Side-by-side
dialogs/DeadAnglesDlg.cpp
View file @
bbffa3ff
...
...
@@ -87,14 +87,17 @@ void DeadAnglesDlg::AddAngle()
int
iRow
=
tableAngles
->
rowCount
();
tableAngles
->
insertRow
(
iRow
);
tableAngles
->
setItem
(
iRow
,
static_cast
<
int
>
(
AngleInfo
::
START_ANGLE
),
new
QTableWidgetItem
(
"0"
));
tableAngles
->
setItem
(
iRow
,
static_cast
<
int
>
(
AngleInfo
::
STOP_ANGLE
),
new
QTableWidgetItem
(
"0"
));
tableAngles
->
setItem
(
iRow
,
static_cast
<
int
>
(
AngleInfo
::
OFFSET_ANGLE
),
new
QTableWidgetItem
(
"0"
));
tableAngles
->
setItem
(
iRow
,
static_cast
<
int
>
(
AngleInfo
::
START_ANGLE
),
new
QTableWidgetItem
(
"0"
));
tableAngles
->
setItem
(
iRow
,
static_cast
<
int
>
(
AngleInfo
::
STOP_ANGLE
),
new
QTableWidgetItem
(
"0"
));
tableAngles
->
setItem
(
iRow
,
static_cast
<
int
>
(
AngleInfo
::
OFFSET_ANGLE
),
new
QTableWidgetItem
(
"0"
));
QComboBox
*
pComboCentreOn
=
new
QComboBox
(
tableAngles
);
pComboCentreOn
->
addItem
(
"Mono
.
"
);
pComboCentreOn
->
addItem
(
"Mono
chromator
"
);
pComboCentreOn
->
addItem
(
"Sample"
);
pComboCentreOn
->
addItem
(
"Ana
.
"
);
pComboCentreOn
->
addItem
(
"Ana
lyser
"
);
pComboCentreOn
->
setCurrentIndex
(
1
);
tableAngles
->
setCellWidget
(
iRow
,
static_cast
<
int
>
(
AngleInfo
::
CENTRE
),
pComboCentreOn
);
...
...
@@ -161,13 +164,13 @@ void DeadAnglesDlg::SendApplyDeadAngles()
{
DeadAngle
<
t_real
>
angle
;
angle
.
dAngleStart
=
tl
::
str_to_var
<
t_real
>
(
tableAngles
->
item
(
tl
::
str_to_var
_parse
<
t_real
>
(
tableAngles
->
item
(
iRow
,
static_cast
<
int
>
(
AngleInfo
::
START_ANGLE
))
->
text
().
toStdString
());
angle
.
dAngleEnd
=
tl
::
str_to_var
<
t_real
>
(
tableAngles
->
item
(
tl
::
str_to_var
_parse
<
t_real
>
(
tableAngles
->
item
(
iRow
,
static_cast
<
int
>
(
AngleInfo
::
STOP_ANGLE
))
->
text
().
toStdString
());
angle
.
dAngleOffs
=
tl
::
str_to_var
<
t_real
>
(
tableAngles
->
item
(
tl
::
str_to_var
_parse
<
t_real
>
(
tableAngles
->
item
(
iRow
,
static_cast
<
int
>
(
AngleInfo
::
OFFSET_ANGLE
))
->
text
().
toStdString
());
QComboBox
*
pComboCentreOn
=
(
QComboBox
*
)
tableAngles
->
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment