Skip to content
Snippets Groups Projects
Commit ca55dfd5 authored by Giacomo Strangolino's avatar Giacomo Strangolino
Browse files

FixedXXX call FixedX(1) before

parent a9808ac0
No related branches found
No related tags found
No related merge requests found
...@@ -72,9 +72,14 @@ void FourUHV::onPsListReady(const CuData &da) { ...@@ -72,9 +72,14 @@ void FourUHV::onPsListReady(const CuData &da) {
const QString& s = w->property("point").toString(); const QString& s = w->property("point").toString();
if(s.contains("%1")) w->setProperty("source", QString(s).arg(ch)); if(s.contains("%1")) w->setProperty("source", QString(s).arg(ch));
} }
if(w->metaObject()->indexOfProperty("target") > -1) { if(w->property("target").isValid() || w->objectName().contains(QRegularExpression("pbFix\\dk"))) {
const QString& t = w->property("point").toString(); const QString& t = w->property("point").toString();
if(t.contains("%1")) w->setProperty("target", QString(t).arg(ch)); printf("FourUHV::onPsListReady: %s point is %s \n",
qstoc(w->objectName()), qstoc(t));
if(t.contains("%1")) {
w->setProperty("channel", ch);
w->setProperty("target", QString(t).arg(ch));
}
} }
} }
channel->findChild<QGroupBox *>("gbHighTh")->setHidden(true); channel->findChild<QGroupBox *>("gbHighTh")->setHidden(true);
......
#include "channel.h" #include "channel.h"
#include "ui_channel.h" #include "ui_channel.h"
#include <quwriter.h>
Channel::Channel(QWidget *parent, CumbiaPool *cu_p, const CuControlsFactoryPool &fp) : Channel::Channel(QWidget *parent, CumbiaPool *cu_p, const CuControlsFactoryPool &fp) :
QWidget(parent) { QWidget(parent), cu_pool(cu_p), m_ctrl_fpool(fp) {
ui = new Ui::Channel; ui = new Ui::Channel;
ui->setupUi(this, cu_p, fp); ui->setupUi(this, cu_p, fp);
connect(ui->pbFix3k, SIGNAL(clicked()), this, SLOT(onPbFixClicked()));
connect(ui->pbFix5k, SIGNAL(clicked()), this, SLOT(onPbFixClicked()));
connect(ui->pbFix7k, SIGNAL(clicked()), this, SLOT(onPbFixClicked()));
} }
Channel::~Channel() Channel::~Channel()
...@@ -12,3 +16,14 @@ Channel::~Channel() ...@@ -12,3 +16,14 @@ Channel::~Channel()
delete ui; delete ui;
} }
void Channel::onPbFixClicked() {
const QString& t0 = QString("$1/Fixed%1(1)").arg(sender()->property("channel").toInt());
const QString& t1 = sender()->property("target").toString();
foreach(const QString& t, QStringList() << t0 << t1) {
QuWriter *w = new QuWriter(this, cu_pool, m_ctrl_fpool);
w->setAutoDestroy(true);
w->setTarget(t);
printf("Channel::onPbFixClicked %s executing target %s\n", qstoc(sender()->objectName()), qstoc(t));
w->execute();
}
}
...@@ -18,6 +18,8 @@ public: ...@@ -18,6 +18,8 @@ public:
explicit Channel(QWidget *parent, CumbiaPool *cu_p, const CuControlsFactoryPool& fp); explicit Channel(QWidget *parent, CumbiaPool *cu_p, const CuControlsFactoryPool& fp);
~Channel(); ~Channel();
protected slots:
void onPbFixClicked();
private: private:
Ui::Channel *ui; Ui::Channel *ui;
CumbiaPool *cu_pool; CumbiaPool *cu_pool;
......
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="2" column="1">
<widget class="QuButton" name="tPushButton_4"> <widget class="QPushButton" name="pbFix5k">
<property name="text"> <property name="text">
<string>Fix5000</string> <string>Fix5000</string>
</property> </property>
...@@ -186,7 +186,7 @@ ...@@ -186,7 +186,7 @@
</widget> </widget>
</item> </item>
<item row="2" column="2"> <item row="2" column="2">
<widget class="QuButton" name="tPushButton_5"> <widget class="QPushButton" name="pbFix7k">
<property name="text"> <property name="text">
<string>Fix7000</string> <string>Fix7000</string>
</property> </property>
...@@ -295,7 +295,7 @@ ...@@ -295,7 +295,7 @@
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QuButton" name="tPushButton_3"> <widget class="QPushButton" name="pbFix3k">
<property name="text"> <property name="text">
<string>Fix3000</string> <string>Fix3000</string>
</property> </property>
...@@ -318,7 +318,7 @@ ...@@ -318,7 +318,7 @@
</customwidget> </customwidget>
<customwidget> <customwidget>
<class>QuTable</class> <class>QuTable</class>
<extends>EFlag</extends> <extends>QWidget</extends>
<header>qutable.h</header> <header>qutable.h</header>
</customwidget> </customwidget>
<customwidget> <customwidget>
...@@ -326,11 +326,6 @@ ...@@ -326,11 +326,6 @@
<extends>QPushButton</extends> <extends>QPushButton</extends>
<header>qubutton.h</header> <header>qubutton.h</header>
</customwidget> </customwidget>
<customwidget>
<class>EFlag</class>
<extends>QWidget</extends>
<header>eflag.h</header>
</customwidget>
<customwidget> <customwidget>
<class>QuLineEdit</class> <class>QuLineEdit</class>
<extends>QLineEdit</extends> <extends>QLineEdit</extends>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment