Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
cs
gui
4uhv
Commits
6cb66dd4
Commit
6cb66dd4
authored
May 06, 2022
by
Giacomo Strangolino
Browse files
#16752 : change Fix push button logic: executes three operations in sequence
parent
13223b86
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/4uhv.cpp
View file @
6cb66dd4
...
...
@@ -72,6 +72,7 @@ void FourUHV::onPsListReady(const CuData &da) {
const
QString
&
s
=
w
->
property
(
"point"
).
toString
();
if
(
s
.
contains
(
"%1"
))
w
->
setProperty
(
"source"
,
QString
(
s
).
arg
(
ch
));
}
// object name like pbFix3k, pbFix5k
if
(
w
->
property
(
"target"
).
isValid
()
||
w
->
objectName
().
contains
(
QRegularExpression
(
"pbFix
\\
dk"
)))
{
const
QString
&
t
=
w
->
property
(
"point"
).
toString
();
if
(
t
.
contains
(
"%1"
))
{
...
...
src/channel.cpp
View file @
6cb66dd4
...
...
@@ -17,9 +17,13 @@ Channel::~Channel()
}
void
Channel
::
onPbFixClicked
()
{
const
QString
&
t0
=
QString
(
"$1/Fixed%1(1)"
).
arg
(
sender
()
->
property
(
"channel"
).
toInt
());
// FixedX(0) then VTargetX(NNNN) then FixedX(1) where X is the channel and NNNN the voltage
// properties set in FourUHV::onPsListReady
const
QString
&
t0
=
QString
(
"$1/Fixed%1(0)"
).
arg
(
sender
()
->
property
(
"channel"
).
toInt
());
const
QString
&
t1
=
sender
()
->
property
(
"target"
).
toString
();
foreach
(
const
QString
&
t
,
QStringList
()
<<
t0
<<
t1
)
{
const
QString
&
t2
=
QString
(
"$1/Fixed%1(1))"
).
arg
(
sender
()
->
property
(
"channel"
).
toInt
());
foreach
(
const
QString
&
t
,
QStringList
()
<<
t0
<<
t1
<<
t2
)
{
QuWriter
*
w
=
new
QuWriter
(
this
,
cu_pool
,
m_ctrl_fpool
);
w
->
setAutoDestroy
(
true
);
w
->
setTarget
(
t
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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