diff --git a/lib/www/client/source/src/components/graph-arrays-ij-scatter.vue b/lib/www/client/source/src/components/graph-arrays-ij-scatter.vue index 49c992f..b4435fb 100644 --- a/lib/www/client/source/src/components/graph-arrays-ij-scatter.vue +++ b/lib/www/client/source/src/components/graph-arrays-ij-scatter.vue @@ -129,8 +129,8 @@ export default { type: "groupby", groups: unpack(unpack(d, "meta"), "src_number"), styles: [ - {target: 1, value: {line: {color: "red"}}}, - {target: 2, value: {line: {color: "green"}}} + {target: 1, value: {line: {color: "green"}}}, + {target: 2, value: {line: {color: "red"}}} ] }], ...otherParams @@ -206,8 +206,8 @@ export default { type: "groupby", groups: unpack(unpack(d, "meta"), "src_number"), styles: [ - {target: 1, value: {line: {color: "red"}}}, - {target: 2, value: {line: {color: "green"}}} + {target: 1, value: {line: {color: "green"}}}, + {target: 2, value: {line: {color: "red"}}} ] }] }]; @@ -259,8 +259,8 @@ export default { type: "groupby", groups: unpack(unpack(d, "meta"), "src_number"), styles: [ - {target: 1, value: {marker: {color: "rgba(229, 115, 115, 0.9)"}}}, - {target: 2, value: {marker: {color: "rgba(129, 199, 132, 0.9)"}}} + {target: 1, value: {marker: {color: "rgba(129, 199, 132, 0.9)"}}}, + {target: 2, value: {marker: {color: "rgba(229, 115, 115, 0.9)"}}} ] }], ...otherParams diff --git a/lib/www/client/source/src/components/graph-guns-depth.vue b/lib/www/client/source/src/components/graph-guns-depth.vue index 2184509..e56ceb5 100644 --- a/lib/www/client/source/src/components/graph-guns-depth.vue +++ b/lib/www/client/source/src/components/graph-guns-depth.vue @@ -138,7 +138,7 @@ export default { }]; const tracesGunsDepthsIndividual = { - name: `Array ${src_number} outliers`, + //name: `Array ${src_number} outliers`, type: "scatter", mode: "markers", marker: {size: 2 }, @@ -149,7 +149,8 @@ export default { ).flat(), y: gunDepthsSorted.map( (s, idx) => s.filter( g => g < d3a.quantileSorted(s, 0.05) || g > d3a.quantileSorted(s, 0.95)) - ).flat() + ).flat(), + ...aes.gunArrays[src_number || 1].out }; const data = [ ...tracesGunDepths, tracesGunsDepthsIndividual ] diff --git a/lib/www/client/source/src/components/graph-guns-pressure.vue b/lib/www/client/source/src/components/graph-guns-pressure.vue index 658349b..1f52d86 100644 --- a/lib/www/client/source/src/components/graph-guns-pressure.vue +++ b/lib/www/client/source/src/components/graph-guns-pressure.vue @@ -152,7 +152,7 @@ export default { }]; const tracesGunsPressuresIndividual = { - name: `Array ${src_number} outliers`, + //name: `Array ${src_number} outliers`, type: "scatter", mode: "markers", marker: {size: 2 }, @@ -163,7 +163,8 @@ export default { ).flat(), y: gunPressuresSorted.map( (s, idx) => s.filter( g => g < d3a.quantileSorted(s, 0.05) || g > d3a.quantileSorted(s, 0.95)) - ).flat() + ).flat(), + ...aes.gunArrays[src_number || 1].out }; const data = [ traceManifold, ...tracesGunPressures, tracesGunsPressuresIndividual ] diff --git a/lib/www/client/source/src/components/graph-guns-timing.vue b/lib/www/client/source/src/components/graph-guns-timing.vue index 05a36c8..de1e1b1 100644 --- a/lib/www/client/source/src/components/graph-guns-timing.vue +++ b/lib/www/client/source/src/components/graph-guns-timing.vue @@ -138,7 +138,7 @@ export default { }]; const tracesGunsTimingsIndividual = { - name: `Array ${src_number} outliers`, + //name: `Array ${src_number} outliers`, type: "scatter", mode: "markers", marker: {size: 2 }, @@ -149,7 +149,8 @@ export default { ).flat(), y: gunTimingsSorted.map( (s, idx) => s.filter( g => g < d3a.quantileSorted(s, 0.05) || g > d3a.quantileSorted(s, 0.95)) - ).flat() + ).flat(), + ...aes.gunArrays[src_number || 1].out }; const data = [ ...tracesGunTimings, tracesGunsTimingsIndividual ] diff --git a/lib/www/client/source/src/lib/graphs/aesthetics.js b/lib/www/client/source/src/lib/graphs/aesthetics.js index ac2ffc0..f9c854f 100644 --- a/lib/www/client/source/src/lib/graphs/aesthetics.js +++ b/lib/www/client/source/src/lib/graphs/aesthetics.js @@ -1,5 +1,5 @@ export const gunArrays = { - 2: { + 1: { min: { fillcolor: "rgba(200, 230, 201, 0.2)", line: {color: "rgba(129, 199, 132, 0.3)", shape: "spline"}, @@ -18,9 +18,14 @@ export const gunArrays = { showlegend: false, name: "Array 1 (max.)", hoverinfo: "skip" + }, + out: { + name: "Array 1 outliers", + line: {color: "rgba(229, 153, 115, 0.7)"}, + fillcolor: "rgba(229, 153, 115, 0.5)" } }, - 1: { + 2: { min: { fillcolor: "rgba(255, 205, 210, 0.2)", line: {color: "rgba(229, 115, 115, 0.3)", shape: "spline"}, @@ -39,6 +44,11 @@ export const gunArrays = { showlegend: false, name: "Array 2 (max.)", hoverinfo: "skip" + }, + out: { + name: "Array 2 outliers", + line: {color: "rgba(129, 199, 166, 0.7)"}, + fillcolor: "rgba(129, 199, 166, 0.5)" } }, 3: { @@ -60,6 +70,10 @@ export const gunArrays = { showlegend: false, name: "Array 3 (max.)", hoverinfo: "skip" + }, + out: { + name: "Array 3 outliers", + //fillcolor: "" } } };