From 4c43e77818b970e286e8f01ae29d3604eb906803 Mon Sep 17 00:00:00 2001
From: Stefan Frederik <stefan.schippers@gmail.com>
Date: Mon, 24 Oct 2022 17:28:39 +0200
Subject: [PATCH] eliminated hide=true attribute for backannotation
 current/voltage texts (will be hidden anyway if no sim data is loaded)

---
 xschem_library/devices/ammeter.sym       |  3 +--
 xschem_library/devices/lab_pin.sym       |  2 +-
 xschem_library/devices/lab_wire.sym      |  2 +-
 xschem_library/devices/vcvs.sym          |  4 +++-
 xschem_library/devices/vsource.sym       |  3 +--
 xschem_library/devices/vsource_arith.sym |  3 +--
 xschem_library/examples/classD_amp.sch   | 13 ++++++-------
 7 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/xschem_library/devices/ammeter.sym b/xschem_library/devices/ammeter.sym
index 3b6c7271..1c836cf8 100644
--- a/xschem_library/devices/ammeter.sym
+++ b/xschem_library/devices/ammeter.sym
@@ -16,5 +16,4 @@ B 5 -2.5 27.5 2.5 32.5 {name=minus dir=inout propag=0}
 T {@name} 15 -18.75 0 0 0.2 0.2 {}
 T {@#0:net_name} 10 -28.75 0 0 0.15 0.15 {layer=15}
 T {@#1:net_name} 10 20 0 0 0.15 0.15 {layer=15}
-T {@spice_get_current} 2.5 7.5 0 0 0.2 0.2 {layer=15
-hide=true}
+T {@spice_get_current} 2.5 7.5 0 0 0.2 0.2 {layer=15}
diff --git a/xschem_library/devices/lab_pin.sym b/xschem_library/devices/lab_pin.sym
index 27b7a3ef..d8f1895d 100644
--- a/xschem_library/devices/lab_pin.sym
+++ b/xschem_library/devices/lab_pin.sym
@@ -9,4 +9,4 @@ S {}
 E {}
 B 5 -1.25 -1.25 1.25 1.25 {name=p dir=in}
 T {@lab} -7.5 -8.125 0 1 0.33 0.33 {}
-T {@spice_get_voltage} 1.875 3.90625 0 0 0.2 0.2 {layer=15 hide=true}
+T {@spice_get_voltage} 1.875 3.90625 0 0 0.2 0.2 {layer=15}
diff --git a/xschem_library/devices/lab_wire.sym b/xschem_library/devices/lab_wire.sym
index 48142477..149991ba 100644
--- a/xschem_library/devices/lab_wire.sym
+++ b/xschem_library/devices/lab_wire.sym
@@ -9,4 +9,4 @@ S {}
 E {}
 B 5 -1.25 -1.25 1.25 1.25 {name=p dir=in}
 T {@lab} -2.5 -1.25 2 0 0.27 0.27 {}
-T {@spice_get_voltage} 1.875 10.15625 0 0 0.2 0.2 {vcenter=true layer=15 hide=true}
+T {@spice_get_voltage} 1.875 10.15625 0 0 0.2 0.2 {vcenter=true layer=15}
diff --git a/xschem_library/devices/vcvs.sym b/xschem_library/devices/vcvs.sym
index 97cb2da7..098c2b5b 100644
--- a/xschem_library/devices/vcvs.sym
+++ b/xschem_library/devices/vcvs.sym
@@ -1,4 +1,5 @@
-v {xschem version=2.9.8 file_version=1.2}
+v {xschem version=3.1.0 file_version=1.2
+}
 G {}
 K {type=vcvs
 format="@name @pinlist @value"
@@ -29,3 +30,4 @@ T {@#0:net_name} 5 -42.5 0 0 0.15 0.15 {layer=15}
 T {@#1:net_name} 5 32.5 0 0 0.15 0.15 {layer=15}
 T {@#2:net_name} -45 -32.5 0 1 0.15 0.15 {layer=15}
 T {@#3:net_name} -45 22.5 0 1 0.15 0.15 {layer=15}
+T {@spice_get_current} 20 -6.25 0 0 0.2 0.2 {layer=15}
diff --git a/xschem_library/devices/vsource.sym b/xschem_library/devices/vsource.sym
index dbb05e9e..3b79b3cd 100644
--- a/xschem_library/devices/vsource.sym
+++ b/xschem_library/devices/vsource.sym
@@ -18,5 +18,4 @@ T {@name} 20 -18.75 0 0 0.2 0.2 {}
 T {@value} 20 6.25 0 0 0.2 0.2 {}
 T {@#0:net_name} 10 -28.75 0 0 0.15 0.15 {layer=15}
 T {@#1:net_name} 10 20 0 0 0.15 0.15 {layer=15}
-T {@spice_get_current} 20 -6.25 0 0 0.2 0.2 {layer=15
-hide=true}
+T {@spice_get_current} 20 -6.25 0 0 0.2 0.2 {layer=15}
diff --git a/xschem_library/devices/vsource_arith.sym b/xschem_library/devices/vsource_arith.sym
index 6fb537ec..75bada81 100644
--- a/xschem_library/devices/vsource_arith.sym
+++ b/xschem_library/devices/vsource_arith.sym
@@ -18,5 +18,4 @@ T {@VOL} 20 0 0 0 0.2 0.2 {}
 T {@name} 20 -17.5 0 0 0.2 0.2 {}
 T {@#0:net_name} 5 -42.5 0 0 0.15 0.15 {layer=15}
 T {@#1:net_name} 5 32.5 0 0 0.15 0.15 {layer=15}
-T {@spice_get_current} 12.5 15 0 0 0.2 0.2 {layer=15
-hide=true}
+T {@spice_get_current} 12.5 15 0 0 0.2 0.2 {layer=15}
diff --git a/xschem_library/examples/classD_amp.sch b/xschem_library/examples/classD_amp.sch
index 5b2aa938..14957168 100644
--- a/xschem_library/examples/classD_amp.sch
+++ b/xschem_library/examples/classD_amp.sch
@@ -11,8 +11,8 @@ L 2 1000 -540 1000 -340 {dash=2}
 L 2 950 -540 950 -340 {dash=2}
 L 2 880 -540 880 -340 {dash=2}
 L 2 890 -540 890 -340 {dash=2}
-L 3 50 -1350 390 -1350 {}
-L 3 920 -1350 1360 -1350 {}
+L 3 30 -1220 370 -1220 {}
+L 3 900 -1220 1240 -1220 {}
 L 4 475 -210 480 -250 {}
 L 4 480 -250 485 -210 {}
 L 4 30 -865 30 -765 {dash=1}
@@ -190,7 +190,7 @@ T {10} 25 -850 0 1 0.2 0.2 {}
 T {10} 25 -1170 0 1 0.2 0.2 {}
 T {DRIVED} 135 -805 0 0 0.2 0.2 {}
 T {DRIVEU} 130 -1125 0 0 0.2 0.2 {}
-T {Class D amplifier } 430 -1380 0 0 1 1 {}
+T {Class D amplifier } 410 -1250 0 0 1 1 {}
 T {-10} 25 -780 0 1 0.2 0.2 {}
 T {-10} 25 -1100 0 1 0.2 0.2 {}
 N 460 -1020 460 -1000 {lab=#net1}
@@ -384,9 +384,8 @@ C {lab_pin.sym} 190 -590 0 0 {name=p12 lab=VNN}
 C {vsource.sym} 70 -400 0 0 {name=VVSS value=0}
 C {lab_pin.sym} 70 -350 0 0 {name=p13 lab=0}
 C {lab_pin.sym} 70 -450 0 0 {name=p14 lab=VSS}
-C {launcher.sym} 1480 -110 0 0 {name=h5 
-descr="Select arrow and 
-Ctrl-Left-Click to load/unload waveforms" 
+C {launcher.sym} 1000 -130 0 0 {name=h5 
+descr="Reload waveforms" 
 tclcommand="
 xschem raw_read $netlist_dir/[file tail [file rootname [xschem get current_name]]].raw
 "
@@ -420,7 +419,7 @@ C {lab_pin.sym} 940 -920 0 1 {name=p4 lab=OUT_LPF}
 C {lab_pin.sym} 780 -810 0 0 {name=p7 lab=VSS}
 C {res.sym} 900 -860 0 1 {name=R4 m=1 value=8}
 C {lab_pin.sym} 900 -810 0 0 {name=p8 lab=VSS}
-C {launcher.sym} 1120 -110 0 0 {name=h1 
+C {launcher.sym} 1000 -90 0 0 {name=h1 
 descr="Netlist + Simulate
 Ctrl-Left-Click" 
 tclcommand="xschem netlist; xschem simulate"