Mirror/inav-configurator
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav-configurator.git synced 2025-07-26 01:35:23 +03:00
Code Wiki Activity

Reset element to 0,0 if not visible in preview when enabled

Browse source
This commit is contained in:
Geoff Sim 2021-12-13 21:56:00 +00:00
parent c5be5f5226
commit 61c96bf628
1 changed files with 54 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

82
tabs/osd.js
View file

@ -136,9 +136,7 @@ FONT.constants = {
MAX_NVM_FONT_CHAR_FIELD_SIZE: 64, MAX_NVM_FONT_CHAR_FIELD_SIZE: 64,
CHAR_HEIGHT: 18, CHAR_HEIGHT: 18,
CHAR_WIDTH: 12, CHAR_WIDTH: 12,
LINE: 30, LINE: 30
/** maximum line size (used to calculate OSD element positions) */
MAXLINE: 50
}, },
COLORS: { COLORS: {
// black // black
@ -456,7 +454,6 @@ OSD.initData = function () {
item_count: 0, item_count: 0,
items: [], items: [],
groups: {}, groups: {},
display_items: [],
preview: [], preview: [],
isDjiHdFpv: false isDjiHdFpv: false
}; };
@ -2013,21 +2010,39 @@ OSD.updateDisplaySize = function () {
if (video_type == 'AUTO') { if (video_type == 'AUTO') {
video_type = 'PAL'; video_type = 'PAL';
} }
// save the original OSD element positions.
var origPos = [];
for (var ii = 0; ii < OSD.data.items.length; ii++) {
origPos.push(OSD.msp.helpers.pack.position(OSD.data.items[ii]));
}
// save the new video type and cols per line
FONT.constants.SIZES.LINE = OSD.constants.VIDEO_COLS[video_type]; FONT.constants.SIZES.LINE = OSD.constants.VIDEO_COLS[video_type];
// compute the size
OSD.data.display_size = {
x: OSD.constants.VIDEO_COLS[video_type],
y: OSD.constants.VIDEO_LINES[video_type],
total: null
};
OSD.constants.VIDEO_TYPES[OSD.data.video_system] = video_type; OSD.constants.VIDEO_TYPES[OSD.data.video_system] = video_type;
// set the new display size
OSD.data.display_size = {
x: FONT.constants.SIZES.LINE,
y: OSD.constants.VIDEO_LINES[video_type],
total: OSD.constants.VIDEO_BUFFER_CHARS[video_type]
};
// recalculate the OSD element positions for the new cols per line
for (var ii = 0; ii < OSD.data.items.length; ii++) {
var item = OSD.msp.helpers.unpack.position(origPos[ii]);
// do not recalculate anything not visible or outside of the screen
if (item.isVisible && item.x < OSD.data.display_size.x && item.y < OSD.data.display_size.y) {
OSD.data.items[ii] = item;
}
}
// set the preview size
$('.third_left').toggleClass('preview_hd_side', (video_type == 'HD')) $('.third_left').toggleClass('preview_hd_side', (video_type == 'HD'))
$('.preview').toggleClass('preview_hd', (video_type == 'HD')) $('.preview').toggleClass('preview_hd cut43_left', (video_type == 'HD'))
$('.third_right').toggleClass('preview_hd_side', (video_type == 'HD')) $('.third_right').toggleClass('preview_hd_side', (video_type == 'HD'))
$('.left_43_margin').toggleClass('hd_43_left', (video_type == 'HD'))
$('.right_43_margin').toggleClass('hd_43_right', (video_type == 'HD'))
}; };
OSD.saveAlarms = function(callback) { OSD.saveAlarms = function(callback) {
@ -2051,7 +2066,7 @@ OSD.saveItem = function(item, callback) {
//noinspection JSUnusedLocalSymbols //noinspection JSUnusedLocalSymbols
OSD.msp = { OSD.msp = {
/** /**
* Note, unsigned 16 bit int for position ispacked: * Unsigned 16 bit int for position is packed:
* 0: unused * 0: unused
* v: visible flag * v: visible flag
* b: blink flag * b: blink flag
@ -2063,15 +2078,27 @@ OSD.msp = {
unpack: { unpack: {
position: function (bits) { position: function (bits) {
var display_item = {}; var display_item = {};
// size * y + x display_item.x = bits & 0x3F;
display_item.position = FONT.constants.SIZES.MAXLINE * ((bits >> 6) & 0x003F) + (bits & 0x003F); display_item.y = (bits >> 6) & 0x3F;
//display_item.x = (bits & 0x3F) % OSD.data.display_size.x;
//display_item.y = ((bits >> 6) & 0x3F) % OSD.data.display_size.y;
display_item.position = (display_item.y) * FONT.constants.SIZES.LINE + (display_item.x);
display_item.isVisible = (bits & OSD.constants.VISIBLE) != 0; display_item.isVisible = (bits & OSD.constants.VISIBLE) != 0;
return display_item; return display_item;
} }
}, },
calculate: {
coords: function(display_item) {
display_item.x = (display_item.position % FONT.constants.SIZES.LINE) & 0x3F;
display_item.y = (display_item.position / FONT.constants.SIZES.LINE) & 0x3F;
return display_item;
}
},
pack: { pack: {
position: function (display_item) { position: function (display_item) {
return (display_item.isVisible ? 0x2000 : 0) | (((display_item.position / FONT.constants.SIZES.MAXLINE) & 0x003F) << 6) | (display_item.position % FONT.constants.SIZES.MAXLINE); return (display_item.isVisible ? 0x2000 : 0)
| ((display_item.y & 0x3F) << 6) | (display_item.x & 0x3F);
} }
} }
}, },
@ -2455,8 +2482,8 @@ OSD.GUI.updateFields = function() {
// Ensure the element is inside the viewport, at least partially. // Ensure the element is inside the viewport, at least partially.
// In that case move it to the very first row/col, otherwise there's // In that case move it to the very first row/col, otherwise there's
// no way to reposition items that are outside the viewport. // no way to reposition items that are outside the viewport.
if (itemData.position >= OSD.data.preview.length) { if (itemData.x > OSD.data.display_size.x || itemData.y > OSD.data.display_size.y) {
itemData.position = 0; itemData.x = itemData.y = itemData.position = 0;
} }
$position.show(); $position.show();
} else { } else {
@ -2477,6 +2504,7 @@ OSD.GUI.updateFields = function() {
var item = $(this).data('item'); var item = $(this).data('item');
var itemData = OSD.data.items[item.id]; var itemData = OSD.data.items[item.id];
itemData.position = parseInt($(this).val()); itemData.position = parseInt($(this).val());
OSD.msp.helpers.calculate.coords(itemData);
OSD.GUI.saveItem(item); OSD.GUI.saveItem(item);
})) }))
); );
@ -2593,14 +2621,6 @@ OSD.GUI.updateMapPreview = function(mapCenter, name, directionSymbol, centerSymb
OSD.GUI.updatePreviews = function() { OSD.GUI.updatePreviews = function() {
// buffer the preview; // buffer the preview;
OSD.data.preview = []; OSD.data.preview = [];
OSD.data.display_size.total = OSD.data.display_size.x * OSD.data.display_size.y;
for (var ii = 0; ii < OSD.data.display_items.length; ii++) {
var field = OSD.data.display_items[ii];
// reset fields that somehow end up off the screen
if (field.position > OSD.data.display_size.total) {
field.position = 0;
}
}
// clear the buffer // clear the buffer
for (i = 0; i < OSD.data.display_size.total; i++) { for (i = 0; i < OSD.data.display_size.total; i++) {
@ -2617,6 +2637,12 @@ OSD.GUI.updatePreviews = function() {
if (!itemData.isVisible) { if (!itemData.isVisible) {
continue; continue;
} }
if (itemData.x >= OSD.data.display_size.x)
{
continue;
}
// DJI HD FPV: Hide elements that only appear in craft name // DJI HD FPV: Hide elements that only appear in craft name
if (OSD.DjiElements.craftNameElements.includes(item.name) && if (OSD.DjiElements.craftNameElements.includes(item.name) &&
$('#djiUnsupportedElements').find('input').is(':checked')) { $('#djiUnsupportedElements').find('input').is(':checked')) {