Skip to content

Commit ab0be80

Browse files
author
rolsen
committed
Added: Very rough draft of the T8 dashboard.
1 parent 57b9da4 commit ab0be80

File tree

4 files changed

+21
-17
lines changed

4 files changed

+21
-17
lines changed

‎ljswitchboard-module_manager/lib/switchboard_modules/dashboard_v2/deviceControlLocationDefinitions.js

+19-15
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ function getDashboardGuiConstants(deviceTypeName, productType) {
6868
// DB Image Info
6969
// this.LABJACK_DB_IMG_SRC = 'img/'+deviceTypeName+'-DB-cartoon.png';
7070
this.LABJACK_DB_IMG_SRC = {
71-
'T8': 'img/'+deviceTypeName+'-DB-cartoon.png',
71+
'T8': 'img/'+deviceTypeName+'-DB15-cartoon.png',
7272
'T7': 'img/'+deviceTypeName+'-DB-cartoon.png',
7373
'T4': 'img/'+deviceTypeName+'-DB15-cartoon.png',
7474
'T5': 'img/'+deviceTypeName+'-DB15-cartoon.png',
@@ -265,21 +265,25 @@ function getDashboardGuiConstants(deviceTypeName, productType) {
265265
this.AIN_NUM_DIGITS_PRECISION = 6;
266266
this.REGISTER_OVERLAY_SPEC = [
267267
// Left Side, Device
268-
{register: 'DAC0', yLocation: 0.622-DEV_OFF, yShift: -5, yOffset: 6, yOverlayOffset: 8, type: 'dac', board: 'device', side: 'left'},
269-
{register: 'DAC1', yLocation: 0.597-DEV_OFF, yShift: -4, yOffset: -6, yOverlayOffset: 8, type: 'dac', board: 'device', side: 'left'},
270-
{register: 'FIO0', yLocation: 0.512-DEV_OFF, yShift: -2, yOffset: 6, yOverlayOffset: 10, type: 'dio', board: 'device', side: 'left'},
271-
{register: 'FIO1', yLocation: 0.486-DEV_OFF, yShift: -1, yOffset: -6, yOverlayOffset: 10, type: 'dio', board: 'device', side: 'left'},
272-
{register: 'FIO2', yLocation: 0.405-DEV_OFF, yShift: 0, yOffset: 6, yOverlayOffset: 12, type: 'dio', board: 'device', side: 'left'},
273-
{register: 'FIO3', yLocation: 0.382-DEV_OFF, yShift: 1, yOffset: -6, yOverlayOffset: 12, type: 'dio', board: 'device', side: 'left'},
268+
{register: 'DAC1', yLocation: 0.297-DEV_OFF, yShift: 1, yOffset: -6, yOverlayOffset: 12, type: 'dac', board: 'device', side: 'left'},
269+
{register: 'DAC0', yLocation: (0.297+0.025)-DEV_OFF, yShift: 0, yOffset: 6, yOverlayOffset: 12, type: 'dac', board: 'device', side: 'left'},
270+
{register: 'FIO7', yLocation: 0.382-DEV_OFF, yShift: -1, yOffset: -6, yOverlayOffset: 10, type: 'dio', board: 'device', side: 'left'},
271+
{register: 'FIO6', yLocation: (0.382+0.025)-DEV_OFF, yShift: -2, yOffset: 6, yOverlayOffset: 10, type: 'dio', board: 'device', side: 'left'},
272+
{register: 'FIO5', yLocation: 0.486-DEV_OFF, yShift: 1, yOffset: -6, yOverlayOffset: 12, type: 'dio', board: 'device', side: 'left'},
273+
{register: 'FIO4', yLocation: (0.486+0.025)-DEV_OFF, yShift: 0, yOffset: 6, yOverlayOffset: 12, type: 'dio', board: 'device', side: 'left'},
274+
{register: 'FIO3', yLocation: 0.597-DEV_OFF, yShift: -1, yOffset: -6, yOverlayOffset: 10, type: 'dio', board: 'device', side: 'left'},
275+
{register: 'FIO2', yLocation: (0.597+0.025)-DEV_OFF, yShift: -2, yOffset: 6, yOverlayOffset: 10, type: 'dio', board: 'device', side: 'left'},
276+
{register: 'FIO1', yLocation: 0.690-DEV_OFF, yShift: -4, yOffset: -6, yOverlayOffset: 8, type: 'dio', board: 'device', side: 'left'},
277+
{register: 'FIO0', yLocation: (0.690+0.025)-DEV_OFF, yShift: -5, yOffset: 6, yOverlayOffset: 8, type: 'dio', board: 'device', side: 'left'},
274278

275-
{register: 'AIN1', yLocation: 0.667-DEV_OFF, yShift: -5, yOffset: 6, yOverlayOffset: 8, type: null, board: 'device', side: 'right'},
276-
{register: 'AIN0', yLocation: 0.642-DEV_OFF, yShift: -4, yOffset: -6, yOverlayOffset: 8, type: null, board: 'device', side: 'right'},
277-
{register: 'AIN3', yLocation: 0.558-DEV_OFF, yShift: -2, yOffset: 6, yOverlayOffset: 10, type: null, board: 'device', side: 'right'},
278-
{register: 'AIN2', yLocation: 0.532-DEV_OFF, yShift: -1, yOffset: -6, yOverlayOffset: 10, type: null, board: 'device', side: 'right'},
279-
{register: 'AIN5', yLocation: 0.453-DEV_OFF, yShift: 0, yOffset: 6, yOverlayOffset: 12, type: null, board: 'device', side: 'right'},
280-
{register: 'AIN4', yLocation: 0.425-DEV_OFF, yShift: 1, yOffset: -6, yOverlayOffset: 12, type: null, board: 'device', side: 'right'},
281-
{register: 'AIN7', yLocation: 0.342-DEV_OFF, yShift: 3.5, yOffset: 6, yOverlayOffset: 15, type: null, board: 'device', side: 'right'},
282-
{register: 'AIN6', yLocation: 0.315-DEV_OFF, yShift: 4, yOffset: -6, yOverlayOffset: 15, type: null, board: 'device', side: 'right'},
279+
{register: 'AIN0', yLocation: 0.200-DEV_OFF, yShift: 0, yOffset: 0, yOverlayOffset: 15, type: null, board: 'device', side: 'right'},
280+
{register: 'AIN1', yLocation: (0.200+1*.07)-DEV_OFF, yShift: 0, yOffset: 0, yOverlayOffset: 15, type: null, board: 'device', side: 'right'},
281+
{register: 'AIN2', yLocation: (0.200+2*.07)-DEV_OFF, yShift: 0, yOffset: 0, yOverlayOffset: 12, type: null, board: 'device', side: 'right'},
282+
{register: 'AIN3', yLocation: (0.200+3*.07)-DEV_OFF, yShift: 0, yOffset: 0, yOverlayOffset: 12, type: null, board: 'device', side: 'right'},
283+
{register: 'AIN4', yLocation: (0.200+4*.07)-DEV_OFF, yShift: 0, yOffset: 0, yOverlayOffset: 10, type: null, board: 'device', side: 'right'},
284+
{register: 'AIN5', yLocation: (0.200+5*.07)-DEV_OFF, yShift: 0, yOffset: 0, yOverlayOffset: 10, type: null, board: 'device', side: 'right'},
285+
{register: 'AIN6', yLocation: (0.200+6*.07)-DEV_OFF, yShift: 0, yOffset: 0, yOverlayOffset: 8, type: null, board: 'device', side: 'right'},
286+
{register: 'AIN7', yLocation: (0.200+7*.07)-DEV_OFF, yShift: 0, yOffset: 0, yOverlayOffset: 8, type: null, board: 'device', side: 'right'},
283287

284288
// Left Side, DB15
285289
{register: 'EIO6', yLocation: 0.275+0.020, yOffset: 2*bNum, type: 'dio', board: 'connector', side: 'left'},

‎ljswitchboard-module_manager/lib/switchboard_modules/dashboard_v2/deviceDashboardController.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ function getDeviceDashboardController(deviceInfo, moduleData) {
224224
.attr('stroke-width', 1)
225225
.style('shape-rendering', determineAntialiasing);
226226

227-
// Create a DIV for each of the registers for the main device
227+
// Create a DIV for each of the registers
228228
var overlays = d3.select(DB_REGISTERS_CONTAINER)
229229
.selectAll('.register-overlay') // Try to replace any existing elements w/ this class
230230
.data(function () { // fill all of the elements with data.
@@ -337,7 +337,7 @@ function getDeviceDashboardController(deviceInfo, moduleData) {
337337
(-1 * marginTopVal).toString() + 'px'
338338
);
339339

340-
// Apply width & height fixes to allow for T4 to have register controls
340+
// Apply width & height fixes to allow for register controls
341341
// on the right side.
342342
$(DEVICE_D3_CONTAINER).css(
343343
'width',

‎ljswitchboard-static_files/static/img/T8-DB15-cartoon.png

96.5 KB
Loading

‎ljswitchboard-static_files/static/img/T8-cartoon.png

180 KB
Loading

0 commit comments

Comments
 (0)