Skip to content

Commit 69add73

Browse files
committed
Fixed formatting of signal extrema in mouseover data table.
1 parent 061f188 commit 69add73

1 file changed

Lines changed: 10 additions & 41 deletions

File tree

js/views/View.js

Lines changed: 10 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -318,22 +318,9 @@ class View {
318318
function() {
319319
if (!sig.view.label) {
320320
// show label
321-
let type;
322-
switch (sig.type) {
323-
case 'i':
324-
type = 'int';
325-
break;
326-
case 'f':
327-
type = 'float';
328-
break;
329-
case 'd':
330-
type = 'double';
331-
break;
332-
default:
333-
type = '?';
334-
break;
335-
}
336-
let typestring = sig.length > 1 ? type+'['+sig.length+']' : type;
321+
let typestring = sig.type.toLowerCase();
322+
if (sig.length > 1)
323+
typestring = typestring + '[' + sig.length + ']';
337324
function parseMaybeVector(val) {
338325
if (val === null || typeof val === 'undefined')
339326
return '';
@@ -347,8 +334,6 @@ class View {
347334
}
348335
return val;
349336
}
350-
let minstring = parseMaybeVector(sig.min);
351-
let maxstring = parseMaybeVector(sig.max);
352337
let x, y;
353338
if (Array.isArray(sig.position)) {
354339
x = sig.position[0].x;
@@ -369,7 +354,7 @@ class View {
369354
.reduce((res, o) => Object.assign(res, o), {});
370355
filtered.instances = sig.num_inst;
371356
delete filtered.num_inst;
372-
filtered.type = type_name(sig.type);
357+
filtered.type = typestring;
373358
let maps = self.graph.maps;
374359
filtered.maps =
375360
maps.filter(m => sig === m.dst)
@@ -380,34 +365,18 @@ class View {
380365
+" out";
381366
if (sig.use_inst == true)
382367
filtered.instances = sig.instances;
383-
if (sig.min !== undefined) {
384-
if (Array.isArray(sig.min)) {
385-
let v = [];
386-
for (let j in sig.min) {
387-
v[j] = sig.min[j].toFixed(3);
388-
console.log("v["+j+"] = "+v[j]+" ("+typeof(v[j])+")");
389-
}
390-
filtered.min = v;
391-
}
392-
else
393-
filtered.min = sig.min.toFixed(3);
394-
}
395-
if (sig.max !== undefined) {
396-
if (Array.isArray(sig.max)) {
397-
let v = [];
398-
for (let j in sig.max)
399-
v[j] = sig.max[j].toFixed(3);
400-
}
401-
else
402-
filtered.max = sig.max.toFixed(3);
403-
}
368+
filtered.min = parseMaybeVector(sig.min);
369+
filtered.max = parseMaybeVector(sig.max);
370+
filtered.direction = filtered.direction.toLowerCase();
404371
filtered.period = sig.period.toFixed(4) * 1000 + " ms";
405372
filtered.jitter = (sig.jitter * 1000).toFixed(3) + " ms";
373+
filtered.stealing = filtered.steal.toLowerCase();
374+
delete filtered.steal;
406375
// sort
407376
filtered = Object.keys(filtered)
408377
.sort()
409378
.reduce((r, k) => (r[k] = filtered[k], r), {});
410-
self.tooltip.showTable(sig.name, filtered, x, y);
379+
self.tooltip.showTable(sig.device.name+":"+sig.name, filtered, x, y);
411380
sig.view.animate({'stroke-width': 15}, 0, 'linear');
412381
}
413382
self.hoverDev = sig.device;

0 commit comments

Comments
 (0)