From a3f6d7a49d7547ffbd12fb26d69e0c1f23cbdde6 Mon Sep 17 00:00:00 2001 From: Kirigaya <1193466151@qq.com> Date: Wed, 31 Jul 2024 18:08:42 +0800 Subject: [PATCH] save --- src/hook/render.js | 14 +++++--------- src/hook/utils.js | 2 +- src/hook/wave-container-view.js | 3 ++- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/hook/render.js b/src/hook/render.js index 18e0ed9..b35d389 100644 --- a/src/hook/render.js +++ b/src/hook/render.js @@ -8,6 +8,7 @@ import { registerTouchendEvent, registerTouchmoveEvent, registerTouchstartEvent import { findCurrentSignalValue } from './utils'; import { registerKeyEvent } from "./wave-view/key-event"; +import { WaveContainerView } from "./wave-container-view"; let mainRenderEl = null; const canvasMap = new Map(); @@ -96,17 +97,12 @@ function makeWaveView(parentElement) { * @param {WireItem} signal */ function toggleRender(signal) { - if (globalLookup.currentWires.has(signal)) { - globalLookup.currentWires.delete(signal); - delete globalLookup.currentSignalValues[signal.link]; + + if (WaveContainerView.has(signal)) { + WaveContainerView.delete(signal); globalLookup.render(); } else { - globalLookup.currentWires.add(signal); - const signalItem = globalLookup.chango[signal.link]; - - const { wave, kind } = signalItem; - const time = globalLookup.currentTime; - globalLookup.currentSignalValues[signal.link] = findCurrentSignalValue(kind, wave, time); + WaveContainerView.add(signal); globalLookup.render(); } } diff --git a/src/hook/utils.js b/src/hook/utils.js index 00ed7b4..7a77a3b 100644 --- a/src/hook/utils.js +++ b/src/hook/utils.js @@ -148,7 +148,7 @@ function getWireValueCaption(kind, value, mask) { * @returns {BigInt | string} */ function getSmartCurrentSignalValue(changoItem, time) { - const { wave, kind } = signalItem; + const { wave, kind } = changoItem; if (wave === undefined || wave.length === 0) { return 'x'; } else if (wave.length === 1) { diff --git a/src/hook/wave-container-view.js b/src/hook/wave-container-view.js index 99f89e3..68c11e5 100644 --- a/src/hook/wave-container-view.js +++ b/src/hook/wave-container-view.js @@ -29,7 +29,8 @@ export const WaveContainerView = { // 增加当前波形值视图 const changoItem = globalLookup.chango[signal.link]; - globalLookup.currentSignalValues[signal.link] = getSmartCurrentSignalValue(changoItem, time); + + globalLookup.currentSignalValues[signal.link] = getSmartCurrentSignalValue(changoItem, globalLookup.currentTime); }, /**