Skip to content

Commit

Permalink
remove strange speed_min/speed_max feature
Browse files Browse the repository at this point in the history
  • Loading branch information
@jmlich
jmlich committed Jun 5, 2020
1 parent 37c570c commit 4237154
Show file tree
Hide file tree
Showing 8 changed files with 124 additions and 328 deletions.
4 changes: 0 additions & 4 deletions CloneDialog.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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,
}

Expand Down
44 changes: 0 additions & 44 deletions PropertiesDetail.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand All @@ -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];
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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: " " }
Expand Down
46 changes: 0 additions & 46 deletions TracksList.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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);

}
Expand Down Expand Up @@ -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,
}

Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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;
Expand All @@ -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);
Expand Down Expand Up @@ -886,7 +860,6 @@ Rectangle {
"computed_distance": -1,
"angle": -1,
"radius": -1,
"speed_min": -1,
"speed_max": -1,
"alt_min": -1,
"alt_max": -1,
Expand Down Expand Up @@ -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
Expand Down
16 changes: 0 additions & 16 deletions TracksListTableDelegate.qml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,8 +210,6 @@ Item {
break;
case "distance":
case "radius":
case "speed_min":
case "speed_max":
case "alt_min":
case "alt_max":
case "ptr":
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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"
Expand Down
Loading

0 comments on commit 4237154

Please sign in to comment.