From 6ada6e79447326f69f8d828fbc439802f4bdd853 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A2=B3=E7=81=B0=E9=9D=A2=E5=8C=85?= <3266919615@qq.com>
Date: Wed, 18 Jun 2025 22:44:40 +0800
Subject: [PATCH] =?UTF-8?q?version=200.11=20=E4=BF=AE=E6=94=B9=E4=BA=86?=
 =?UTF-8?q?=E7=94=B5=E8=A1=A8=E7=9A=84type?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 img_prec.py | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/img_prec.py b/img_prec.py
index 88ce5e9..78e4ad0 100644
--- a/img_prec.py
+++ b/img_prec.py
@@ -69,7 +69,15 @@ def generate_json(wires, components):
         if label == "switch":
             elem["closed"] = False
         elif label == "ammeter":
-            elem["internalResistance"] = 0.1
+            elem["resistance"] = 1
+            elem["type"] = "seriesAmmeter"
+            elem["customLabel"] = "电流表"
+            elem["customDisplayFunction"]: "i => `${i.toFixed(2)} A`"
+        elif label == "voltmeter":
+            elem["resistance"] = 1
+            elem["type"] = "seriesAmmeter"
+            elem["customLabel"] = "电压表"
+            elem["customDisplayFunction"]: "i => `${i.toFixed(2)} V`"
         elif label == "RESISTOR_BOX" or label == "VARIABLE_RESISTOR":
             elem["type"] = "resistor"
             elem["resistorType"] = label
@@ -161,8 +169,8 @@ def visualize_wires_and_components(image, results, components):
         cv2.putText(img, "end", (end[0]+5, end[1]-5), cv2.FONT_HERSHEY_SIMPLEX, 0.4, (255, 0, 0), 1)
 
     # ==== 画元件框 ====
-    labels = {"微安电流表": "ammeter",
-              "待测表头": "ammeter",
+    labels = {"微安电流表": "seriesAmmeter",
+              "待测表头": "seriesAmmeter",
               "电阻箱": "RESISTOR_BOX",
               "滑动变阻器": "VARIABLE_RESISTOR",
               "单刀双掷开关": "switch",