From 802f95ab0aa04cb4e91bef2d664e2cb34eebc58a Mon Sep 17 00:00:00 2001
From: Kirigaya <1193466151@qq.com>
Date: Wed, 11 Sep 2024 12:59:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=B2=A1=E6=9C=89=E8=80=83?=
 =?UTF-8?q?=E8=99=91=20gcd=20=E5=AF=BC=E8=87=B4=E8=B7=B3=E8=BD=AC=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/index.html                         |   2 +-
 public/vcd.wasm                           | Bin 127001 -> 127005 bytes
 src/components/pivot/index.vue            |   2 --
 src/components/toolbar/cursor-location.js |  20 ++++++++++++++------
 src/hook/utils.js                         |   3 +++
 src/hook/wave-view/render-wave.js         |   3 ---
 6 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/public/index.html b/public/index.html
index 4187343..4c93e7a 100644
--- a/public/index.html
+++ b/public/index.html
@@ -17,7 +17,7 @@
 
     <script>
         window.readVcdFile = async () => {
-            const response = await fetch('test.vcd');
+            const response = await fetch('FFT_IFFT.vcd');
             const blob = await response.blob();
             const reader = new FileReader();
             return new Promise((resolve, reject) => {
diff --git a/public/vcd.wasm b/public/vcd.wasm
index d38682aa964ea92a864257e25e84b8b909facab7..f54adb472e0d1194cd4bfe12dafe22e034a7d599 100644
GIT binary patch
delta 358
zcmZ9GF-rqM5QXpEu6Nnpi%kfEh0Y!tA`t~aMG?G9akko7_zQxCLdt-JAU4*Eh#)qp
zA|^4p6w$)Q%GOfiU$B?B(b!mhykWjKb2;#@2mbxMkK5CNpB8*n>v&JE?r`MtIIBIQ
znwUj4Ej6(ScxJzag2hP-s}`LWwk$q>vE2SihZg3ok7@JV#>-SdnWCEsS?uoch}fhH
zo>3H}HxD=fg!$@VZAP+)xc1zLWT*)75XT9R?2u`YGJ9Rj`6|ge%7$7OyViT{VuJ}1
zMx^+N6}d$>(lT~5tR`&-t5!lmyg_1tIbp7hv)Vdy$o3^#P_DdvUf102p<-_cQ|h6(
ssmA{3hmkLdHAw#Ry+q5g&;ERAE_zr(koJ2hParVEN91kHKY_1&14`gg!T<mO

delta 379
zcmZvXy-EW?6h`-(nPhioHU>-~HhO2#5J3zmDvIE4inX<|%M+xEkkUd3h^^HiqLq*;
zViMVn2;wVfX%%0>RwtS?Vs-c~_uQZBk$X9E@0VTNw99T*cG2qKJ-fO?lbK=<i<r%-
zJ*)!0srON~X!o&c@z}?n#pf?J20y83QS`~HFfZf<C}QNBrvcvPrp1^Yh=}+MgYXpj
z+3f@BfHX+4wV-%JLg!gTDhvqm7mgDV*&^4Vz#OGma)YGcC>u^w99r)+#SWJwO(DZa
z91yFpNUPY<u$r<nc&iag5?zuj+zCrHoSkfQhwQvWODfg&&pTS!J~ZqOX{tk1c7usO
pzG3Vu;$2dI{CuL-#OG6AnTsLT;AbyG)N=nko%6>}&p$(~e*-A`PRjrQ

diff --git a/src/components/pivot/index.vue b/src/components/pivot/index.vue
index caaa316..4a0bf23 100644
--- a/src/components/pivot/index.vue
+++ b/src/components/pivot/index.vue
@@ -51,8 +51,6 @@ defineComponent({ name: 'main-render' });
 function onMousedown() {
     updateWireCurrentValue();
     changeCursorLocation();
-
-    console.log(MovingPivot);
     
     // 关闭所有
     for (const id of UserPivotCtxShows.keys()) {
diff --git a/src/components/toolbar/cursor-location.js b/src/components/toolbar/cursor-location.js
index 62d2717..fd670f0 100644
--- a/src/components/toolbar/cursor-location.js
+++ b/src/components/toolbar/cursor-location.js
@@ -46,8 +46,9 @@ export function toBegin() {
 
 export function toEnd() {
     const pstate = globalLookup.pstate;
+    const gcd = globalLookup.tgcd || 1;
     if (pstate) {
-        moveto(globalLookup.time, pstate.width - pstate.sidebarWidth, pstate);
+        moveto(globalLookup.time * gcd, pstate.width - pstate.sidebarWidth, pstate);
     }
 }
 
@@ -64,6 +65,7 @@ function clip(v, min, max) {
 export function toPrevChange() {
     const link = sidebarSelectedWires.lastLink;
     const pstate = globalLookup.pstate;
+    const gcd = globalLookup.tgcd || 1;
 
     if (link === undefined || pstate === undefined) {
         return;
@@ -81,13 +83,15 @@ export function toPrevChange() {
             let pivot = bisearch(wave, currentT);
 
             const pwave = wave[pivot];
-            if (pwave[0] === currentT) {
+            if (pwave[0] * gcd === currentT) {
                 pivot = clip(pivot - 1, 0, wave.length - 1);
             } else {
                 pivot = clip(pivot, 0, wave.length - 1);
             }
+
+            console.log(pivot, wave.length);
             
-            const targetT = wave[pivot][0];
+            const targetT = wave[pivot][0] * gcd;
             moveto(targetT, (pstate.width + pstate.sidebarWidth) / 2, pstate);
         }
     }
@@ -97,12 +101,13 @@ export function toPrevChange() {
 export function toNextChange() {
     const link = sidebarSelectedWires.lastLink;
     const pstate = globalLookup.pstate;
+    const gcd = globalLookup.tgcd || 1;
 
     if (link === undefined || pstate === undefined) {
         return;
     }
 
-    const chango = globalLookup.chango[link];
+    const chango = globalLookup.chango[link];    
     if (chango && chango.wave && chango.wave.length > 0) {
         const wave = chango.wave;
 
@@ -115,10 +120,10 @@ export function toNextChange() {
             let targetT;
             if (pivot === wave.length - 1) {
                 pivot = clip(pivot + 1, 0, wave.length - 1);
-                targetT = globalLookup.time;
+                targetT = globalLookup.time * gcd;
             } else {
                 pivot = clip(pivot + 1, 0, wave.length - 1);
-                targetT = wave[pivot][0];
+                targetT = wave[pivot][0] * gcd;
             }
 
             moveto(targetT, (pstate.width + pstate.sidebarWidth) / 2, pstate);
@@ -157,7 +162,10 @@ export function clearAllPivot() {
  * @return {number} 
  */
 export function bisearch(wave, time) {
+    const gcd = globalLookup.tgcd || 1;    
     const times = wave.map(p => p[0]);
+    
+    time = time / gcd;
 
     // 二分查找，并将结果存入 i
     let i = 0, j = wave.length - 1;
diff --git a/src/hook/utils.js b/src/hook/utils.js
index 1313e39..f83851a 100644
--- a/src/hook/utils.js
+++ b/src/hook/utils.js
@@ -166,6 +166,9 @@ async function updateWireCurrentValue(time) {
     if (time === undefined) {
         time = globalLookup.currentTime;
     }
+
+    const gcd = globalLookup.tgcd || 1;
+    time = time / gcd;
     
     const currentSignalValues = globalLookup.currentSignalValues;
 
diff --git a/src/hook/wave-view/render-wave.js b/src/hook/wave-view/render-wave.js
index b954343..e1651cb 100644
--- a/src/hook/wave-view/render-wave.js
+++ b/src/hook/wave-view/render-wave.js
@@ -498,12 +498,9 @@ class WebGL2WaveRender {
                 if (signal.size === 1) {
                     // 如果是 bit
                     gl.uniform2fv(webglLocation.widthShifts, gl_WidthShifts);
-
-
                     gl.uniform2fv(webglLocation.shifts, gl_Shifts);
                     gl.bindVertexArray(signalItem.lineVao);
                     gl.drawArrays(gl.TRIANGLE_STRIP, 0, lineVertices.length / glslInputLength);
-
                     gl.bindVertexArray(signalItem.maskVao);
                     gl.drawArrays(gl.TRIANGLES, 0, maskVertices.length / glslInputLength);
                 } else {