From 42371541becbb43142a3e7f63d3b35d44809a3fe Mon Sep 17 00:00:00 2001 From: Jozef Mlich Date: Fri, 5 Jun 2020 13:53:36 +0200 Subject: [PATCH] remove strange speed_min/speed_max feature --- CloneDialog.qml | 4 - PropertiesDetail.qml | 44 ----------- TracksList.qml | 46 ------------ TracksListTableDelegate.qml | 16 ---- editor_defaults.json | 48 ------------ i18n/editor_cs_CZ.ts | 146 +++++++++++++++--------------------- i18n/editor_en_US.ts | 146 +++++++++++++++--------------------- main.qml | 2 - 8 files changed, 124 insertions(+), 328 deletions(-) diff --git a/CloneDialog.qml b/CloneDialog.qml index fb08280..021c293 100644 --- a/CloneDialog.qml +++ b/CloneDialog.qml @@ -170,8 +170,6 @@ ApplicationWindow { "default_radius": src_obj.default_radius, "default_alt_min": src_obj.default_alt_min, "default_alt_max": src_obj.default_alt_max, - "default_speed_min": src_obj.default_speed_min, - "default_speed_max": src_obj.default_speed_max, "default_flags": src_obj.default_flags, } } else { @@ -197,8 +195,6 @@ ApplicationWindow { "default_radius": t.default_radius, "default_alt_min": t.default_alt_min, "default_alt_max": t.default_alt_max, - "default_speed_min": t.default_speed_min, - "default_speed_max": t.default_speed_max, "default_flags": t.default_flags, } diff --git a/PropertiesDetail.qml b/PropertiesDetail.qml index 134d415..444d57c 100644 --- a/PropertiesDetail.qml +++ b/PropertiesDetail.qml @@ -42,10 +42,6 @@ ApplicationWindow { property alias default_radius: default_radius_textfield.value; property alias default_alt_min: default_alt_min_textfield.value; property alias default_alt_max: default_alt_max_textfield.value; - // property alias default_speed_min: default_speed_min_textfield.value; - // property alias default_speed_max: default_speed_max_textfield.value; - property string default_speed_min: "" - property string default_speed_max: "" property int default_flags @@ -71,8 +67,6 @@ ApplicationWindow { sg_cb.checked = arr[2] alt_min_cb.checked = arr[3] alt_max_cb.checked = arr[4] - speed_min_cb.checked = arr[5] - speed_max_cb.checked = arr[6] section_speed_start_cb.checked = arr[7]; section_speed_end_cb.checked = arr[8]; @@ -316,26 +310,6 @@ ApplicationWindow { } - // NativeText { - // //% "Minimim Speed [km/h]" - // text: qsTrId("props-detail-default_speed_min") - // } - - // TextField{ - // id: default_speed_min_textfield - // } - - - // NativeText { - // //% "Maximum speed [km/h]" - // text: qsTrId("props-detail-default_speed_max") - // } - - // TextField{ - // id: default_speed_max_textfield - // text: default_speed_max - // } - NativeText { //% "Flags" text: qsTrId("props-detail-default_flags") @@ -390,24 +364,6 @@ ApplicationWindow { text: qsTrId("point-detail-altitude-max-checkbox"); onCheckedChanged: updateDefaultFlagsIndex(4, checked); } - Item { - visible: false; - NativeText { text: " " } - CheckBox { - id: speed_min_cb; - //% "Speed min" - text: qsTrId("point-detail-speed-min-checkbox"); - onCheckedChanged: updateDefaultFlagsIndex(5, checked); - } - - NativeText { text: " " } - CheckBox { - id: speed_max_cb; - //% "Speed max" - text: qsTrId("point-detail-speed-max-checkbox"); - onCheckedChanged: updateDefaultFlagsIndex(6, checked); - } - } NativeText { text: " " } diff --git a/TracksList.qml b/TracksList.qml index fcf9d9e..04ff5a9 100644 --- a/TracksList.qml +++ b/TracksList.qml @@ -149,8 +149,6 @@ Rectangle { "computed_angle": c.computed_angle, "computed_distance": c.computed_distance, "radius": c.radius, - "speed_min": c.speed_min, - "speed_max": c.speed_max, "alt_min": c.alt_min, "alt_max": c.alt_max, "ptr": c.ptr, @@ -193,8 +191,6 @@ Rectangle { propsDetail.default_radius = track.default_radius; propsDetail.default_alt_min = track.default_alt_min; propsDetail.default_alt_max = track.default_alt_max; - propsDetail.default_speed_min = track.default_speed_min; - propsDetail.default_speed_max = track.default_speed_max; propsDetail.default_flags = parseInt(track.default_flags, 10); } @@ -222,8 +218,6 @@ Rectangle { "default_radius": propsDetail.default_radius, "default_alt_min": propsDetail.default_alt_min, "default_alt_max": propsDetail.default_alt_max, - "default_speed_min": propsDetail.default_speed_min, - "default_speed_max": propsDetail.default_speed_max, "default_flags": propsDetail.default_flags, } @@ -285,8 +279,6 @@ Rectangle { "radius": item.radius, "computed_angle": item.computed_angle, "computed_distance": item.computed_distance, - "speed_min": item.speed_min, - "speed_max": item.speed_max, "alt_min": item.alt_min, "alt_max": item.alt_max, "ptr": item.ptr, @@ -609,20 +601,6 @@ Rectangle { //visible: false; } - TableViewColumn { - //% "Min Speed [km/h]" - title: qsTrId("tracks-list-speed_min") - role: "speed_min" - width: 50; - visible: false; - } - TableViewColumn { - //% "Max Speed [km/h]" - title: qsTrId("tracks-list-speed_max") - role: "speed_max" - width: 50; - visible: false; - } TableViewColumn { //% "Arc/Poly" title: qsTrId("tracks-list-ptr") @@ -685,8 +663,6 @@ Rectangle { menu_sg_cb.checked = checkedCount[2] > 0; menu_alt_min_cb.checked = checkedCount[3] > 0; menu_alt_max_cb.checked = checkedCount[4] > 0; - menu_speed_min_cb.checked = checkedCount[5] > 0; - menu_speed_max_cb.checked = checkedCount[6] > 0; menu_section_speed_start_cb.checked = checkedCount[7] > 0; menu_section_speed_end_cb.checked = checkedCount[8] > 0; menu_section_alt_start_cb.checked = checkedCount[9] > 0; @@ -703,8 +679,6 @@ Rectangle { menu_sg_cb.enabled = (checkedCount[2] === 0) || (checkedCount[2] === sum); menu_alt_min_cb.enabled = (checkedCount[3] === 0) || (checkedCount[3] === sum); menu_alt_max_cb.enabled = (checkedCount[4] === 0) || (checkedCount[4] === sum); - menu_speed_min_cb.enabled = (checkedCount[5] === 0) || (checkedCount[5] === sum); - menu_speed_max_cb.enabled = (checkedCount[6] === 0) || (checkedCount[6] === sum); menu_section_speed_start_cb.enabled = (checkedCount[7] === 0) || (checkedCount[7] === sum); menu_section_speed_end_cb.enabled = (checkedCount[8] === 0) || (checkedCount[8] === sum); menu_section_alt_start_cb.enabled = (checkedCount[9] === 0) || (checkedCount[9] === sum); @@ -886,7 +860,6 @@ Rectangle { "computed_distance": -1, "angle": -1, "radius": -1, - "speed_min": -1, "speed_max": -1, "alt_min": -1, "alt_max": -1, @@ -981,25 +954,6 @@ Rectangle { text: qsTrId("point-detail-altitude-max-checkbox"); onTriggered: tracksPointTable.switchFlag(4); } - Item { - visible: false; - MenuItem { - id: menu_speed_min_cb - // visible: menu_flags_reset.visible - visible: false; - checkable: true; - text: qsTrId("point-detail-speed-min-checkbox"); - onTriggered: tracksPointTable.switchFlag(5); - } - MenuItem { - id: menu_speed_max_cb - // visible: menu_flags_reset.visible - visible: false; - checkable: true; - text: qsTrId("point-detail-speed-max-checkbox"); - onTriggered: tracksPointTable.switchFlag(6); - } - } MenuItem { id: menu_section_speed_start_cb diff --git a/TracksListTableDelegate.qml b/TracksListTableDelegate.qml index 94ee286..a53211d 100644 --- a/TracksListTableDelegate.qml +++ b/TracksListTableDelegate.qml @@ -210,8 +210,6 @@ Item { break; case "distance": case "radius": - case "speed_min": - case "speed_max": case "alt_min": case "alt_max": case "ptr": @@ -330,12 +328,6 @@ Item { case "radius": show = category_defaults.default_radius; break; - case "speed_min": - show = category_defaults.default_speed_min; - break; - case "speed_max": - show = category_defaults.default_speed_max; - break; case "alt_min": show = category_defaults.default_alt_min; break; @@ -407,14 +399,6 @@ Item { //% "ALT_MAX" strings.push(qsTrId("track-list-delegate-alt_max-short")) } - if (arr[5]) { - //% "SPD_MIN" - strings.push(qsTrId("track-list-delegate-speed_min-short")) - } - if (arr[6]) { - //% "SPD_MAX" - strings.push(qsTrId("track-list-delegate-speed_max-short")) - } if (arr[7]) { //% "sss" diff --git a/editor_defaults.json b/editor_defaults.json index cbaea05..902f3b1 100644 --- a/editor_defaults.json +++ b/editor_defaults.json @@ -8,8 +8,6 @@ "default_alt_min": "0", "default_flags": 3, "default_radius": "225", - "default_speed_max": "300", - "default_speed_min": "50", "gyre_penalty": "100", "marker_max_score": "100", "name": "A-RAL1", @@ -36,8 +34,6 @@ "default_alt_min": "0", "default_flags": 3, "default_radius": "225", - "default_speed_max": "300", - "default_speed_min": "50", "gyre_penalty": "100", "marker_max_score": "100", "name": "A-RAL2", @@ -64,8 +60,6 @@ "default_alt_min": "0", "default_flags": 3, "default_radius": "225", - "default_speed_max": "300", - "default_speed_min": "50", "gyre_penalty": "100", "marker_max_score": "100", "name": "A-RWL1", @@ -92,8 +86,6 @@ "default_alt_min": "0", "default_flags": 3, "default_radius": "225", - "default_speed_max": "300", - "default_speed_min": "50", "gyre_penalty": "100", "marker_max_score": "100", "name": "A-RWL2", @@ -120,8 +112,6 @@ "default_alt_min": "0", "default_flags": 3, "default_radius": "225", - "default_speed_max": "300", - "default_speed_min": "50", "gyre_penalty": "100", "marker_max_score": "100", "name": "A-RGL1", @@ -148,8 +138,6 @@ "default_alt_min": "0", "default_flags": 3, "default_radius": "225", - "default_speed_max": "300", - "default_speed_min": "50", "gyre_penalty": "100", "marker_max_score": "100", "name": "A-RGL2", @@ -176,8 +164,6 @@ "default_alt_min": "0", "default_flags": 3, "default_radius": "225", - "default_speed_max": "300", - "default_speed_min": "50", "gyre_penalty": "100", "marker_max_score": "100", "name": "A-GA1", @@ -204,8 +190,6 @@ "default_alt_min": "0", "default_flags": 3, "default_radius": "225", - "default_speed_max": "300", - "default_speed_min": "50", "gyre_penalty": "100", "marker_max_score": "100", "name": "A-GA2", @@ -232,8 +216,6 @@ "default_alt_min": "0", "default_flags": 3, "default_radius": "525", - "default_speed_max": "300", - "default_speed_min": "50", "gyre_penalty": "50", "marker_max_score": "100", "name": "B-RAL1", @@ -260,8 +242,6 @@ "default_alt_min": "0", "default_flags": 3, "default_radius": "525", - "default_speed_max": "300", - "default_speed_min": "50", "gyre_penalty": "50", "marker_max_score": "100", "name": "B-RAL2", @@ -288,8 +268,6 @@ "default_alt_min": "0", "default_flags": 3, "default_radius": "525", - "default_speed_max": "300", - "default_speed_min": "50", "gyre_penalty": "50", "marker_max_score": "100", "name": "B-RWL1", @@ -316,8 +294,6 @@ "default_alt_min": "0", "default_flags": 3, "default_radius": "525", - "default_speed_max": "300", - "default_speed_min": "50", "gyre_penalty": "50", "marker_max_score": "100", "name": "B-RWL2", @@ -344,8 +320,6 @@ "default_alt_min": "0", "default_flags": 3, "default_radius": "525", - "default_speed_max": "300", - "default_speed_min": "50", "gyre_penalty": "50", "marker_max_score": "100", "name": "B-RGL1", @@ -372,8 +346,6 @@ "default_alt_min": "0", "default_flags": 3, "default_radius": "525", - "default_speed_max": "300", - "default_speed_min": "50", "gyre_penalty": "50", "marker_max_score": "100", "name": "B-RGL2", @@ -400,8 +372,6 @@ "default_alt_min": "0", "default_flags": 3, "default_radius": "525", - "default_speed_max": "300", - "default_speed_min": "50", "gyre_penalty": "50", "marker_max_score": "100", "name": "B-GA1", @@ -428,8 +398,6 @@ "default_alt_min": "0", "default_flags": 3, "default_radius": "525", - "default_speed_max": "300", - "default_speed_min": "50", "gyre_penalty": "50", "marker_max_score": "100", "name": "B-GA2", @@ -456,8 +424,6 @@ "default_alt_min": "0", "default_flags": 3, "default_radius": "525", - "default_speed_max": "300", - "default_speed_min": "50", "gyre_penalty": "50", "marker_max_score": "100", "name": "C-RAL1", @@ -484,8 +450,6 @@ "default_alt_min": "0", "default_flags": 3, "default_radius": "525", - "default_speed_max": "300", - "default_speed_min": "50", "gyre_penalty": "50", "marker_max_score": "100", "name": "C-RAL2", @@ -512,8 +476,6 @@ "default_alt_min": "0", "default_flags": 3, "default_radius": "525", - "default_speed_max": "300", - "default_speed_min": "50", "gyre_penalty": "50", "marker_max_score": "100", "name": "C-RWL1", @@ -540,8 +502,6 @@ "default_alt_min": "0", "default_flags": 3, "default_radius": "525", - "default_speed_max": "300", - "default_speed_min": "50", "gyre_penalty": "50", "marker_max_score": "100", "name": "C-RWL2", @@ -568,8 +528,6 @@ "default_alt_min": "0", "default_flags": 3, "default_radius": "525", - "default_speed_max": "300", - "default_speed_min": "50", "gyre_penalty": "50", "marker_max_score": "100", "name": "C-RGL1", @@ -596,8 +554,6 @@ "default_alt_min": "0", "default_flags": 3, "default_radius": "525", - "default_speed_max": "300", - "default_speed_min": "50", "gyre_penalty": "50", "marker_max_score": "100", "name": "C-RGL2", @@ -624,8 +580,6 @@ "default_alt_min": "0", "default_flags": 3, "default_radius": "525", - "default_speed_max": "300", - "default_speed_min": "50", "gyre_penalty": "50", "marker_max_score": "100", "name": "C-GA1", @@ -652,8 +606,6 @@ "default_alt_min": "0", "default_flags": 3, "default_radius": "525", - "default_speed_max": "300", - "default_speed_min": "50", "gyre_penalty": "50", "marker_max_score": "100", "name": "C-GA2", diff --git a/i18n/editor_cs_CZ.ts b/i18n/editor_cs_CZ.ts index e8e2938..b966ff4 100644 --- a/i18n/editor_cs_CZ.ts +++ b/i18n/editor_cs_CZ.ts @@ -135,55 +135,55 @@ - + Section speed start Začátek úseku měření rychlosti - + Section speed end Konec úseku měření rychlosti - + Section alt start Začátek úseku měření výšky - + Section alt end Konec úseku měření výšky - + Section space start Začátek úseku měření koridoru - + Section space end Konec úseku měření koridoru - + Secret Turn Point Tajný otočný bod - + Secret Time Gate Tajná časová brána - + Secret Space Gate Secret Time Gate Tajná prostorová brána @@ -368,37 +368,35 @@ By installing, copying or other use of Software User declares he/she has read th - + Altitude min Minimální výška - + Altitude max Maximální výška - Speed min Minimální rychlost - Speed max Maximální rychlost - + Turn Point Otočný bod - + Time gate Časová brána @@ -606,17 +604,17 @@ By installing, copying or other use of Software User declares he/she has read th Nelze načíst výchozí hodnoty - + speed rychlost - + altitude výška - + space prostor @@ -776,177 +774,167 @@ By installing, copying or other use of Software User declares he/she has read th Tratě - + None Žádný - + Line Přímka - + Mid-point Arc A Mid-point Arc Oblouk A - + Mid-point Arc B Edge-point Arc Oblouk B - + Polyline Křivka - + Preferences Nastavení - + Statistics Statistika - + Id Id - + Point Bod - + Type Typ - + Angle [deg] Angle Úhel [st] - + Distance to previous point [m] Distance to next point [m] Vzdálenost k předcházejícímu bodu [m] - + Distance to start point [m] Vzdálenost k VBT [m] - + Time to next point [s] Additional Time [s] Čas dodatečný k následujícímu bodu [s] - + Radius [m] Radius Poloměr [m] - + Flags Atributy - + Min Alt [m] Min Alt Minimální výška [m] - + Max Alt [m] Max Alt Maximální výška [m] - - - Min Speed [km/h] - Minimální rychlost [km/h] - - - - Max Speed [km/h] - Maximální rychlost [km/h] - - + Arc/Poly Oblouk/Křivka - + Add point before selected Přidat bod před vybraný - + Add point after selected Přidat bod za vybraný - + Add point Přidat bod - + Append 10 points Add 10 points Na konec vložit 10 bodů - + Remove point Odstranit bod - + Reset flags Obnovit atributy - + Space gate Prostorová brána - + Id Id - + Polygon Polygon - + Score Body - + Add polygon Přidat polygon - + Remove polygon Odstranit polygon @@ -985,88 +973,78 @@ By installing, copying or other use of Software User declares he/she has read th Ok - + Cancel &Cancel Zrušit - + SG PB - + ALT_MIN MIN_VYS - + ALT_MAX MAX_VYS - - - SPD_MIN - MIN_RYCH - - - - SPD_MAX - MAX_RYCH - - + sss rych_z - + sse rych_k - + sas výš_z - + sae výš_k - + sws kor_z - + swe kor_k - + sec_sg S_PB - + TP OB - + TG ČB - + sec_tp S_OB - + sec_tg S_ČB diff --git a/i18n/editor_en_US.ts b/i18n/editor_en_US.ts index 6755638..bdd6fa2 100644 --- a/i18n/editor_en_US.ts +++ b/i18n/editor_en_US.ts @@ -135,55 +135,55 @@ - + Section speed start Section speed start - + Section speed end Section speed end - + Section alt start Section alt start - + Section alt end Section alt end - + Section space start Section space start - + Section space end Section space end - + Secret Turn Point Secret Turn Point - + Secret Time Gate Secret Time Gate - + Secret Space Gate Secret Time Gate Secret Space Gate @@ -367,37 +367,35 @@ By installing, copying or other use of Software User declares he/she has read th - + Altitude min Altitude min - + Altitude max Altitude max - Speed min Speed min - Speed max Speed max - + Turn Point Turn Point - + Time gate Time Gate @@ -605,17 +603,17 @@ By installing, copying or other use of Software User declares he/she has read th Cannot load defaults - + speed speed - + altitude altitude - + space space @@ -773,177 +771,167 @@ By installing, copying or other use of Software User declares he/she has read th Tracks - + None None - + Line Line - + Mid-point Arc A Mid-point Arc Mid-point Arc A - + Mid-point Arc B Edge-point Arc Mid-point Arc B - + Polyline Polyline - + Preferences Preferences - + Statistics Statistics - + Id Id - + Point Point - + Type Type - + Angle [deg] Angle Angle [deg] - + Distance to previous point [m] Distance to next point [m] Distance to previous point [m] - + Distance to start point [m] Distance to start point [m] - + Time to next point [s] Additional Time [s] Time to next point [s] - + Radius [m] Radius Radius [m] - + Flags Flags - + Min Alt [m] Min Alt Min Alt [m] - + Max Alt [m] Max Alt Max Alt [m] - - - Min Speed [km/h] - Min Speed [km/h] - - - - Max Speed [km/h] - Max Speed [km/h] - - + Arc/Poly Arc/Poly - + Add point before selected Add point before selected - + Add point after selected Add point after selected - + Add point Add point - + Append 10 points Add 10 points Append 10 points - + Remove point Remove point - + Reset flags Reset flags - + Space gate Space gate - + Id Id - + Polygon Polygon - + Score Score - + Add polygon Add polygon - + Remove polygon Remove polygon @@ -982,90 +970,80 @@ By installing, copying or other use of Software User declares he/she has read th Ok - + Cancel &Cancel Cancel - + SG space gate SG - + ALT_MIN ALT_MIN - + ALT_MAX ALT_MAX - - - SPD_MIN - SPD_MIN - - - - SPD_MAX - SPD_MAX - - + sss sss - + sse sse - + sas sas - + sae sae - + sws sws - + swe swe - + sec_sg sec_sg - + TP TP - + TG TG - + sec_tp secret turn point short sec_tp - + sec_tg secret time gate short sec_tg diff --git a/main.qml b/main.qml index 7ea4526..93df677 100644 --- a/main.qml +++ b/main.qml @@ -1373,8 +1373,6 @@ ApplicationWindow { str += "\"" + ((c.radius < 0) ? trk.default_radius : c.radius) + "\";"; str += "\"" + ((c.alt_max < 0) ? trk.default_alt_max : c.alt_max) + "\";"; str += "\"" + ((c.alt_min < 0) ? trk.default_alt_min : c.alt_min) + "\";"; - str += "\"" + ((c.speed_max < 0) ? trk.default_speed_max : c.speed_max) + "\";"; - str += "\"" + ((c.speed_min < 0) ? trk.default_speed_min : c.speed_min) + "\";"; str += "\"" + F.addSlashes(pt.name) + "\";"; }