From 045294d53b70806885b4f8314835fefd1247bcf2 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Wed, 9 Aug 2017 10:29:33 +0200 Subject: [PATCH] Unify element names --- companion/src/eeprominterface.cpp | 69 ++++++++++++++++++------------- 1 file changed, 41 insertions(+), 28 deletions(-) diff --git a/companion/src/eeprominterface.cpp b/companion/src/eeprominterface.cpp index bbc223aff..0d6844642 100644 --- a/companion/src/eeprominterface.cpp +++ b/companion/src/eeprominterface.cpp @@ -114,6 +114,23 @@ void getEEPROMZString(char *dst, const char *src, int size) } } +QString getElementName(const QString & prefix, unsigned int index, const char * name = NULL, bool padding = false) +{ + QString result = prefix; + if (padding) + result += QString("%1").arg(index, 2, 10, QChar('0')); + else + result += QString("%1").arg(index); + if (name) { + QString trimmed = QString(name).trimmed(); + if (trimmed.length() > 0) { + result += ":" + QString(name).trimmed(); + } + } + return result; +} + + float ValToTim(int value) { return ((value < -109 ? 129+value : (value < 7 ? (113+value)*5 : (53+value)*10))/10.0); @@ -508,10 +525,12 @@ QString RawSource::toString(const ModelData * model, const GeneralSettings * con int genAryIdx = 0; switch (type) { case SOURCE_TYPE_VIRTUAL_INPUT: - result = QObject::tr("[I%1]").arg(index+1, 2, 10, QChar('0')); - if (model && model->inputNames[index][0]) - result.append(/*":" + */QString(model->inputNames[index]).trimmed()); - return result; + { + const char * name = NULL; + if (model) + name = model->inputNames[index]; + return getElementName(QCoreApplication::translate("Input", "I"), index + 1, name); + } case SOURCE_TYPE_LUA_OUTPUT: return QObject::tr("LUA%1%2").arg(index/16+1).arg(QChar('a'+index%16)); @@ -550,13 +569,15 @@ QString RawSource::toString(const ModelData * model, const GeneralSettings * con return QObject::tr("CYC%1").arg(index+1); case SOURCE_TYPE_PPM: - return QObject::tr("TR%1").arg(index+1, 2, 10, QChar('0')); + return getElementName(QCoreApplication::translate("Trainer", "TR"), index + 1); case SOURCE_TYPE_CH: - result = QObject::tr("CH%1").arg(index+1, 2, 10, QChar('0')); - if (getCurrentFirmware()->getCapability(ChannelsName) && model && model->limitData[index].name[0]) - result.append(":" + QString(model->limitData[index].name).trimmed()); - return result; + { + const char * name = NULL; + if (getCurrentFirmware()->getCapability(ChannelsName) && model) + name = model->limitData[index].name; + return getElementName(QCoreApplication::translate("Channel", "CH"), index + 1, name); + } case SOURCE_TYPE_SPECIAL: return CHECK_IN_ARRAY(special, index); @@ -564,7 +585,7 @@ QString RawSource::toString(const ModelData * model, const GeneralSettings * con case SOURCE_TYPE_TELEMETRY: if (IS_ARM(getCurrentBoard())) { div_t qr = div(index, 3); - result = model ? QString(model->sensorData[qr.quot].label) : QString("[T%1]").arg(qr.quot+1, 2, 10, QChar('0')); + result = getElementName(QCoreApplication::translate("Telemetry", "TELE"), qr.quot+1, model ? model->sensorData[qr.quot].label : NULL); if (qr.rem) result += (qr.rem == 1 ? "-" : "+"); return result; @@ -574,10 +595,12 @@ QString RawSource::toString(const ModelData * model, const GeneralSettings * con } case SOURCE_TYPE_GVAR: - result = QObject::tr("GV%1").arg(index+1, 2, 10, QChar('0')); - if (getCurrentFirmware()->getCapability(GvarsName) && model && model->gvars_names[index][0]) - result.append(":" + QString(model->gvars_names[index]).trimmed()); - return result; + { + const char * name = NULL; + if (getCurrentFirmware()->getCapability(GvarsName) && model) + name = model->gvars_names[index]; + return getElementName(QCoreApplication::translate("Global Variable", "GV"), index + 1, name); + } default: return QObject::tr("----"); @@ -634,10 +657,6 @@ QString RawSwitch::toString(Board::Type board, const GeneralSettings * const gen QString("AIL"), QString("GEA"), QString("TRN") }; - static const QString flightModes[] = { - QObject::tr("FM0"), QObject::tr("FM1"), QObject::tr("FM2"), QObject::tr("FM3"), QObject::tr("FM4"), QObject::tr("FM5"), QObject::tr("FM6"), QObject::tr("FM7"), QObject::tr("FM8") - }; - static const QString trimsSwitches[] = { QObject::tr("RudTrim Left"), QObject::tr("RudTrim Right"), QObject::tr("EleTrim Down"), QObject::tr("EleTrim Up"), @@ -682,7 +701,7 @@ QString RawSwitch::toString(Board::Type board, const GeneralSettings * const gen } case SWITCH_TYPE_VIRTUAL: - return QObject::tr("L%1").arg(index, 2, 10, QChar('0')); + return getElementName(QCoreApplication::translate("Logic Switch", "L"), index, NULL, true); case SWITCH_TYPE_MULTIPOS_POT: if (!getCurrentFirmware()->getCapability(MultiposPotsPositions)) @@ -710,7 +729,7 @@ QString RawSwitch::toString(Board::Type board, const GeneralSettings * const gen return QObject::tr("One"); case SWITCH_TYPE_FLIGHT_MODE: - return CHECK_IN_ARRAY(flightModes, index-1); + return getElementName(QCoreApplication::translate("Flight mode", "FM"), index - 1, modelData->flightModeData[index-1].name); case SWITCH_TYPE_NONE: return QObject::tr("----"); @@ -719,10 +738,7 @@ QString RawSwitch::toString(Board::Type board, const GeneralSettings * const gen return CHECK_IN_ARRAY(timerModes, index); case SWITCH_TYPE_SENSOR: - if (modelData && index <= CPN_MAX_SENSORS && strlen(modelData->sensorData[index-1].label) > 0) - return QObject::tr("Tele%1:%2").arg(index).arg(modelData->sensorData[index-1].label); - else - return QObject::tr("Tele%1").arg(index); + return getElementName(QCoreApplication::translate("Telemetry", "TELE"), index, modelData->sensorData[index-1].label); case SWITCH_TYPE_TELEMETRY: return QObject::tr("Telemetry"); @@ -1095,10 +1111,7 @@ bool CurveData::isEmpty() const QString CurveData::nameToString(const int idx) const { - QString ret = QCoreApplication::translate("CurveData", "CV%1").arg(idx+1, 2, 10, QChar('0')); - if (name[0]) - ret.append(":" + QString(name).trimmed()); - return ret; + return getElementName(QCoreApplication::translate("Curve", "CV"), idx + 1, name); } QString LimitData::minToString() const