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

Allow RC type version number ( translated 900 to 999) (#5450)

Browse Source 
Allow RC type version number (translated 900 to 999)
This commit is contained in:
3djc
2017-12-01 15:59:29 +01:00
committed by Bertrand Songis
parent d90ac05d6e
commit 3eccbc2963
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/helpers.cpp
+13 -4
View File
@@ -700,9 +700,15 @@ QPixmap makePixMap(const QImage & image)
int version2index(const QString & version)
{
int result = 999;
QStringList parts = version.split("N");
if (parts.size() > 1)
result = parts[1].toInt(); // nightly build
QStringList parts;
if (version.contains("RC")) {
parts = version.split("RC");
result = parts[1].toInt() + 900; // RC0 = 900; RC1=901,..
}
else if (version.contains("N")) {
parts = version.split("N");
result = parts[1].toInt(); // nightly build up to 899
}
parts = parts[0].split('.');
if (parts.size() > 2)
result += 1000 * parts[2].toInt();
@@ -725,9 +731,12 @@ const QString index2version(int index)
int minor = index % 100;
int major = index / 100;
result = templt.arg(major).arg(minor).arg(revision);
if (nightly > 0 && nightly < 999) {
if (nightly > 0 && nightly < 900) {
result += "N" + QString::number(nightly);
}
else if (nightly >= 900 && nightly < 1000) {
result += "RC" + QString::number(nightly-900);
}
}
else if (index >= 19900) {
int revision = index % 100;