Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-14 20:10:08 +03:00
Code Issues Wiki Activity

More compaction of printInputs()

Browse source
This commit is contained in:
Damjan Adamic 2014-05-05 21:04:50 +02:00
parent b9b4e441e7
commit 97bbdd3be1
1 changed files with 8 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

26
companion/src/printdialog.cpp
View file

@ -244,31 +244,27 @@ void PrintDialog::printInputs()
if (firmware->getCapability(VirtualInputs)) {
str += " " + tr("Source") + QString("(%1)").arg(ed->srcRaw.toString());
if (ed->carryTrim>0) {
str += " " + tr("NoTrim");
}
else if (ed->carryTrim<0) {
str += " " + RawSource(SOURCE_TYPE_TRIM, (-(ed->carryTrim)-1)).toString();
}
if (ed->carryTrim>0) str += " " + tr("NoTrim");
else if (ed->carryTrim<0) str += " " + RawSource(SOURCE_TYPE_TRIM, (-(ed->carryTrim)-1)).toString();
}
if (ed->curve.value) str += " " + Qt::escape(ed->curve.toString());
if (firmware->getCapability(FlightPhases)) {
if(ed->phases) {
if (ed->phases!=(unsigned int)(1<<firmware->getCapability(FlightPhases))-1) {
int mask=1;
unsigned int mask=1;
bool first = true;
QString strPhases;
bool multiple = false;
QString strPhases;
for (int j=0; j<firmware->getCapability(FlightPhases);j++) {
if (!(ed->phases & mask)) {
//PhaseData *pd = &g_model->phaseData[j];
const char * pdName = g_model->phaseData[j].name;
if (first) {
strPhases += QString("%1").arg(getPhaseName(j+1,pdName));
strPhases += Qt::escape(QString("%1").arg(getPhaseName(j+1,pdName)));
first = false;
} else {
strPhases += QString(", %1").arg(getPhaseName(j+1, pdName));
strPhases += Qt::escape(QString(", %1").arg(getPhaseName(j+1, pdName)));
multiple = true;
}
}
@ -282,14 +278,8 @@ void PrintDialog::printInputs()
}
}
}
if (ed->swtch.type)
str += " " + tr("Switch") + QString("(%1)").arg(ed->swtch.toString());
if (firmware->getCapability(HasExpoNames)) {
QString ExpoName(ed->name);
if (ed->name[0]) {
str += QString(" [%1]").arg(ed->name);
}
}
if (ed->swtch.type) str += " " + tr("Switch") + QString("(%1)").arg(ed->swtch.toString());
if (firmware->getCapability(HasExpoNames) && ed->name[0]) str += Qt::escape(QString(" [%1]").arg(ed->name));
str += "</font></td></tr>";
}
str += "</table></td></tr></table><br>";