Mirror/edgetx
1
0
Fork 0
mirror of https://github.com/EdgeTX/edgetx.git synced 2025-07-26 09:45:16 +03:00
Code Activity

Fixes #1917

Browse source
This commit is contained in:
bsongis 2015-05-10 12:31:43 +02:00
parent cde0824f05
commit 274303a658
7 changed files with 1870 additions and 1751 deletions
Download patch file Download diff file Expand all files Collapse all files

79
companion/src/simulation/simulatordialog.cpp
View file

@ -50,7 +50,6 @@ void SimulatorDialog::updateDebugOutput()
SimulatorDialog::SimulatorDialog(QWidget * parent, SimulatorInterface *simulator, unsigned int flags):
QDialog(parent),
flags(flags),
dialP_4(NULL),
timer(NULL),
lightOn(false),
simulator(simulator),
@ -118,10 +117,9 @@ SimulatorDialog9X::SimulatorDialog9X(QWidget * parent, SimulatorInterface *simul
ui->trimHL_R->setText(QString::fromUtf8(rightArrow));
ui->trimVL_U->setText(QString::fromUtf8(upArrow));
ui->trimVL_D->setText(QString::fromUtf8(downArrow));
connect(ui->dialP_1, SIGNAL(valueChanged(int)), this, SLOT(dialChanged()));
connect(ui->dialP_2, SIGNAL(valueChanged(int)), this, SLOT(dialChanged()));
connect(ui->dialP_3, SIGNAL(valueChanged(int)), this, SLOT(dialChanged()));
for (int i=0; i<pots.count(); i++) {
connect(pots[i], SIGNAL(valueChanged(int)), this, SLOT(dialChanged(i)));
}
connect(ui->cursor, SIGNAL(buttonPressed(int)), this, SLOT(onButtonPressed(int)));
connect(ui->menu, SIGNAL(buttonPressed(int)), this, SLOT(onButtonPressed(int)));
connect(ui->trimHR_L, SIGNAL(pressed()), this, SLOT(onTrimPressed()));
@ -156,20 +154,31 @@ SimulatorDialogTaranis::SimulatorDialogTaranis(QWidget * parent, SimulatorInterf
{
lcdWidth = 212;
lcdDepth = 4;
initUi<Ui::SimulatorDialogTaranis>(ui);
// install simulator TRACE hook
simulator->installTraceHook(traceCb);
dialP_4 = ui->dialP_4;
ui->lcd->setBackgroundColor(47, 123, 227);
//restore switches
if (g.simuSW())
// restore switches
if (g.simuSW()) {
restoreSwitches();
}
for (int i=0; i<pots.count(); i++) {
if (flags & (SIMULATOR_FLAGS_S1_MULTI << i)) {
pots[i]->setValue(-1024);
pots[i]->setSingleStep(2048/5);
pots[i]->setPageStep(2048/5);
}
else if (!(flags & (SIMULATOR_FLAGS_S1 << i))) {
pots[i]->hide();
potLabels[i]->hide();
}
}
ui->trimHR_L->setText(QString::fromUtf8(leftArrow));
ui->trimHR_R->setText(QString::fromUtf8(rightArrow));
ui->trimVR_U->setText(QString::fromUtf8(upArrow));
@ -232,11 +241,9 @@ void SimulatorDialog::mouseReleaseEvent(QMouseEvent *event)
}
}
void SimulatorDialog9X::dialChanged()
void SimulatorDialog::dialChanged(int index)
{
ui->dialP_1value->setText(QString("%1 %").arg((ui->dialP_1->value()*100)/1024));
ui->dialP_2value->setText(QString("%1 %").arg((ui->dialP_2->value()*100)/1024));
ui->dialP_3value->setText(QString("%1 %").arg((ui->dialP_3->value()*100)/1024));
potValues[index]->setText(QString("%1 %").arg((pots[index]->value()*100)/1024));
}
void SimulatorDialog::wheelEvent (QWheelEvent *event)
@ -371,9 +378,11 @@ void SimulatorDialog::initUi(T * ui)
lcd = ui->lcd;
leftStick = ui->leftStick;
rightStick = ui->rightStick;
dialP_1 = ui->dialP_1;
dialP_2 = ui->dialP_2;
dialP_3 = ui->dialP_3;
pots = findWidgets<QDial *>(this, "pot%1");
potLabels = findWidgets<QLabel *>(this, "potLabel%1");
potValues = findWidgets<QLabel *>(this, "potValue%1");
sliders = findWidgets<QSlider *>(this, "slider%1");
trimHLeft = ui->trimHLeft;
trimVLeft = ui->trimVLeft;
trimHRight = ui->trimHRight;
@ -726,9 +735,9 @@ void SimulatorDialog9X::getValues()
},
{
ui->dialP_1->value(),
ui->dialP_2->value(),
ui->dialP_3->value(), 0
pots[0]->value(),
pots[1]->value(),
pots[2]->value()
},
{
@ -820,6 +829,13 @@ void SimulatorDialogTaranis::on_switchH_sliderReleased()
void SimulatorDialogTaranis::getValues()
{
for (int i=0; i<pots.count(); i++) {
if (flags & (SIMULATOR_FLAGS_S1_MULTI << i)) {
int s1 = round((pots[i]->value()+1024)/(2048.0/5))*(2048.0/5)-1024;
pots[i]->setValue(s1);
}
}
TxInputs inputs = {
{
int(1024*nodeLeft->getX()), // LEFT HORZ
@ -829,11 +845,11 @@ void SimulatorDialogTaranis::getValues()
},
{
-ui->dialP_1->value(),
ui->dialP_2->value(),
0,
-ui->dialP_3->value(),
ui->dialP_4->value()
-pots[0]->value(),
pots[1]->value(),
((flags && SIMULATOR_FLAGS_S3) ? pots[2]->value() : 0),
-sliders[0]->value(),
sliders[1]->value()
},
{
@ -1107,18 +1123,9 @@ void SimulatorDialog::onjoystickAxisValueChanged(int axis, int value)
}
else if (stick==4) {
nodeLeft->setX(stickval/1024.0);
}
else if (stick==5) {
dialP_1->setValue(stickval);
}
else if (stick==6) {
dialP_2->setValue(stickval);
}
else if (stick==7) {
dialP_3->setValue(stickval);
}
else if (stick==8 && dialP_4) {
dialP_4->setValue(stickval);
else if (stick >= 5 && stick < 5+pots.count()) {
pots[stick-5]->setValue(stickval);
}
}
}