diff --git a/src/4uhv.cpp b/src/4uhv.cpp index 5501b33f32def92f8d889d95438c4b479e92a36e..0eae64dc356fb3b1a337c6a929fc065465edc3ad 100644 --- a/src/4uhv.cpp +++ b/src/4uhv.cpp @@ -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")) { diff --git a/src/channel.cpp b/src/channel.cpp index 03883f19d5bf5d115d1bb59f41cd7490cad9a9d8..ec0002f0e18a7ccb2e4ece9c061722620d020f19 100644 --- a/src/channel.cpp +++ b/src/channel.cpp @@ -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);