speedybac
/
inav-configurator
mirror of https://github.com/iNavFlight/inav-configurator
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #534 from iNavFlight/agh_fix_map_previews

Browse Source 
Fix map center location in the OSD preview
pull/537/head
Alberto García Hierro 6 years ago committed by GitHub
parent 8e823748f4 c523846b70
commit c5bcb9fb7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File

15
tabs/osd.js
Unescape Escape View File

@ -1677,14 +1677,14 @@ OSD.GUI.updateFields = function() {
GUI.switchery(); GUI.switchery();
}; };
OSD.GUI.updateMapPreview = function(centerishPosition, name, directionSymbol, centerSymbol) { OSD.GUI.updateMapPreview = function(mapCenter, name, directionSymbol, centerSymbol) {
if ($('input[name="' + name + '"]').prop('checked')) { if ($('input[name="' + name + '"]').prop('checked')) {
var mapInitialX = OSD.data.display_size.x - 2; var mapInitialX = OSD.data.display_size.x - 2;
if (directionSymbol) { if (directionSymbol) {
OSD.GUI.checkAndProcessSymbolPosition(mapInitialX, SYM.DIRECTION); OSD.GUI.checkAndProcessSymbolPosition(mapInitialX, SYM.DIRECTION);
OSD.GUI.checkAndProcessSymbolPosition(mapInitialX + OSD.data.display_size.x, directionSymbol.charCodeAt(0)); OSD.GUI.checkAndProcessSymbolPosition(mapInitialX + OSD.data.display_size.x, directionSymbol.charCodeAt(0));
} }
OSD.GUI.checkAndProcessSymbolPosition(centerishPosition, centerSymbol); OSD.GUI.checkAndProcessSymbolPosition(mapCenter, centerSymbol);
var scalePos = 1 + OSD.data.display_size.x * (OSD.data.display_size.y - 2); var scalePos = 1 + OSD.data.display_size.x * (OSD.data.display_size.y - 2);
OSD.GUI.checkAndProcessSymbolPosition(scalePos, SYM.SCALE); OSD.GUI.checkAndProcessSymbolPosition(scalePos, SYM.SCALE);
var scale; var scale;
@ -1803,9 +1803,14 @@ OSD.GUI.updatePreviews = function() {
OSD.GUI.checkAndProcessSymbolPosition(centerishPosition + hudwidth - 1, SYM.AH_RIGHT); OSD.GUI.checkAndProcessSymbolPosition(centerishPosition + hudwidth - 1, SYM.AH_RIGHT);
} }
OSD.GUI.updateMapPreview(centerishPosition, 'MAP_NORTH', 'N', SYM.HOME); var mapCenter = (OSD.data.display_size.x * OSD.data.display_size.y / 2);
OSD.GUI.updateMapPreview(centerishPosition, 'MAP_TAKEOFF', 'T', SYM.HOME); if (OSD.data.display_size.y % 2 == 0) {
OSD.GUI.updateMapPreview(centerishPosition, 'RADAR', null, SYM.DIR_TO_HOME); mapCenter += OSD.data.display_size.x / 2;
}
console.log(OSD.data.display_size.x * OSD.data.display_size.y, mapCenter);
OSD.GUI.updateMapPreview(mapCenter, 'MAP_NORTH', 'N', SYM.HOME);
OSD.GUI.updateMapPreview(mapCenter, 'MAP_TAKEOFF', 'T', SYM.HOME);
OSD.GUI.updateMapPreview(mapCenter, 'RADAR', null, SYM.DIR_TO_HOME);
// render // render
var $preview = $('.display-layout .preview').empty(); var $preview = $('.display-layout .preview').empty();

Write Preview
Loading…
Cancel
Save