Add channel names on companion failsafe sliders (fix #3021), remove redundant stuff

This commit is contained in:
Andre Bernet
2015-11-01 14:06:49 +04:00
parent 1641db873d
commit 58216ec8b0
7 changed files with 14 additions and 8 deletions
+2 -2
View File
@@ -57,7 +57,7 @@ QString ModelPrinter::printChannelName(int idx)
QString ModelPrinter::printOutputName(int idx)
{
QString name = QString(model.limitData[idx].name).trimmed();
if (firmware->getCapability(HasChNames) && !name.isEmpty()) {
if (firmware->getCapability(ChannelsName) > 0 && !name.isEmpty()) {
return name;
}
else {
@@ -313,7 +313,7 @@ QString ModelPrinter::printInputLine(const ExpoData & input)
QString ModelPrinter::printMixerName(int curDest)
{
QString str = printChannelName(curDest-1) + " ";
if (firmware->getCapability(HasChNames)) {
if (firmware->getCapability(ChannelsName) > 0) {
QString name = model.limitData[curDest-1].name;
if (!name.isEmpty()) {
name = QString("(") + name + QString(")");