piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Companion global variables refactor (#5328)

Browse Source 
* Companion Global Variables refactor to support changes to radio in 2.2

* Update model print for global variables refactor

* Check and if necessary update all flight modes gvar after updating min or max

* Fix loop limit

* Add clear single gvar context menu
Add gvar popup values to model print
Minor fixes
This commit is contained in:
Neil Horne
2017-11-11 08:56:30 +01:00
committed by Bertrand Songis
parent 69afa9d0f8
commit 8e9d370770
8 changed files with 452 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/modelprinter.cpp
+28 -1
View File
@@ -305,7 +305,8 @@ QString ModelPrinter::printGlobalVar(int flightModeIndex, int gvarIndex)
const FlightModeData & fm = model.flightModeData[flightModeIndex];
if (fm.gvars[gvarIndex] <= 1024) {
return QString("%1").arg(fm.gvars[gvarIndex]);
//double val = fm.gvars[gvarIndex] * model.gvarData[gvarIndex].multiplierGet();
return QString("%1").arg(fm.gvars[gvarIndex] * model.gvarData[gvarIndex].multiplierGet());
}
else {
int num = fm.gvars[gvarIndex] - 1025;
@@ -685,3 +686,29 @@ QString ModelPrinter::createCurveImage(int idx, QTextDocument * document)
// qDebug() << "ModelPrinter::createCurveImage()" << idx << filename;
return filename;
}
QString ModelPrinter::printGlobalVarUnit(int idx)
{
return model.gvarData[idx].unitToString().toHtmlEscaped();
}
QString ModelPrinter::printGlobalVarPrec(int idx)
{
return model.gvarData[idx].precToString().toHtmlEscaped();
}
QString ModelPrinter::printGlobalVarMin(int idx)
{
return QString::number(model.gvarData[idx].getMinPrec());
}
QString ModelPrinter::printGlobalVarMax(int idx)
{
return QString::number(model.gvarData[idx].getMaxPrec());
}
QString ModelPrinter::printGlobalVarPopup(int idx)
{
return (model.gvarData[idx].popup ? "Y" : "N" );
}