From 5aac2f15c4340dda6aa799cd46b65b1994457d78 Mon Sep 17 00:00:00 2001
From: Kirigaya <1193466151@qq.com>
Date: Thu, 14 Nov 2024 15:59:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=BB=98=E8=AE=A4=E4=B8=8D?=
 =?UTF-8?q?=E6=98=AF=2016=20=E8=BF=9B=E5=88=B6=E6=B8=B2=E6=9F=93=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E7=9A=84=E9=97=AE=E9=A2=98=20|=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=9C=89=E7=AC=A6=E5=8F=B7=E6=95=B0=E5=AD=97=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98=20|=20=E7=BB=99?=
 =?UTF-8?q?=E9=AB=98=E4=BD=8D=E5=AE=BD=E7=9A=84=E6=95=B0=E5=AD=97=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=8A=E5=89=8D=E7=BC=80=200?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                 |   1 +
 public/index.html                          |   4 +--
 public/test.view                           | Bin 8009 -> 8009 bytes
 src/hook/wave-view/get-label.js            |   2 +-
 src/hook/wave-view/render-values.js        |  19 +++++++++-----
 src/hook/wave-view/toolbar/renderFormat.js |  29 ++++++++++++++++++---
 6 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4e49398..67bef79 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,5 +22,6 @@ pnpm-debug.log*
 *.sln
 *.sw?
 *.vcd
+*.view
 
 deploy.bat
\ No newline at end of file
diff --git a/public/index.html b/public/index.html
index 6f05d81..31c1fa5 100644
--- a/public/index.html
+++ b/public/index.html
@@ -16,8 +16,8 @@
 
     <script>
         window.readVcdFile = async () => {
-            let inputVcdFile = 'test.vcd';
-            let inputViewFile = 'test.view';
+            let inputVcdFile = 'movAvg.vcd';
+            let inputViewFile = 'movAvg.view';
             const response = await fetch(inputVcdFile);
             const arrayBuffer = await response.arrayBuffer();            
             return [arrayBuffer, inputVcdFile, inputViewFile];
diff --git a/public/test.view b/public/test.view
index a400a79b46ae420efc3212a1e3f0d71be32f243f..bc05745037ece2c3ed473b07d305c416f505c2b5 100644
GIT binary patch
delta 40
tcmX?UchYVHw~X+Lv_%e#8L64+86^xLa6x^_W;q!rMkY1R%}KJ)837iY3~2xW

delta 40
tcmX?UchYVHw~TOr>@)|)jMU8Zj1mSASnzt%W;q!rMy4Lt%}KJ)837D$46pzI

diff --git a/src/hook/wave-view/get-label.js b/src/hook/wave-view/get-label.js
index 6e2b45b..04b1679 100644
--- a/src/hook/wave-view/get-label.js
+++ b/src/hook/wave-view/get-label.js
@@ -6,7 +6,7 @@ const getLabel = (lane) => {
         lane = {};
     }
 
-    const width = Number(lane.width || 1);
+    const width = Number(lane.width || 1);    
     const valueRender = new FormatValueRender(lane.ref, width, '');
 
     return (value, mask, x, w, link) => {
diff --git a/src/hook/wave-view/render-values.js b/src/hook/wave-view/render-values.js
index 2614ba9..ff666ca 100644
--- a/src/hook/wave-view/render-values.js
+++ b/src/hook/wave-view/render-values.js
@@ -55,24 +55,28 @@ function getVecRenderModal(link) {
 function addVecRenderItem(link) {
     const link2CurrentWires = globalLookup.link2CurrentWires;
     const modal = getVecRenderModal(link);
+    
     if (modal === 0) {
         const signal = link2CurrentWires.get(link);
         return {
             name: signal.name,
             kind: signal.kind,
-            ref: signal.link
+            ref: signal.link,
+            width: signal.size
         }
     } else if (modal === 1) {
         return {
             name: '',
             kind: '',
-            ref: ''
+            ref: '',
+            width: 1
         }
     } else {
         return {
             name: '',
             kind: '',
-            ref: ''
+            ref: '',
+            width: 1
         }
     }
 }
@@ -101,7 +105,8 @@ function* renderValues(desc, pstate) {
             renderSignals.push({
                 name: '',
                 kind: '',
-                ref: ''
+                ref: '',
+                width: 1
             });
             // 如果没有关闭，把所有子节点加入其中
             if (view.groupInfo.collapse === false) {
@@ -172,11 +177,13 @@ function* renderValues(desc, pstate) {
                         const xCur = getX(pstate, tCur);
 
                         if (vPre !== undefined || mPre !== undefined) {
-                            if (xPre > width && xCur > width) { // both time stamps to the right
+                            if (xPre > width && xCur > width) {
+                                // both time stamps to the right
                                 break perLane;
                             }
 
-                            if (!((xPre < sidebarWidth) && (xCur < sidebarWidth))) { // both time stamps to the left
+                            if (!((xPre < sidebarWidth) && (xCur < sidebarWidth))) {
+                                // both time stamps to the left
                                 const xPreNorm = ((xPre > sidebarWidth) ? xPre : sidebarWidth) | 0;
                                 const xCurNorm = ((xCur < width) ? xCur : width) | 0;
                                 const w = xCurNorm - xPreNorm;
diff --git a/src/hook/wave-view/toolbar/renderFormat.js b/src/hook/wave-view/toolbar/renderFormat.js
index 41104a2..5adc8d7 100644
--- a/src/hook/wave-view/toolbar/renderFormat.js
+++ b/src/hook/wave-view/toolbar/renderFormat.js
@@ -14,7 +14,8 @@ function getValueFormatCode(link) {
         }
     }
     
-    return 0;
+    // 默认 16 进制
+    return 2;
 }
 
 /**
@@ -73,7 +74,7 @@ export class FormatValueRender {
      * @returns {string} 转换后需要渲染的字符串
      */
     render(value, pos) {
-        const formatCode = this.formatCode;
+        const formatCode = this.formatCode;        
         switch (formatCode) {
             // 二进制
             case 0: return this.radixTransform(2, value, pos);
@@ -136,7 +137,29 @@ export class FormatValueRender {
 
 
         // 无符号的各类进制数字
-        const valueString = value.toString(radix);
+        let valueString = value.toString(radix);
+        // 如果是 2, 8, 16 进制，需要根据宽度自动完全前面的 0 的填充
+        let displayWidth, padding;
+        switch (radix) {
+            case 2:
+                displayWidth = Number(width);
+                padding = "0".repeat(displayWidth - valueString.length);
+                valueString = padding + valueString;
+                break;
+            case 8:
+                displayWidth = Math.ceil(Number(width) / 3);
+                padding = "0".repeat(displayWidth - valueString.length);
+                valueString = padding + valueString;
+                break;
+            case 16:
+                displayWidth = Math.ceil(Number(width) / 4);
+                padding = "0".repeat(displayWidth - valueString.length);
+                valueString = padding + valueString;
+                break;
+            default:
+                break;
+        }
+
         if (pos === -1 || valueString.length <= pos) {
             return valueString;
         }