Skip to content

Commit 65e32bc

Browse files
Jozef MlichJozef Mlich
Jozef Mlich
authored and
Jozef Mlich
committed
use "YES" instead of translated version in exported files
1 parent 58eb32c commit 65e32bc

File tree

2 files changed

+37
-19
lines changed

2 files changed

+37
-19
lines changed

viewer/qml/viewer/PathConfiguration.qml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@ ApplicationWindow {
1212
color: "#ffffff"
1313

1414
property alias igcDirectory: igcDirectoryTextField.text
15-
// property string igcDirectory_default: "file:///home/jmlich/workspace/tucek/testovaci_data/igcFiles"
16-
property string igcDirectory_default: "file:///home/imlich/workspace/tucek/testovaci_data/igcFiles"
15+
property string igcDirectory_default: "file:///home/jmlich/workspace/tucek/2015-kotvrdovice/vysledky/igcFiles"
16+
// property string igcDirectory_default: "file:///home/imlich/workspace/tucek/testovaci_data/igcFiles"
1717
// property string igcDirectory_default: "file:///"+ QStandardPathsApplicationFilePath + "/igcFiles"
1818

1919
property alias trackFile: trackFileTextField.text
20-
property string trackFile_default: "file:///var/www/html/tucek2/2014-7-LKJH.json";
20+
property string trackFile_default: "file:///home/jmlich/workspace/tucek/2015-kotvrdovice/2015-kotv2.json";
2121
// property string trackFile_default: "file:///var/www/html/tucek2/2012-KOTV.json";
2222
// property string trackFile_default: "file:///var/www/html/tucek2/2014-LKHK-50bodu.json";
2323
// property string trackFile_default: "file:///"+ QStandardPathsApplicationFilePath + "/track.json";
2424

2525
property alias resultsFolder: resultsFolderTextField.text;
26-
// property string resultsFolder_default: "file:///home/jmlich/workspace/tucek/testovaci_data/results"
27-
property string resultsFolder_default: "file:///home/imlich/workspace/tucek/testovaci_data/results"
26+
property string resultsFolder_default: "file:///home/jmlich/workspace/tucek/2015-kotvrdovice/vysledky/results"
27+
// property string resultsFolder_default: "file:///home/imlich/workspace/tucek/testovaci_data/results"
2828
// property string resultsFolder_default: "file:///"+ QStandardPathsApplicationFilePath +"/results";
2929
// property string resultsFolder_default: "../../results"
3030

viewer/qml/viewer/main.qml

Lines changed: 32 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -581,6 +581,34 @@ ApplicationWindow {
581581
map.tracksSelectedTid = item.tid
582582
}
583583

584+
itemDelegate: Item {
585+
NativeText {
586+
width: parent.width
587+
anchors.margins: 4
588+
anchors.left: parent.left
589+
anchors.verticalCenter: parent.verticalCenter
590+
elide: styleData.elideMode
591+
text: getTextForRole(styleData.row, styleData.role, styleData.value);
592+
color: styleData.textColor;
593+
594+
}
595+
function getTextForRole(row, role, value) {
596+
switch (role) {
597+
case "hit":
598+
case "sg_hit":
599+
return value
600+
//% "YES"
601+
? qsTrId("hit-yes")
602+
//% "NO"
603+
: qsTrId("hit-no")
604+
605+
break;
606+
default:
607+
return value;
608+
}
609+
}
610+
}
611+
584612
}
585613
}
586614

@@ -1214,18 +1242,8 @@ ApplicationWindow {
12141242
"radius": parseFloat(item.radius),
12151243
"angle": item.angle,
12161244
"time": item.time,
1217-
"hit": (item.hit
1218-
//% "YES"
1219-
? qsTrId("hit-yes")
1220-
//% "NO"
1221-
: qsTrId("hit-no")
1222-
),
1223-
"sg_hit": (item.sg_hit
1224-
//% "YES"
1225-
? qsTrId("sg-hit-yes")
1226-
//% "NO"
1227-
: qsTrId("sg-hit-no")
1228-
),
1245+
"hit": item.hit,
1246+
"sg_hit": item.sg_hit,
12291247
"speed": String(Math.round(speed)),
12301248
"altmax": String(Math.round(alt_max)),
12311249
"altmaxtime": String(alt_max_time),
@@ -1247,8 +1265,8 @@ ApplicationWindow {
12471265
wptScoreList.append(newData);
12481266
dataArr.push(newData)
12491267
str += "\"" + item.time + "\";";
1250-
str += "\"" + (item.hit ? qsTrId("hit-yes") : qsTrId("hit-no") )+ "\";";
1251-
str += "\"" + (item.sg_hit ? qsTrId("sg-hit-yes") : qsTrId("sg-hit-no") ) + "\";";
1268+
str += "\"" + (item.hit ? "YES" : "NO" )+ "\";";
1269+
str += "\"" + (item.sg_hit ? "YES" : "NO" ) + "\";";
12521270
str += "\"" + item.alt + "\";";
12531271
str += "\"" + speed + "\";";
12541272
//str += "\"" + alt_min + "\";";

0 commit comments

Comments
 (0)