[chronojump] json currentVersion updateStr commented until solved: 1.7.0-xxx is more advanced than 1.7.0
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] json currentVersion updateStr commented until solved: 1.7.0-xxx is more advanced than 1.7.0
- Date: Thu, 20 Jul 2017 15:25:20 +0000 (UTC)
commit 6b28894fcac4309bacc6a6ec31ab797fd70dbcda
Author: Xavier de Blas <xaviblas gmail com>
Date: Thu Jul 20 17:24:11 2017 +0200
json currentVersion updateStr commented until solved: 1.7.0-xxx is more advanced than 1.7.0
src/json.cs | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/src/json.cs b/src/json.cs
index fccf110..9fd54a8 100644
--- a/src/json.cs
+++ b/src/json.cs
@@ -176,10 +176,12 @@ public class Json
int endPos = strFull[1].LastIndexOf('"') -2;
string lastVersionPublished = strFull[1].Substring(startPos,endPos); //1.4.9
-
+
+ /*
string updateStr = "";
if(currentVersion != lastVersionPublished)
updateStr = "\n\n" + Catalog.GetString("Update software at ") + "www.chronojump.org";
+ */
this.ResultMessage =
Catalog.GetString("Installed version is: ") + currentVersion + "\n" +
@@ -975,7 +977,7 @@ public class UploadEncoderDataObject
public UploadEncoderDataObject(ArrayList curves)
{
- repetitions = curves.Count;
+ repetitions = curves.Count; //TODO: on ecc-con divide by 2
int nSpeed = getBestRep(curves, byTypes.SPEED);
int nPower = getBestRep(curves, byTypes.POWER);
@@ -1004,6 +1006,8 @@ public class UploadEncoderDataObject
lossByPower = getLoss(curves, byTypes.POWER);
}
+ //TODO: on ecc-con should count [ecc-count] reps
+ //this calculation should be the same than the client gui
private int getBestRep(ArrayList curves, byTypes by)
{
int curveNum = 0;
@@ -1026,6 +1030,8 @@ public class UploadEncoderDataObject
return curveNum;
}
+ //TODO: on ecc-con should count [ecc-count] reps
+ //this calculation should be the same than the client gui
private int getLoss(ArrayList curves, byTypes by)
{
double lowest = 100000;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]