From 71e2ffb70069b57022cee7069659f49d08a36a69 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Mon, 22 Oct 2018 13:21:12 -0700 Subject: [PATCH] don't display acc data when AB added (#1483) * don't display acc data when AB added * hide acc --- sim/visuals/microbit.ts | 43 ++++++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/sim/visuals/microbit.ts b/sim/visuals/microbit.ts index f33a690f..f08bc552 100644 --- a/sim/visuals/microbit.ts +++ b/sim/visuals/microbit.ts @@ -720,27 +720,34 @@ path.sim-board { el.style.perspectiveOrigin = "50% 50% 50%"; el.style.perspective = "30em"; - // update text - if (acc.flags & AccelerometerFlag.X) { - if (!this.accTextX) { - this.accTextX = svg.child(this.g, "text", { x: 365, y: 260, class: "sim-text" }) as SVGTextElement; - this.accTextX.textContent = ""; + // don't display acc data when AB is on + if (state.buttonPairState.usesButtonAB) { + if (this.accTextX) this.accTextX.textContent = ""; + if (this.accTextY) this.accTextY.textContent = ""; + if (this.accTextZ) this.accTextZ.textContent = ""; + } else { + // update text + if (acc.flags & AccelerometerFlag.X) { + if (!this.accTextX) { + this.accTextX = svg.child(this.g, "text", { x: 365, y: 260, class: "sim-text" }) as SVGTextElement; + this.accTextX.textContent = ""; + } + this.accTextX.textContent = `ax:${x}`; } - this.accTextX.textContent = `ax:${x}`; - } - if (acc.flags & AccelerometerFlag.Y) { - if (!this.accTextY) { - this.accTextY = svg.child(this.g, "text", { x: 365, y: 285, class: "sim-text" }) as SVGTextElement; - this.accTextY.textContent = ""; + if (acc.flags & AccelerometerFlag.Y) { + if (!this.accTextY) { + this.accTextY = svg.child(this.g, "text", { x: 365, y: 285, class: "sim-text" }) as SVGTextElement; + this.accTextY.textContent = ""; + } + this.accTextY.textContent = `ay:${-y}`; } - this.accTextY.textContent = `ay:${-y}`; - } - if (acc.flags & AccelerometerFlag.Z) { - if (!this.accTextZ) { - this.accTextZ = svg.child(this.g, "text", { x: 365, y: 310, class: "sim-text" }) as SVGTextElement; - this.accTextZ.textContent = ""; + if (acc.flags & AccelerometerFlag.Z) { + if (!this.accTextZ) { + this.accTextZ = svg.child(this.g, "text", { x: 365, y: 310, class: "sim-text" }) as SVGTextElement; + this.accTextZ.textContent = ""; + } + this.accTextZ.textContent = `az:${z}`; } - this.accTextZ.textContent = `az:${z}`; } }