From f7ac311563f3081ea4a807daa5e41c5126188ae3 Mon Sep 17 00:00:00 2001
From: Kirigaya <1193466151@qq.com>
Date: Thu, 17 Oct 2024 15:18:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E5=9F=BA=E7=A1=80=E7=9A=84?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/index.html                             |   2 +-
 public/{ondark.css => onedark.css}            |   0
 public/test.vcd.view                          | Bin 278 -> 3861 bytes
 src/App.vue                                   |   1 -
 src/api/index.js                              |   4 +-
 src/components/toolbar/signal-modal.vue       |   8 +++
 .../toolbar/signal-value-format.vue           |   8 +++
 src/hook/recover.js                           |  53 +++++++++++++++---
 vue.config.js                                 |   4 ++
 9 files changed, 68 insertions(+), 12 deletions(-)
 rename public/{ondark.css => onedark.css} (100%)

diff --git a/public/index.html b/public/index.html
index 07e97b3..09c18f8 100644
--- a/public/index.html
+++ b/public/index.html
@@ -7,7 +7,7 @@
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" href="<%= BASE_URL %>icon.png">
     <title>Vcd Viewer</title>
-    <link rel="stylesheet" href="ondark.css">
+    <link rel="stylesheet" href="onedark.css">
     <link rel="stylesheet" href="vscode.css">
     <link rel="stylesheet" href="vcd.css">
     <link rel="stylesheet" href="iconfont.css">
diff --git a/public/ondark.css b/public/onedark.css
similarity index 100%
rename from public/ondark.css
rename to public/onedark.css
diff --git a/public/test.vcd.view b/public/test.vcd.view
index 7bc5a6ec04f1b274710f1157cf877de260e17f85..ce9bdcb4c21106861a00a6cf7d5357f5d48aa27b 100644
GIT binary patch
literal 3861
zcmcInOK;Oa5FX+J<t1`}Gbt4X2{p>AO?u}7G>AvV<792^ZDQ52t+f-k{3Z?vQ6%7w
z_!ayXW<Bk$2{mg=I8v0^Wc=;7GvCZkZr=o0N!fzOFkS($I`9kt8UdSeSV!wXc(Jpv
z#iHNy?1ab3J`bE}+Y92v7J@VP7_2Z#yfA=U=-!-qlc|sI1Q+sUbzzJj1b7!M17I8(
z@Oto6;kAnK=1e5Elf(wJK0HxqcMNFa$N)B|0G61*wkn)c7|*#4FVs0ViqGlJlXfIR
z$1aoEA-D?jK?zK$nf<xW$US^!NiR*o1DA_&=rSLFl`m^lkvgA6iAj_@u#3<n$~CkK
zL^<O#J9SyY42kb{;H|>jEXK>Kh8=kW-xh4vW+`)BVZ!dhYlZ!=0=DOxkbCe>A-5|a
zFPLuvhn0oL(-=;!W<BLIqFb>y37G#lI0)gT+V?tI`DW7az2LBH=V`{?dkz;60<4J$
z=TQcJUx8=8G@Q^61$nKa?XxK6=yIyHz2iu(unRg<&v#LPa4}nB=la?BleSDPiRKDg
zs>KlJY_szj_0@Bi(8`#?DXmrfVx9L#gP{vW>?E>g*OR0=@Cm=nhx9qFiQ6@_&O(aq
zl-QMPy+j{3s41WyBydg#y7|gDWC6u4ON>jj<MX5azw+OMA4_y~zdI-YEp#sEBT6Zn
za3f+UwPaVSJ=4G@$)W}!W5|0@BJy}8m5V$&>Vwok*y_VCbLGiP&scdwObS&6HX;ak
z+WNcth7RkvJ0+{{5mnz8M9T|#PwgYCFL#9!!}3>dy@Bn*w<Y5G-nwx{{Oq14>Q!!b
zBL4<~>QF_gdeo|DA&Y<2qx96#UarTDTI+EDB?Lr+OnCv3zdlkOIoN`aGP$`HuKzB`
z3eyu4@m?!Vf_5d!Ep)Ae@-}>xz&XlNpwtvDqjfrk5#P$g8*y(UP95Bba3X<o++X3E
txXUSpr8tNY^NOP(@s>AF9lS^IT>|HL>q%4Y$x@mjiF)<fvsRG<{07RW?tcIP

delta 65
zcmbO#H;qYFjFEwXr981LwV1)3fq{Y9fWaO}G36!ZrZOl`7T}eiXu~hS3KRkYma@#$
R@?wTP43iUCb}}(A0056342l2%

diff --git a/src/App.vue b/src/App.vue
index 0086e4e..cdafb1d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -142,7 +142,6 @@ onMounted(async () => {
 
         // 根据 recoverConfig 完成现场回复
         recoverSession(VcdInfo.topModules);
-        console.log(VcdInfo.topModules);
     });
 });
 
diff --git a/src/api/index.js b/src/api/index.js
index a5b4e01..6cd68fc 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -17,8 +17,8 @@ export async function saveView(file, payload) {
     }
     if (mode === 'debug') {
         const res = await axios.post('http://localhost:3000/save-view', { file, payload });
+        // const res = await axios.get('http://localhost:3000');
         console.log(res);
-        
     } else {
         vscode.postMessage({
             command: 'save-view',
@@ -27,4 +27,4 @@ export async function saveView(file, payload) {
     }
 }
 
-export const saveViewApi = debounceWrapper(saveView, 2000);
\ No newline at end of file
+export const saveViewApi = debounceWrapper(saveView, 1000);
\ No newline at end of file
diff --git a/src/components/toolbar/signal-modal.vue b/src/components/toolbar/signal-modal.vue
index 0fe72d3..b4d0a35 100644
--- a/src/components/toolbar/signal-modal.vue
+++ b/src/components/toolbar/signal-modal.vue
@@ -41,7 +41,9 @@
 
 
 <script setup>
+import { saveViewApi } from '@/api';
 import { globalLookup } from '@/hook/global';
+import { makeSaveViewPayload } from '@/hook/recover';
 import { sidebarSelectedWires } from '@/hook/sidebar-select-wire';
 import { defineComponent, nextTick, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
@@ -67,6 +69,12 @@ function onSignalModalUpdate() {
 
         // 重新渲染
         globalLookup.render();
+
+        // 保存
+        // TODO: 优化：只保存 waves
+        const savePath = globalLookup.originFile + '.view';
+        const payload = makeSaveViewPayload();    
+        saveViewApi(savePath, payload);
     }
 }
 
diff --git a/src/components/toolbar/signal-value-format.vue b/src/components/toolbar/signal-value-format.vue
index 861fa24..807a7e3 100644
--- a/src/components/toolbar/signal-value-format.vue
+++ b/src/components/toolbar/signal-value-format.vue
@@ -24,7 +24,9 @@
 
 
 <script setup>
+import { saveViewApi } from '@/api';
 import { globalLookup } from '@/hook/global';
+import { makeSaveViewPayload } from '@/hook/recover';
 import { sidebarSelectedWires } from '@/hook/sidebar-select-wire';
 import { defineComponent, onMounted, reactive, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
@@ -106,6 +108,12 @@ function onChange() {
 
         // 重新渲染，不过只需要渲染数值即可
         globalLookup.render({ type: 'value' });
+        
+        // 保存
+        // TODO: 优化：只保存 waves
+        const savePath = globalLookup.originFile + '.view';
+        const payload = makeSaveViewPayload();    
+        saveViewApi(savePath, payload);
     }
 }
 
diff --git a/src/hook/recover.js b/src/hook/recover.js
index a87a178..2ca8122 100644
--- a/src/hook/recover.js
+++ b/src/hook/recover.js
@@ -9,20 +9,23 @@ export const recoverConfig = {
      * @type {Map<string, IRenderOption>} 其中的 string 是形如 `cpu.alu.add1` 这样的字符串
      */
     waves: new Map(),
+    /**
+     * @type {WaveRenderSidebarItem[] | undefined}
+     */
     views: undefined
 };
 
 async function findRecoverFile(recoverJsonPath) {
     try {
-        const response = await fetch(recoverJsonPath);
+        const response = await fetch(recoverJsonPath);        
         if (!response.ok) {
             return undefined;
         }
         const recoverBuffer = await response.arrayBuffer();
-        const buffer = Buffer.from(recoverBuffer);
-        const recoverJson = BSON.deserialize(buffer);
+        const recoverJson = BSON.deserialize(recoverBuffer);        
         return recoverJson;
     } catch (error) {
+        console.log('[findRecoverFile] error: ' + error);
         return undefined;
     }
 }
@@ -32,9 +35,7 @@ async function findRecoverFile(recoverJsonPath) {
  * @param {string} inputFile 读取的 vcd 文件的路径
  */
 export async function recoverFromInputFile(inputFile) {
-    globalLookup.originFile = inputFile;
-    console.log(inputFile);
-    
+    globalLookup.originFile = inputFile;    
     const recoverJsonPath = inputFile + '.view';
     const recoverJson = await findRecoverFile(recoverJsonPath);
     if (recoverJson) {
@@ -49,6 +50,11 @@ export async function recoverFromInputFile(inputFile) {
                 recoverConfig.waves.set(name, option);
             }
         }
+
+        const views = recoverJson.views;
+        if (views instanceof Array && views.length > 0) {
+            recoverConfig.views = recoverJson.views;
+        }
     }
 }
 
@@ -77,13 +83,43 @@ export function recoverSession(topModules) {
         if (result) {
             // 找到了 进行渲染设置
             WaveContainerView.add(result);
-            globalLookup.currentSignalRenderOptions.set(result.link, option);
+            globalLookup.currentSignalRenderOptions.set(result.link, option);            
             controller.lastSignal = result;
         } else {
             console.log('fail to recover ' + name);
         }
     }
 
+    // 如果存在 views
+    if (recoverConfig.views !== undefined) {
+        const renderViews = globalLookup.currentWiresRenderView;
+        renderViews.length = 0;
+        for (const view of recoverConfig.views) {
+            // 恢复 names -> link
+            const signalNames = view.signalInfo.link;
+            if (signalNames.includes('.')) {
+                const signal = names2wire(topModules, signalNames);
+                view.signalInfo.link = signal.link;
+            }
+
+            const parentLink = view.signalInfo.parentLink;
+            if (parentLink && parentLink.endsWith('-group')) {
+                const parentNames = parentLink.slice(0, -6);
+                const parentSignal = names2wire(topModules, parentNames);
+                view.signalInfo.parentLink = parentSignal.link + '-group';
+            }
+
+            for (const child of view.children) {
+                const signalNames = child.signalInfo.link;
+                if (signalNames.includes('.')) {
+                    child.signalInfo.link = names2wire(topModules, signalNames).link;
+                }
+            }
+
+            renderViews.push(view);
+        }
+    }
+
     globalLookup.render();
 }
 
@@ -164,8 +200,9 @@ export function makeSaveViewPayload() {
     const views = [];
 
     for (const wire of globalLookup.currentWires) {
-        const option = globalLookup.currentSignalRenderOptions.get(wire.link) || {};
+        const option = globalLookup.currentSignalRenderOptions.get(wire.link) || {};        
         const name = link2names(wire.link);
+        option.highlight = 0;
         waves.push({ name, option });
     }
     for (const view of globalLookup.currentWiresRenderView) {
diff --git a/vue.config.js b/vue.config.js
index a7ee688..5130490 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -14,5 +14,9 @@ module.exports = defineConfig({
     publicPath: './',
     configureWebpack: {
         devtool: false,
+    },
+    devServer: {
+        hot: false,
+        liveReload: false
     }
 })