1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-24 00:35:26 +03:00

Add not linear elements to OSD

This commit is contained in:
Miguel Angel Mulero Martinez 2018-04-03 09:33:32 +02:00
parent c08a8da011
commit 5c15f9cbe8

View file

@ -1,6 +1,7 @@
'use strict'; 'use strict';
var SYM = SYM || {}; var SYM = SYM || {};
SYM.BLANK = 0x20;
SYM.VOLT = 0x06; SYM.VOLT = 0x06;
SYM.RSSI = 0x01; SYM.RSSI = 0x01;
SYM.AH_RIGHT = 0x02; SYM.AH_RIGHT = 0x02;
@ -461,6 +462,7 @@ OSD.constants = {
name: 'MAIN_BATT_VOLTAGE', name: 'MAIN_BATT_VOLTAGE',
desc: 'osdDescElementMainBattVoltage', desc: 'osdDescElementMainBattVoltage',
default_position: -29, default_position: -29,
draw_order: 20,
positionable: true, positionable: true,
preview: FONT.symbol(SYM.BATTERY) + '16.8' + FONT.symbol(SYM.VOLT) preview: FONT.symbol(SYM.BATTERY) + '16.8' + FONT.symbol(SYM.VOLT)
}, },
@ -468,6 +470,7 @@ OSD.constants = {
name: 'RSSI_VALUE', name: 'RSSI_VALUE',
desc: 'osdDescElementRssiValue', desc: 'osdDescElementRssiValue',
default_position: -59, default_position: -59,
draw_order: 30,
positionable: true, positionable: true,
preview: FONT.symbol(SYM.RSSI) + '99' preview: FONT.symbol(SYM.RSSI) + '99'
}, },
@ -481,6 +484,7 @@ OSD.constants = {
name: 'THROTTLE_POSITION', name: 'THROTTLE_POSITION',
desc: 'osdDescElementThrottlePosition', desc: 'osdDescElementThrottlePosition',
default_position: -9, default_position: -9,
draw_order: 110,
positionable: true, positionable: true,
preview: FONT.symbol(SYM.THR) + FONT.symbol(SYM.THR1) + '69' preview: FONT.symbol(SYM.THR) + FONT.symbol(SYM.THR1) + '69'
}, },
@ -493,6 +497,7 @@ OSD.constants = {
VTX_CHANNEL: { VTX_CHANNEL: {
name: 'VTX_CHANNEL', name: 'VTX_CHANNEL',
default_position: 1, default_position: 1,
draw_order: 120,
positionable: true, positionable: true,
preview: 'R:2:1' preview: 'R:2:1'
}, },
@ -513,31 +518,88 @@ OSD.constants = {
name: 'DISARMED', name: 'DISARMED',
desc: 'osdDescElementDisarmed', desc: 'osdDescElementDisarmed',
default_position: -109, default_position: -109,
draw_order: 280,
positionable: true, positionable: true,
preview: 'DISARMED' preview: 'DISARMED'
}, },
CROSSHAIRS: { CROSSHAIRS: {
name: 'CROSSHAIRS', name: 'CROSSHAIRS',
desc: 'osdDescElementCrosshairs', desc: 'osdDescElementCrosshairs',
default_position: -1, default_position: 193,
positionable: false draw_order: 40,
positionable: function() {
return semver.gte(CONFIG.apiVersion, "1.38.0") ? true : false;
},
preview: FONT.symbol(SYM.AH_CENTER_LINE) + FONT.symbol(SYM.AH_CENTER) + FONT.symbol(SYM.AH_CENTER_LINE_RIGHT)
}, },
ARTIFICIAL_HORIZON: { ARTIFICIAL_HORIZON: {
name: 'ARTIFICIAL_HORIZON', name: 'ARTIFICIAL_HORIZON',
desc: 'osdDescElementArtificialHorizon', desc: 'osdDescElementArtificialHorizon',
default_position: -1, default_position: 194,
positionable: false draw_order: 10,
positionable: function() {
return semver.gte(CONFIG.apiVersion, "1.38.0") ? true : false;
},
preview: function() {
var artificialHorizon = new Array();
for (var j = 1; j < 8; j++) {
for (var i = -4; i <= 4; i++) {
var element;
// Blank char to mark the size of the element
if (j != 4) {
element = {x: i, y : j, sym : SYM.BLANK};
// Sample of horizon
} else {
element = {x: i, y : j, sym : SYM.AH_BAR9_0 + 4};
}
artificialHorizon.push(element);
}
}
return artificialHorizon;
}
}, },
HORIZON_SIDEBARS: { HORIZON_SIDEBARS: {
name: 'HORIZON_SIDEBARS', name: 'HORIZON_SIDEBARS',
desc: 'osdDescElementHorizonSidebars', desc: 'osdDescElementHorizonSidebars',
default_position: -1, default_position: 194,
positionable: false draw_order: 50,
positionable: function() {
return semver.gte(CONFIG.apiVersion, "1.38.0") ? true : false;
},
preview: function(fieldPosition) {
var horizonSidebar = new Array();
var hudwidth = OSD.constants.AHISIDEBARWIDTHPOSITION;
var hudheight = OSD.constants.AHISIDEBARHEIGHTPOSITION;
for (var i = -hudheight; i <= hudheight; i++) {
var element = {x: -hudwidth, y : i, sym : SYM.AH_DECORATION};
horizonSidebar.push(element);
element = {x: hudwidth, y : i, sym : SYM.AH_DECORATION};
horizonSidebar.push(element);
}
// AH level indicators
var element = {x: -hudwidth + 1, y : 0, sym : SYM.AH_LEFT};
horizonSidebar.push(element);
element = {x: hudwidth - 1, y : 0, sym : SYM.AH_RIGHT};
horizonSidebar.push(element);
return horizonSidebar;
}
}, },
CURRENT_DRAW: { CURRENT_DRAW: {
name: 'CURRENT_DRAW', name: 'CURRENT_DRAW',
desc: 'osdDescElementCurrentDraw', desc: 'osdDescElementCurrentDraw',
default_position: -23, default_position: -23,
draw_order: 130,
positionable: true, positionable: true,
preview: function() { preview: function() {
return semver.gte(CONFIG.apiVersion, "1.36.0") ? ' 42.00' + FONT.symbol(SYM.AMP) : FONT.symbol(SYM.AMP) + '42.0'; return semver.gte(CONFIG.apiVersion, "1.36.0") ? ' 42.00' + FONT.symbol(SYM.AMP) : FONT.symbol(SYM.AMP) + '42.0';
@ -547,6 +609,7 @@ OSD.constants = {
name: 'MAH_DRAWN', name: 'MAH_DRAWN',
desc: 'osdDescElementMahDrawn', desc: 'osdDescElementMahDrawn',
default_position: -18, default_position: -18,
draw_order: 140,
positionable: true, positionable: true,
preview: function() { preview: function() {
return semver.gte(CONFIG.apiVersion, "1.36.0") ? ' 690' + FONT.symbol(SYM.MAH) : FONT.symbol(SYM.MAH) + '690'; return semver.gte(CONFIG.apiVersion, "1.36.0") ? ' 690' + FONT.symbol(SYM.MAH) : FONT.symbol(SYM.MAH) + '690';
@ -556,6 +619,7 @@ OSD.constants = {
name: 'CRAFT_NAME', name: 'CRAFT_NAME',
desc: 'osdDescElementCraftName', desc: 'osdDescElementCraftName',
default_position: -77, default_position: -77,
draw_order: 150,
positionable: true, positionable: true,
preview: function(osd_data) { preview: function(osd_data) {
return OSD.generateCraftName(osd_data, 1); return OSD.generateCraftName(osd_data, 1);
@ -565,6 +629,7 @@ OSD.constants = {
name: 'ALTITUDE', name: 'ALTITUDE',
desc: 'osdDescElementAltitude', desc: 'osdDescElementAltitude',
default_position: 62, default_position: 62,
draw_order: 160,
positionable: true, positionable: true,
preview: function(osd_data) { preview: function(osd_data) {
return '399.7' + FONT.symbol(osd_data.unit_mode === 0 ? SYM.FEET : SYM.METRE) return '399.7' + FONT.symbol(osd_data.unit_mode === 0 ? SYM.FEET : SYM.METRE)
@ -588,6 +653,7 @@ OSD.constants = {
name: 'FLYMODE', name: 'FLYMODE',
desc: 'osdDescElementFlyMode', desc: 'osdDescElementFlyMode',
default_position: -1, default_position: -1,
draw_order: 90,
positionable: true, positionable: true,
preview: 'STAB' preview: 'STAB'
}, },
@ -595,6 +661,7 @@ OSD.constants = {
name: 'GPS_SPEED', name: 'GPS_SPEED',
desc: 'osdDescElementGPSSpeed', desc: 'osdDescElementGPSSpeed',
default_position: -1, default_position: -1,
draw_order: 330,
positionable: true, positionable: true,
preview: ' 40K' preview: ' 40K'
}, },
@ -602,6 +669,7 @@ OSD.constants = {
name: 'GPS_SATS', name: 'GPS_SATS',
desc: 'osdDescElementGPSSats', desc: 'osdDescElementGPSSats',
default_position: -1, default_position: -1,
draw_order: 320,
positionable: true, positionable: true,
preview: FONT.symbol(SYM.GPS_SAT_L) + FONT.symbol(SYM.GPS_SAT_R) + '14' preview: FONT.symbol(SYM.GPS_SAT_L) + FONT.symbol(SYM.GPS_SAT_R) + '14'
}, },
@ -609,6 +677,7 @@ OSD.constants = {
name: 'GPS_LON', name: 'GPS_LON',
desc: 'osdDescElementGPSLon', desc: 'osdDescElementGPSLon',
default_position: -1, default_position: -1,
draw_order: 350,
positionable: true, positionable: true,
preview: FONT.symbol(SYM.ARROW_SOUTH) + '00.00000000' preview: FONT.symbol(SYM.ARROW_SOUTH) + '00.00000000'
}, },
@ -616,6 +685,7 @@ OSD.constants = {
name: 'GPS_LAT', name: 'GPS_LAT',
desc: 'osdDescElementGPSLat', desc: 'osdDescElementGPSLat',
default_position: -1, default_position: -1,
draw_order: 340,
positionable: true, positionable: true,
preview: FONT.symbol(SYM.ARROW_EAST) + '00.00000000' preview: FONT.symbol(SYM.ARROW_EAST) + '00.00000000'
}, },
@ -623,6 +693,7 @@ OSD.constants = {
name: 'DEBUG', name: 'DEBUG',
desc: 'osdDescElementDebug', desc: 'osdDescElementDebug',
default_position: -1, default_position: -1,
draw_order: 240,
positionable: true, positionable: true,
preview: 'DBG 0 0 0 0' preview: 'DBG 0 0 0 0'
}, },
@ -630,6 +701,7 @@ OSD.constants = {
name: 'PID_ROLL', name: 'PID_ROLL',
desc: 'osdDescElementPIDRoll', desc: 'osdDescElementPIDRoll',
default_position: 0x800 | (10 << 5) | 2, // 0x0800 | (y << 5) | x default_position: 0x800 | (10 << 5) | 2, // 0x0800 | (y << 5) | x
draw_order: 170,
positionable: true, positionable: true,
preview: 'ROL 43 40 20' preview: 'ROL 43 40 20'
}, },
@ -637,6 +709,7 @@ OSD.constants = {
name: 'PID_PITCH', name: 'PID_PITCH',
desc: 'osdDescElementPIDPitch', desc: 'osdDescElementPIDPitch',
default_position: 0x800 | (11 << 5) | 2, // 0x0800 | (y << 5) | x default_position: 0x800 | (11 << 5) | 2, // 0x0800 | (y << 5) | x
draw_order: 180,
positionable: true, positionable: true,
preview: 'PIT 58 50 22' preview: 'PIT 58 50 22'
}, },
@ -644,6 +717,7 @@ OSD.constants = {
name: 'PID_YAW', name: 'PID_YAW',
desc: 'osdDescElementPIDYaw', desc: 'osdDescElementPIDYaw',
default_position: 0x800 | (12 << 5) | 2, // 0x0800 | (y << 5) | x default_position: 0x800 | (12 << 5) | 2, // 0x0800 | (y << 5) | x
draw_order: 190,
positionable: true, positionable: true,
preview: 'YAW 70 45 20' preview: 'YAW 70 45 20'
}, },
@ -651,6 +725,7 @@ OSD.constants = {
name: 'POWER', name: 'POWER',
desc: 'osdDescElementPower', desc: 'osdDescElementPower',
default_position: (15 << 5) | 2, default_position: (15 << 5) | 2,
draw_order: 200,
positionable: true, positionable: true,
preview: function() { preview: function() {
return semver.gte(CONFIG.apiVersion, "1.36.0") ? ' 142W' : '142W'; return semver.gte(CONFIG.apiVersion, "1.36.0") ? ' 142W' : '142W';
@ -660,6 +735,7 @@ OSD.constants = {
name: 'PID_RATE_PROFILE', name: 'PID_RATE_PROFILE',
desc: 'osdDescElementPIDRateProfile', desc: 'osdDescElementPIDRateProfile',
default_position: 0x800 | (13 << 5) | 2, // 0x0800 | (y << 5) | x default_position: 0x800 | (13 << 5) | 2, // 0x0800 | (y << 5) | x
draw_order: 210,
positionable: true, positionable: true,
preview: '1-2' preview: '1-2'
}, },
@ -674,6 +750,7 @@ OSD.constants = {
name: 'AVG_CELL_VOLTAGE', name: 'AVG_CELL_VOLTAGE',
desc: 'osdDescElementAvgCellVoltage', desc: 'osdDescElementAvgCellVoltage',
default_position: 12 << 5, default_position: 12 << 5,
draw_order: 230,
positionable: true, positionable: true,
preview: FONT.symbol(SYM.BATTERY) + '3.98' + FONT.symbol(SYM.VOLT) preview: FONT.symbol(SYM.BATTERY) + '3.98' + FONT.symbol(SYM.VOLT)
}, },
@ -681,6 +758,7 @@ OSD.constants = {
name: 'PITCH_ANGLE', name: 'PITCH_ANGLE',
desc: 'osdDescElementPitchAngle', desc: 'osdDescElementPitchAngle',
default_position: -1, default_position: -1,
draw_order: 250,
positionable: true, positionable: true,
preview: '-00.0' preview: '-00.0'
}, },
@ -688,6 +766,7 @@ OSD.constants = {
name: 'ROLL_ANGLE', name: 'ROLL_ANGLE',
desc: 'osdDescElementRollAngle', desc: 'osdDescElementRollAngle',
default_position: -1, default_position: -1,
draw_order: 260,
positionable: true, positionable: true,
preview: '-00.0' preview: '-00.0'
}, },
@ -695,6 +774,7 @@ OSD.constants = {
name: 'MAIN_BATT_USAGE', name: 'MAIN_BATT_USAGE',
desc: 'osdDescElementMainBattUsage', desc: 'osdDescElementMainBattUsage',
default_position: -17, default_position: -17,
draw_order: 270,
positionable: true, positionable: true,
preview: FONT.symbol(SYM.PB_START) + FONT.symbol(SYM.PB_FULL) + FONT.symbol(SYM.PB_FULL) + FONT.symbol(SYM.PB_FULL) + FONT.symbol(SYM.PB_FULL) + FONT.symbol(SYM.PB_FULL) + FONT.symbol(SYM.PB_FULL) + FONT.symbol(SYM.PB_FULL) + FONT.symbol(SYM.PB_FULL) + FONT.symbol(SYM.PB_FULL) + FONT.symbol(SYM.PB_END) + FONT.symbol(SYM.PB_EMPTY) + FONT.symbol(SYM.PB_CLOSE) preview: FONT.symbol(SYM.PB_START) + FONT.symbol(SYM.PB_FULL) + FONT.symbol(SYM.PB_FULL) + FONT.symbol(SYM.PB_FULL) + FONT.symbol(SYM.PB_FULL) + FONT.symbol(SYM.PB_FULL) + FONT.symbol(SYM.PB_FULL) + FONT.symbol(SYM.PB_FULL) + FONT.symbol(SYM.PB_FULL) + FONT.symbol(SYM.PB_FULL) + FONT.symbol(SYM.PB_END) + FONT.symbol(SYM.PB_EMPTY) + FONT.symbol(SYM.PB_CLOSE)
}, },
@ -709,6 +789,7 @@ OSD.constants = {
name: 'HOME_DIRECTION', name: 'HOME_DIRECTION',
desc: 'osdDescElementHomeDirection', desc: 'osdDescElementHomeDirection',
default_position: -1, default_position: -1,
draw_order: 370,
positionable: true, positionable: true,
preview: FONT.symbol(SYM.ARROW_SOUTH + 2) preview: FONT.symbol(SYM.ARROW_SOUTH + 2)
}, },
@ -716,6 +797,7 @@ OSD.constants = {
name: 'HOME_DISTANCE', name: 'HOME_DISTANCE',
desc: 'osdDescElementHomeDistance', desc: 'osdDescElementHomeDistance',
default_position: -1, default_position: -1,
draw_order: 360,
positionable: true, positionable: true,
preview: function(osd_data) { preview: function(osd_data) {
return '43' + FONT.symbol(osd_data.unit_mode === 0 ? SYM.FEET : SYM.METRE) return '43' + FONT.symbol(osd_data.unit_mode === 0 ? SYM.FEET : SYM.METRE)
@ -725,6 +807,7 @@ OSD.constants = {
name: 'NUMERICAL_HEADING', name: 'NUMERICAL_HEADING',
desc: 'osdDescElementNumericalHeading', desc: 'osdDescElementNumericalHeading',
default_position: -1, default_position: -1,
draw_order: 290,
positionable: true, positionable: true,
preview: FONT.symbol(SYM.ARROW_EAST) + '90' preview: FONT.symbol(SYM.ARROW_EAST) + '90'
}, },
@ -732,6 +815,7 @@ OSD.constants = {
name: 'NUMERICAL_VARIO', name: 'NUMERICAL_VARIO',
desc: 'osdDescElementNumericalVario', desc: 'osdDescElementNumericalVario',
default_position: -1, default_position: -1,
draw_order: 300,
positionable: true, positionable: true,
preview: FONT.symbol(SYM.ARROW_NORTH) + '8.7' preview: FONT.symbol(SYM.ARROW_NORTH) + '8.7'
}, },
@ -739,6 +823,7 @@ OSD.constants = {
name: 'COMPASS_BAR', name: 'COMPASS_BAR',
desc: 'osdDescElementCompassBar', desc: 'osdDescElementCompassBar',
default_position: -1, default_position: -1,
draw_order: 310,
positionable: true, positionable: true,
preview: function(osd_data) { preview: function(osd_data) {
return FONT.symbol(SYM.HEADING_W) + FONT.symbol(SYM.HEADING_LINE) + FONT.symbol(SYM.HEADING_DIVIDED_LINE) + return FONT.symbol(SYM.HEADING_W) + FONT.symbol(SYM.HEADING_LINE) + FONT.symbol(SYM.HEADING_DIVIDED_LINE) +
@ -750,6 +835,7 @@ OSD.constants = {
name: 'WARNINGS', name: 'WARNINGS',
desc: 'osdDescElementWarnings', desc: 'osdDescElementWarnings',
default_position: -1, default_position: -1,
draw_order: 220,
positionable: true, positionable: true,
preview: 'LOW VOLTAGE' preview: 'LOW VOLTAGE'
}, },
@ -757,6 +843,7 @@ OSD.constants = {
name: 'ESC_TEMPERATURE', name: 'ESC_TEMPERATURE',
desc: 'osdDescElementEscTemperature', desc: 'osdDescElementEscTemperature',
default_position: -1, default_position: -1,
draw_order: 380,
positionable: true, positionable: true,
preview: FONT.symbol(SYM.TEMP_C) + '45' preview: FONT.symbol(SYM.TEMP_C) + '45'
}, },
@ -764,6 +851,7 @@ OSD.constants = {
name: 'ESC_RPM', name: 'ESC_RPM',
desc: 'osdDescElementEscRpm', desc: 'osdDescElementEscRpm',
default_position: -1, default_position: -1,
draw_order: 390,
positionable: true, positionable: true,
preview: '226000' preview: '226000'
}, },
@ -771,6 +859,7 @@ OSD.constants = {
name: 'REMAINING_TIME_ESTIMATE', name: 'REMAINING_TIME_ESTIMATE',
desc: 'osdDescElementRemaningTimeEstimate', desc: 'osdDescElementRemaningTimeEstimate',
default_position: -1, default_position: -1,
draw_order: 80,
positionable: true, positionable: true,
preview: '01:13' preview: '01:13'
}, },
@ -778,6 +867,7 @@ OSD.constants = {
name: 'RTC_DATE_TIME', name: 'RTC_DATE_TIME',
desc: 'osdDescElementRtcDateTime', desc: 'osdDescElementRtcDateTime',
default_position: -1, default_position: -1,
draw_order: 400,
positionable: true, positionable: true,
preview: '2017-11-11 16:20:00' preview: '2017-11-11 16:20:00'
}, },
@ -785,6 +875,7 @@ OSD.constants = {
name: 'ADJUSTMENT_RANGE', name: 'ADJUSTMENT_RANGE',
desc: 'osdDescElementAdjustmentRange', desc: 'osdDescElementAdjustmentRange',
default_position: -1, default_position: -1,
draw_order: 410,
positionable: true, positionable: true,
preview: 'PITCH/ROLL P: 42' preview: 'PITCH/ROLL P: 42'
}, },
@ -792,6 +883,7 @@ OSD.constants = {
name: 'TIMER_1', name: 'TIMER_1',
desc: 'osdDescElementTimer1', desc: 'osdDescElementTimer1',
default_position: -1, default_position: -1,
draw_order: 60,
positionable: true, positionable: true,
preview: function(osd_data) { preview: function(osd_data) {
return OSD.generateTimerPreview(osd_data, 0); return OSD.generateTimerPreview(osd_data, 0);
@ -801,6 +893,7 @@ OSD.constants = {
name: 'TIMER_2', name: 'TIMER_2',
desc: 'osdDescElementTimer2', desc: 'osdDescElementTimer2',
default_position: -1, default_position: -1,
draw_order: 70,
positionable: true, positionable: true,
preview: function(osd_data) { preview: function(osd_data) {
return OSD.generateTimerPreview(osd_data, 1); return OSD.generateTimerPreview(osd_data, 1);
@ -810,6 +903,7 @@ OSD.constants = {
name: 'CORE_TEMPERATURE', name: 'CORE_TEMPERATURE',
desc: 'osdDescElementCoreTemperature', desc: 'osdDescElementCoreTemperature',
default_position: -1, default_position: -1,
draw_order: 420,
positionable: true, positionable: true,
preview: function(osd_data) { preview: function(osd_data) {
return OSD.generateTemperaturePreview(osd_data, 33); return OSD.generateTemperaturePreview(osd_data, 33);
@ -922,6 +1016,20 @@ OSD.constants = {
] ]
}; };
OSD.searchLimitsElement = function(arrayElements) {
// Search minimum and maximum
var limits = {minX: 0, maxX: 0, minY:0, maxY: 0};
arrayElements.forEach(function(valor, indice, array) {
limits.minX = Math.min(valor.x, limits.minX);
limits.maxX = Math.max(valor.x, limits.maxX);
limits.minY = Math.min(valor.y, limits.minY);
limits.maxY = Math.max(valor.y, limits.maxY);
});
return limits;
}
// Pick display fields by version, order matters, so these are going in an array... pry could iterate the example map instead // Pick display fields by version, order matters, so these are going in an array... pry could iterate the example map instead
OSD.chooseFields = function () { OSD.chooseFields = function () {
var F = OSD.constants.ALL_DISPLAY_FIELDS; var F = OSD.constants.ALL_DISPLAY_FIELDS;
@ -1078,6 +1186,24 @@ OSD.updateDisplaySize = function() {
}; };
}; };
OSD.drawByOrder = function(selectedPosition, field, charCode) {
// Check if there is other field at the same position
if (OSD.data.preview[selectedPosition] !== undefined) {
var oldField = OSD.data.preview[selectedPosition][0];
if (oldField != null) {
if (oldField.draw_order !== undefined) {
if ((field.draw_order === undefined) || (field.draw_order < oldField.draw_order)) {
// Not overwrite old field
return;
}
}
}
// Default action, overwrite old field
OSD.data.preview[selectedPosition++] = [field, charCode];
}
}
OSD.msp = { OSD.msp = {
/** /**
@ -1237,6 +1363,7 @@ OSD.msp = {
name: suffix ? c.name + suffix : c.name, name: suffix ? c.name + suffix : c.name,
desc: c.desc, desc: c.desc,
index: j, index: j,
draw_order: c.draw_order,
positionable: c.positionable, positionable: c.positionable,
preview: suffix ? c.preview + suffix : c.preview preview: suffix ? c.preview + suffix : c.preview
}, this.helpers.unpack.position(v, c))); }, this.helpers.unpack.position(v, c)));
@ -1291,11 +1418,14 @@ OSD.msp = {
} }
} }
// Generate OSD element previews that are defined by a function // Generate OSD element previews and positionable that are defined by a function
for (let item of d.display_items) { for (let item of d.display_items) {
if (typeof(item.preview) === 'function') { if (typeof(item.preview) === 'function') {
item.preview = item.preview(d); item.preview = item.preview(d);
} }
if (typeof(item.positionable) === 'function') {
item.positionable = item.positionable(d);
}
} }
OSD.updateDisplaySize(); OSD.updateDisplaySize();
@ -1314,8 +1444,18 @@ OSD.GUI.preview = {
}, },
onDragStart: function(e) { onDragStart: function(e) {
var ev = e.originalEvent; var ev = e.originalEvent;
var display_item = OSD.data.display_items[$(ev.target).data('field').index];
var offsetX = 6;
var offsetY = 9;
if (display_item.preview.constructor === Array) {
var arrayElements = display_item.preview;
var limits = OSD.searchLimitsElement(arrayElements);
offsetX -= limits.minX*12;
offsetY -= limits.minY*12;
}
ev.dataTransfer.setData("text/plain", $(ev.target).data('field').index); ev.dataTransfer.setData("text/plain", $(ev.target).data('field').index);
ev.dataTransfer.setDragImage($(this).data('field').preview_img, 6, 9); ev.dataTransfer.setDragImage($(this).data('field').preview_img, offsetX, offsetY);
}, },
onDragOver: function(e) { onDragOver: function(e) {
var ev = e.originalEvent; var ev = e.originalEvent;
@ -1334,10 +1474,35 @@ OSD.GUI.preview = {
var position = $(this).removeAttr('style').data('position'); var position = $(this).removeAttr('style').data('position');
var field_id = parseInt(ev.dataTransfer.getData('text/plain')) var field_id = parseInt(ev.dataTransfer.getData('text/plain'))
var display_item = OSD.data.display_items[field_id]; var display_item = OSD.data.display_items[field_id];
var overflows_line = FONT.constants.SIZES.LINE - ((position % FONT.constants.SIZES.LINE) + display_item.preview.length);
if (overflows_line < 0) { var overflows_line = 0;
position += overflows_line; // Standard preview, string type
if (display_item.preview.constructor !== Array) {
overflows_line = FONT.constants.SIZES.LINE - ((position % FONT.constants.SIZES.LINE) + display_item.preview.length);
if (overflows_line < 0) {
position += overflows_line;
}
// Advanced preview, array type
} else {
var arrayElements = display_item.preview;
var limits = OSD.searchLimitsElement(arrayElements);
var selectedPositionX = position % FONT.constants.SIZES.LINE;
var selectedPositionY = Math.trunc(position / FONT.constants.SIZES.LINE);
if ((limits.minX < 0) && ((selectedPositionX + limits.minX) < 0)) {
position += Math.abs(selectedPositionX + limits.minX);
} else if ((limits.maxX > 0) && ((selectedPositionX + limits.maxX) >= FONT.constants.SIZES.LINE)) {
position -= (selectedPositionX + limits.maxX + 1) - FONT.constants.SIZES.LINE;
}
if ((limits.minY < 0) && ((selectedPositionY + limits.minY) < 0)) {
position += Math.abs(selectedPositionY + limits.minY)*FONT.constants.SIZES.LINE;
} else if ((limits.maxY > 0) && ((selectedPositionY + limits.maxY) >= OSD.data.display_size.y)) {
position -= (selectedPositionY + limits.maxY - OSD.data.display_size.y + 1)*FONT.constants.SIZES.LINE;
}
} }
if (semver.gte(CONFIG.apiVersion, "1.21.0")) { if (semver.gte(CONFIG.apiVersion, "1.21.0")) {
// unsigned now // unsigned now
} else { } else {
@ -1717,53 +1882,75 @@ TABS.osd.initialize = function (callback) {
OSD.data.preview[i * 30 + j] = [{name: 'LOGO', positionable: false}, x++]; OSD.data.preview[i * 30 + j] = [{name: 'LOGO', positionable: false}, x++];
} }
} }
// draw all the displayed items and the drag and drop preview images // draw all the displayed items and the drag and drop preview images
for(let field of OSD.data.display_items) { for(let field of OSD.data.display_items) {
if (!field.preview || !field.isVisible) { continue; }
var j = (field.position >= 0) ? field.position : field.position + OSD.data.display_size.total; if (!field.preview || !field.isVisible) {
continue;
}
var selectedPosition = (field.position >= 0) ? field.position : field.position + OSD.data.display_size.total;
// create the preview image // create the preview image
field.preview_img = new Image(); field.preview_img = new Image();
var canvas = document.createElement('canvas'); var canvas = document.createElement('canvas');
var ctx = canvas.getContext("2d"); var ctx = canvas.getContext("2d");
// fill the screen buffer
for(var i = 0; i < field.preview.length; i++) { // Standard preview, type String
var charCode = field.preview.charCodeAt(i); if (field.preview.constructor !== Array) {
OSD.data.preview[j++] = [field, charCode];
// draw the preview
var img = new Image(); // fill the screen buffer
img.src = FONT.draw(charCode); for(var i = 0; i < field.preview.length; i++) {
ctx.drawImage(img, i*12, 0);
// Add the character to the preview
var charCode = field.preview.charCodeAt(i);
OSD.drawByOrder(selectedPosition++, field, charCode);
// Image used when "dragging" the element
if (field.positionable) {
var img = new Image();
img.src = FONT.draw(charCode);
ctx.drawImage(img, i*12, 0);
}
}
} else {
var arrayElements = field.preview;
// The array can have negative and positive positions, search limits...
var limits = OSD.searchLimitsElement(arrayElements);
var offsetX = 0;
var offsetY = 0;
if (limits.minX < 0) {
offsetX = -limits.minX;
}
if (limits.minY < 0) {
offsetY = -limits.minY;
}
for (var i=0; i < arrayElements.length; i++) {
// Add the character to the preview
var element = arrayElements[i];
var charCode = element.sym;
OSD.drawByOrder(selectedPosition + element.x + element.y*FONT.constants.SIZES.LINE, field, charCode);
// Image used when "dragging" the element
if (field.positionable) {
var img = new Image();
img.src = FONT.draw(charCode);
ctx.drawImage(img, (element.x + offsetX)*12, (element.y + offsetY)*12);
}
}
} }
field.preview_img.src = canvas.toDataURL('image/png'); field.preview_img.src = canvas.toDataURL('image/png');
// Required for NW.js - Otherwise the <img /> will // Required for NW.js - Otherwise the <img /> will
// consume drag/drop events. //consume drag/drop events.
field.preview_img.style.pointerEvents = 'none'; field.preview_img.style.pointerEvents = 'none';
}
var centerishPosition = 194;
// artificial horizon
if ($('input[name="ARTIFICIAL_HORIZON"]').prop('checked')) {
for (var i = 0; i < 9; i++) {
OSD.data.preview[centerishPosition - 4 + i] = SYM.AH_BAR9_0 + 4;
}
}
// crosshairs
if ($('input[name="CROSSHAIRS"]').prop('checked')) {
OSD.data.preview[centerishPosition - 1] = SYM.AH_CENTER_LINE;
OSD.data.preview[centerishPosition + 1] = SYM.AH_CENTER_LINE_RIGHT;
OSD.data.preview[centerishPosition] = SYM.AH_CENTER;
}
// sidebars
if ($('input[name="HORIZON_SIDEBARS"]').prop('checked')) {
var hudwidth = OSD.constants.AHISIDEBARWIDTHPOSITION;
var hudheight = OSD.constants.AHISIDEBARHEIGHTPOSITION;
for (var i = -hudheight; i <= hudheight; i++) {
OSD.data.preview[centerishPosition - hudwidth + (i * FONT.constants.SIZES.LINE)] = SYM.AH_DECORATION;
OSD.data.preview[centerishPosition + hudwidth + (i * FONT.constants.SIZES.LINE)] = SYM.AH_DECORATION;
}
// AH level indicators
OSD.data.preview[centerishPosition-hudwidth+1] = SYM.AH_LEFT;
OSD.data.preview[centerishPosition+hudwidth-1] = SYM.AH_RIGHT;
} }
// render // render
var $preview = $('.display-layout .preview').empty(); var $preview = $('.display-layout .preview').empty();
var $row = $('<div class="row"/>'); var $row = $('<div class="row"/>');