From 2364752a985119519499c528732109e4f8ad2a88 Mon Sep 17 00:00:00 2001 From: Andre Bernet Date: Fri, 7 Feb 2014 11:21:40 +0100 Subject: [PATCH] Trims included in simulator stick labels --- companion/src/simulatordialog.cpp | 10 ++++++---- companion/src/xsimulatordialog.cpp | 11 +++++++---- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/companion/src/simulatordialog.cpp b/companion/src/simulatordialog.cpp index 1bbddf4ef..85cc110d2 100644 --- a/companion/src/simulatordialog.cpp +++ b/companion/src/simulatordialog.cpp @@ -497,6 +497,8 @@ void simulatorDialog::setValues() { TxOutputs outputs; simulator->getValues(outputs); + Trims trims; + simulator->getTrims(trims); ui->chnout_1->setValue(chVal(outputs.chans[0])); ui->chnout_2->setValue(chVal(outputs.chans[1])); @@ -536,11 +538,11 @@ void simulatorDialog::setValues() ui->chnoutV_16->setText(QString("%1").arg((qreal)outputs.chans[15]*100/1024, 0, 'f', 1)); } - ui->leftXPerc->setText(QString("X %1%").arg((qreal)nodeLeft->getX()*100, 2, 'f', 0)); - ui->leftYPerc->setText(QString("Y %1%").arg((qreal)nodeLeft->getY()*-100, 2, 'f', 0)); + ui->leftXPerc->setText(QString("X %1%").arg((qreal)nodeLeft->getX()*100+trims.values[0]/5, 2, 'f', 0)); + ui->leftYPerc->setText(QString("Y %1%").arg((qreal)nodeLeft->getY()*-100+trims.values[1]/5, 2, 'f', 0)); - ui->rightXPerc->setText(QString("X %1%").arg((qreal)nodeRight->getX()*100, 2, 'f', 0)); - ui->rightYPerc->setText(QString("Y %1%").arg((qreal)nodeRight->getY()*-100, 2, 'f', 0)); + ui->rightXPerc->setText(QString("X %1%").arg((qreal)nodeRight->getX()*100+trims.values[2]/5, 2, 'f', 0)); + ui->rightYPerc->setText(QString("Y %1%").arg((qreal)nodeRight->getY()*-100+trims.values[3]/5, 2, 'f', 0)); #define CSWITCH_ON "QLabel { background-color: #4CC417 }" #define CSWITCH_OFF "QLabel { }" diff --git a/companion/src/xsimulatordialog.cpp b/companion/src/xsimulatordialog.cpp index 488439715..07524bb04 100644 --- a/companion/src/xsimulatordialog.cpp +++ b/companion/src/xsimulatordialog.cpp @@ -383,6 +383,9 @@ void xsimulatorDialog::setValues() { TxOutputs outputs; simulator->getValues(outputs); + + Trims trims; + simulator->getTrims(trims); ui->chnout_1->setValue(chVal(outputs.chans[0])); ui->chnout_2->setValue(chVal(outputs.chans[1])); @@ -422,11 +425,11 @@ void xsimulatorDialog::setValues() ui->chnoutV_16->setText(QString("%1").arg((qreal)outputs.chans[15]*100/1024, 0, 'f', 1)); } - ui->leftXPerc->setText(QString("X %1%").arg((qreal)nodeLeft->getX()*100, 2, 'f', 0)); - ui->leftYPerc->setText(QString("Y %1%").arg((qreal)nodeLeft->getY()*-100, 2, 'f', 0)); + ui->leftXPerc->setText(QString("X %1%").arg((qreal)nodeLeft->getX()*100+trims.values[0]/5, 2, 'f', 0)); + ui->leftYPerc->setText(QString("Y %1%").arg((qreal)nodeLeft->getY()*-100+trims.values[1]/5, 2, 'f', 0)); - ui->rightXPerc->setText(QString("X %1%").arg((qreal)nodeRight->getX()*100, 2, 'f', 0)); - ui->rightYPerc->setText(QString("Y %1%").arg((qreal)nodeRight->getY()*-100, 2, 'f', 0)); + ui->rightXPerc->setText(QString("X %1%").arg((qreal)nodeRight->getX()*100+trims.values[2]/5, 2, 'f', 0)); + ui->rightYPerc->setText(QString("Y %1%").arg((qreal)nodeRight->getY()*-100+trims.values[3]/5, 2, 'f', 0)); #define CSWITCH_ON "QLabel { background-color: #4CC417 }" #define CSWITCH_OFF "QLabel { }"