From 430a09a5a0c4f72ae6d2641c638bf66374c735aa Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Sun, 20 Nov 2016 15:19:06 +0100 Subject: [PATCH] sch legacy plugin: fix compatibility issues with old library 2.2 version --- demos/electric/electric-cache.lib | 440 +++++++++++++++--------------- demos/electric/electric.sch | 60 ++-- eeschema/sch_legacy_plugin.cpp | 7 +- 3 files changed, 252 insertions(+), 255 deletions(-) diff --git a/demos/electric/electric-cache.lib b/demos/electric/electric-cache.lib index 8db5798f1d..d31b655e82 100644 --- a/demos/electric/electric-cache.lib +++ b/demos/electric/electric-cache.lib @@ -6,16 +6,16 @@ EESchema-LIBRARY Version 2.3 DEF A_1KVA EA 0 10 N Y 1 F N F0 "EA" -90 200 40 H V C CNN F1 "A_1KVA" 0 130 40 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN +F2 "" 0 0 60 H I C CNN +F3 "" 0 0 60 H I C CNN DRAW -P 2 0 0 0 200 -200 200 -200 N +P 2 0 0 0 200 -200 200 -200 N C -20 10 31 0 1 0 N C 20 10 31 0 1 0 N S -120 60 120 -60 0 1 0 N -P 4 0 1 0 -100 0 -80 10 -50 10 -50 10 N -P 4 0 1 0 50 10 80 10 100 0 100 0 N -P 5 0 1 0 0 -30 -20 -50 20 -50 0 -30 0 -30 F +P 4 0 1 0 -100 0 -80 10 -50 10 -50 10 N +P 4 0 1 0 50 10 80 10 100 0 100 0 N +P 5 0 1 0 0 -30 -20 -50 20 -50 0 -30 0 -30 F X ~ 1 200 0 100 L 10 40 1 1 w X ~ 2 -200 0 100 R 10 40 1 1 w X ~ 3 0 -100 50 U 10 50 1 1 I @@ -27,16 +27,16 @@ ENDDEF DEF C_3x1.5mm2 EC 0 10 N Y 1 F N F0 "EC" -170 130 40 H V C CNN F1 "C_3x1.5mm2" 0 -100 40 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN +F2 "" 0 0 60 H I C CNN +F3 "" 0 0 60 H I C CNN DRAW -P 2 0 0 0 200 -200 200 -200 N +P 2 0 0 0 200 -200 200 -200 N C -30 50 10 0 1 0 F -P 3 0 1 0 -130 50 -90 50 -90 50 N -P 3 0 1 0 -110 50 -30 -50 -30 -50 N -P 3 0 1 0 -30 50 50 -50 50 -50 N -P 3 0 1 0 10 50 90 -50 90 -50 N -P 4 0 1 0 -100 0 100 0 100 0 100 0 N +P 3 0 1 0 -130 50 -90 50 -90 50 N +P 3 0 1 0 -110 50 -30 -50 -30 -50 N +P 3 0 1 0 -30 50 50 -50 50 -50 N +P 3 0 1 0 10 50 90 -50 90 -50 N +P 4 0 1 0 -100 0 100 0 100 0 100 0 N X ~ 1 200 0 100 L 10 40 1 1 W X ~ 2 -200 0 100 R 10 40 1 1 w ENDDRAW @@ -47,16 +47,16 @@ ENDDEF DEF C_3x2.5mm2 EC 0 10 N Y 1 F N F0 "EC" -170 130 40 H V C CNN F1 "C_3x2.5mm2" 0 -100 40 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN +F2 "" 0 0 60 H I C CNN +F3 "" 0 0 60 H I C CNN DRAW -P 2 0 0 0 200 -200 200 -200 N +P 2 0 0 0 200 -200 200 -200 N C -30 50 10 0 1 0 F -P 3 0 1 0 -130 50 -90 50 -90 50 N -P 3 0 1 0 -110 50 -30 -50 -30 -50 N -P 3 0 1 0 -30 50 50 -50 50 -50 N -P 3 0 1 0 10 50 90 -50 90 -50 N -P 4 0 1 0 -100 0 100 0 100 0 100 0 N +P 3 0 1 0 -130 50 -90 50 -90 50 N +P 3 0 1 0 -110 50 -30 -50 -30 -50 N +P 3 0 1 0 -30 50 50 -50 50 -50 N +P 3 0 1 0 10 50 90 -50 90 -50 N +P 4 0 1 0 -100 0 100 0 100 0 100 0 N X ~ 1 200 0 100 L 10 40 1 1 W X ~ 2 -200 0 100 R 10 40 1 1 w ENDDRAW @@ -67,16 +67,16 @@ ENDDEF DEF C_3x6mm2 EC 0 10 N Y 1 F N F0 "EC" -170 130 40 H V C CNN F1 "C_3x6mm2" 0 -100 40 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN +F2 "" 0 0 60 H I C CNN +F3 "" 0 0 60 H I C CNN DRAW -P 2 0 0 0 200 -200 200 -200 N +P 2 0 0 0 200 -200 200 -200 N C -30 50 10 0 1 0 F -P 3 0 1 0 -130 50 -90 50 -90 50 N -P 3 0 1 0 -110 50 -30 -50 -30 -50 N -P 3 0 1 0 -30 50 50 -50 50 -50 N -P 3 0 1 0 10 50 90 -50 90 -50 N -P 4 0 1 0 -100 0 100 0 100 0 100 0 N +P 3 0 1 0 -130 50 -90 50 -90 50 N +P 3 0 1 0 -110 50 -30 -50 -30 -50 N +P 3 0 1 0 -30 50 50 -50 50 -50 N +P 3 0 1 0 10 50 90 -50 90 -50 N +P 4 0 1 0 -100 0 100 0 100 0 100 0 N X ~ 1 200 0 100 L 10 40 1 1 W X ~ 2 -200 0 100 R 10 40 1 1 w ENDDRAW @@ -87,13 +87,13 @@ ENDDEF DEF D_06A ED 0 10 N Y 1 F N F0 "ED" -160 120 40 H V C CNN F1 "D_06A" -100 -80 40 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN +F2 "" 0 0 60 H I C CNN +F3 "" 0 0 60 H I C CNN DRAW -P 2 0 0 0 200 -200 200 -200 N -P 3 0 1 0 -100 0 60 100 60 100 N -P 3 0 1 0 60 20 100 -20 100 -20 N -P 3 0 1 0 100 20 60 -20 60 -20 N +P 2 0 0 0 200 -200 200 -200 N +P 3 0 1 0 -100 0 60 100 60 100 N +P 3 0 1 0 60 20 100 -20 100 -20 N +P 3 0 1 0 100 20 60 -20 60 -20 N X ~ 1 200 0 120 L 10 40 1 1 W X ~ 2 -200 0 100 R 10 40 1 1 w ENDDRAW @@ -104,13 +104,13 @@ ENDDEF DEF D_10A ED 0 10 N Y 1 F N F0 "ED" -160 120 40 H V C CNN F1 "D_10A" -100 -80 40 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN +F2 "" 0 0 60 H I C CNN +F3 "" 0 0 60 H I C CNN DRAW -P 2 0 0 0 200 -200 200 -200 N -P 3 0 1 0 -100 0 60 100 60 100 N -P 3 0 1 0 60 20 100 -20 100 -20 N -P 3 0 1 0 100 20 60 -20 60 -20 N +P 2 0 0 0 200 -200 200 -200 N +P 3 0 1 0 -100 0 60 100 60 100 N +P 3 0 1 0 60 20 100 -20 100 -20 N +P 3 0 1 0 100 20 60 -20 60 -20 N X ~ 1 200 0 120 L 10 40 1 1 W X ~ 2 -200 0 100 R 10 40 1 1 w ENDDRAW @@ -121,13 +121,13 @@ ENDDEF DEF D_16A ED 0 10 N Y 1 F N F0 "ED" -160 120 40 H V C CNN F1 "D_16A" -100 -80 40 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN +F2 "" 0 0 60 H I C CNN +F3 "" 0 0 60 H I C CNN DRAW -P 2 0 0 0 200 -200 200 -200 N -P 3 0 1 0 -100 0 60 100 60 100 N -P 3 0 1 0 60 20 100 -20 100 -20 N -P 3 0 1 0 100 20 60 -20 60 -20 N +P 2 0 0 0 200 -200 200 -200 N +P 3 0 1 0 -100 0 60 100 60 100 N +P 3 0 1 0 60 20 100 -20 100 -20 N +P 3 0 1 0 100 20 60 -20 60 -20 N X ~ 1 200 0 120 L 10 40 1 1 W X ~ 2 -200 0 100 R 10 40 1 1 w ENDDRAW @@ -138,13 +138,13 @@ ENDDEF DEF D_32A ED 0 10 N Y 1 F N F0 "ED" -160 120 40 H V C CNN F1 "D_32A" -100 -80 40 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN +F2 "" 0 0 60 H I C CNN +F3 "" 0 0 60 H I C CNN DRAW -P 2 0 0 0 200 -200 200 -200 N -P 3 0 1 0 -100 0 60 100 60 100 N -P 3 0 1 0 60 20 100 -20 100 -20 N -P 3 0 1 0 100 20 60 -20 60 -20 N +P 2 0 0 0 200 -200 200 -200 N +P 3 0 1 0 -100 0 60 100 60 100 N +P 3 0 1 0 60 20 100 -20 100 -20 N +P 3 0 1 0 100 20 60 -20 60 -20 N X ~ 1 200 0 120 L 10 40 1 1 W X ~ 2 -200 0 100 R 10 40 1 1 w ENDDRAW @@ -155,11 +155,11 @@ ENDDEF DEF G_Th_3KVA EG 0 10 N Y 1 F N F0 "EG" -160 120 40 H V C CNN F1 "G_Th_3KVA" 0 -120 40 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN +F2 "" 0 0 60 H I C CNN +F3 "" 0 0 60 H I C CNN DRAW -T 0 0 0 70 0 0 0 G Normal 0 C C -P 2 0 0 0 200 -200 200 -200 N +T 0 0 0 70 0 0 0 G Normal 0 C C +P 2 0 0 0 200 -200 200 -200 N C 0 0 84 0 1 0 N X ~ 1 200 0 118 L 10 40 1 1 w ENDDRAW @@ -170,14 +170,14 @@ ENDDEF DEF I_25A_LUM EI 0 10 N Y 1 F N F0 "EI" -160 120 40 H V C CNN F1 "I_25A_LUM" 0 -100 40 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN +F2 "" 0 0 60 H I C CNN +F3 "" 0 0 60 H I C CNN DRAW -P 2 0 0 0 200 -200 200 -200 N +P 2 0 0 0 200 -200 200 -200 N C 0 0 36 0 1 0 N -P 3 0 1 0 -100 0 60 100 60 100 N -P 3 0 1 0 30 20 -30 -20 -30 -20 N -P 4 0 1 0 -20 30 20 -30 20 -30 20 -30 N +P 3 0 1 0 -100 0 60 100 60 100 N +P 3 0 1 0 30 20 -30 -20 -30 -20 N +P 4 0 1 0 -20 30 20 -30 20 -30 20 -30 N X ~ 1 200 0 120 L 10 40 1 1 W X ~ 2 -200 0 100 R 10 40 1 1 w ENDDRAW @@ -188,20 +188,20 @@ ENDDEF DEF J_40A_30mA EJ 0 10 N Y 1 F N F0 "EJ" -210 180 40 H V C CNN F1 "J_40A_30mA" -20 -120 40 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN +F2 "" 0 0 60 H I C CNN +F3 "" 0 0 60 H I C CNN DRAW -T 0 120 200 20 0 0 0 OFS Normal 0 C C -P 2 0 0 0 200 -200 200 -200 N -P 5 0 0 0 120 20 120 -20 120 -20 120 -20 120 -20 N +T 0 120 200 20 0 0 0 OFS Normal 0 C C +P 2 0 0 0 200 -200 200 -200 N +P 5 0 0 0 120 20 120 -20 120 -20 120 -20 120 -20 N A -120 60 20 1799 1 0 1 0 N -140 60 -100 60 -P 3 0 1 0 -140 0 -60 0 -60 0 N -P 3 0 1 0 -140 60 -140 -60 -140 -60 N -P 3 0 1 0 -60 0 100 100 100 100 N -P 5 0 1 0 -140 -60 -100 -60 -100 -60 -100 -60 -100 -60 N -P 5 0 1 0 -100 60 -100 -60 -100 -40 -100 -40 -100 -40 N -P 6 0 1 0 -120 80 -120 120 40 120 40 60 40 60 40 60 N -P 10 0 1 0 60 80 60 200 80 200 80 220 160 220 180 200 160 180 80 180 80 200 80 200 N +P 3 0 1 0 -140 0 -60 0 -60 0 N +P 3 0 1 0 -140 60 -140 -60 -140 -60 N +P 3 0 1 0 -60 0 100 100 100 100 N +P 5 0 1 0 -140 -60 -100 -60 -100 -60 -100 -60 -100 -60 N +P 5 0 1 0 -100 60 -100 -60 -100 -40 -100 -40 -100 -40 N +P 6 0 1 0 -120 80 -120 120 40 120 40 60 40 60 40 60 N +P 10 0 1 0 60 80 60 200 80 200 80 220 160 220 180 200 160 180 80 180 80 200 80 200 N X ~ 1 250 0 130 L 10 40 1 1 W X ~ 2 -250 0 110 R 10 40 1 1 w X ~ 3 250 200 70 L 10 10 1 1 O @@ -213,36 +213,36 @@ ENDDEF DEF O_600VA EO 0 10 N Y 1 F N F0 "EO" -70 120 40 H V C CNN F1 "O_600VA" -40 -150 40 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN +F2 "" 0 0 60 H I C CNN +F3 "" 0 0 60 H I C CNN DRAW -P 2 0 0 0 200 -200 200 -200 N +P 2 0 0 0 200 -200 200 -200 N C -20 0 31 0 1 0 N C 20 0 31 0 1 0 N S -110 40 120 -90 0 1 0 N -P 3 0 1 0 -100 0 -50 0 -50 0 N -P 3 0 1 0 -90 -50 -90 -70 -90 -70 N -P 3 0 1 0 -80 -40 -80 -80 -80 -80 N -P 3 0 1 0 -70 -50 -70 -70 -70 -70 N -P 3 0 1 0 -60 -40 -60 -80 -60 -80 N -P 3 0 1 0 -50 -50 -50 -70 -50 -70 N -P 3 0 1 0 -40 -40 -40 -80 -40 -80 N -P 3 0 1 0 -30 -50 -30 -70 -30 -70 N -P 3 0 1 0 -20 -40 -20 -80 -20 -80 N -P 3 0 1 0 -10 -50 -10 -70 -10 -70 N -P 3 0 1 0 0 -40 0 -80 0 -80 N -P 3 0 1 0 10 -50 10 -70 10 -70 N -P 3 0 1 0 20 -40 20 -80 20 -80 N -P 3 0 1 0 30 -50 30 -70 30 -70 N -P 3 0 1 0 40 -40 40 -80 40 -80 N -P 3 0 1 0 50 -50 50 -70 50 -70 N -P 3 0 1 0 50 0 100 0 100 0 N -P 3 0 1 0 60 -40 60 -80 60 -80 N -P 3 0 1 0 70 -50 70 -70 70 -70 N -P 3 0 1 0 80 -40 80 -80 80 -80 N -P 3 0 1 0 100 -40 100 -80 100 -80 N -P 4 0 1 0 90 -50 90 -70 90 -70 90 -70 N -P 5 0 1 0 -100 -60 100 -60 100 -60 100 -60 100 -60 N +P 3 0 1 0 -100 0 -50 0 -50 0 N +P 3 0 1 0 -90 -50 -90 -70 -90 -70 N +P 3 0 1 0 -80 -40 -80 -80 -80 -80 N +P 3 0 1 0 -70 -50 -70 -70 -70 -70 N +P 3 0 1 0 -60 -40 -60 -80 -60 -80 N +P 3 0 1 0 -50 -50 -50 -70 -50 -70 N +P 3 0 1 0 -40 -40 -40 -80 -40 -80 N +P 3 0 1 0 -30 -50 -30 -70 -30 -70 N +P 3 0 1 0 -20 -40 -20 -80 -20 -80 N +P 3 0 1 0 -10 -50 -10 -70 -10 -70 N +P 3 0 1 0 0 -40 0 -80 0 -80 N +P 3 0 1 0 10 -50 10 -70 10 -70 N +P 3 0 1 0 20 -40 20 -80 20 -80 N +P 3 0 1 0 30 -50 30 -70 30 -70 N +P 3 0 1 0 40 -40 40 -80 40 -80 N +P 3 0 1 0 50 -50 50 -70 50 -70 N +P 3 0 1 0 50 0 100 0 100 0 N +P 3 0 1 0 60 -40 60 -80 60 -80 N +P 3 0 1 0 70 -50 70 -70 70 -70 N +P 3 0 1 0 80 -40 80 -80 80 -80 N +P 3 0 1 0 100 -40 100 -80 100 -80 N +P 4 0 1 0 90 -50 90 -70 90 -70 90 -70 N +P 5 0 1 0 -100 -60 100 -60 100 -60 100 -60 100 -60 N X ~ 1 200 0 100 L 10 40 1 1 W X ~ 2 -200 0 100 R 10 40 1 1 w ENDDRAW @@ -253,36 +253,36 @@ ENDDEF DEF O_900VA EO 0 10 N Y 1 F N F0 "EO" -70 120 40 H V C CNN F1 "O_900VA" -40 -150 40 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN +F2 "" 0 0 60 H I C CNN +F3 "" 0 0 60 H I C CNN DRAW -P 2 0 0 0 200 -200 200 -200 N +P 2 0 0 0 200 -200 200 -200 N C -20 0 31 0 1 0 N C 20 0 31 0 1 0 N S -110 40 120 -90 0 1 0 N -P 3 0 1 0 -100 0 -50 0 -50 0 N -P 3 0 1 0 -90 -50 -90 -70 -90 -70 N -P 3 0 1 0 -80 -40 -80 -80 -80 -80 N -P 3 0 1 0 -70 -50 -70 -70 -70 -70 N -P 3 0 1 0 -60 -40 -60 -80 -60 -80 N -P 3 0 1 0 -50 -50 -50 -70 -50 -70 N -P 3 0 1 0 -40 -40 -40 -80 -40 -80 N -P 3 0 1 0 -30 -50 -30 -70 -30 -70 N -P 3 0 1 0 -20 -40 -20 -80 -20 -80 N -P 3 0 1 0 -10 -50 -10 -70 -10 -70 N -P 3 0 1 0 0 -40 0 -80 0 -80 N -P 3 0 1 0 10 -50 10 -70 10 -70 N -P 3 0 1 0 20 -40 20 -80 20 -80 N -P 3 0 1 0 30 -50 30 -70 30 -70 N -P 3 0 1 0 40 -40 40 -80 40 -80 N -P 3 0 1 0 50 -50 50 -70 50 -70 N -P 3 0 1 0 50 0 100 0 100 0 N -P 3 0 1 0 60 -40 60 -80 60 -80 N -P 3 0 1 0 70 -50 70 -70 70 -70 N -P 3 0 1 0 80 -40 80 -80 80 -80 N -P 3 0 1 0 100 -40 100 -80 100 -80 N -P 4 0 1 0 90 -50 90 -70 90 -70 90 -70 N -P 5 0 1 0 -100 -60 100 -60 100 -60 100 -60 100 -60 N +P 3 0 1 0 -100 0 -50 0 -50 0 N +P 3 0 1 0 -90 -50 -90 -70 -90 -70 N +P 3 0 1 0 -80 -40 -80 -80 -80 -80 N +P 3 0 1 0 -70 -50 -70 -70 -70 -70 N +P 3 0 1 0 -60 -40 -60 -80 -60 -80 N +P 3 0 1 0 -50 -50 -50 -70 -50 -70 N +P 3 0 1 0 -40 -40 -40 -80 -40 -80 N +P 3 0 1 0 -30 -50 -30 -70 -30 -70 N +P 3 0 1 0 -20 -40 -20 -80 -20 -80 N +P 3 0 1 0 -10 -50 -10 -70 -10 -70 N +P 3 0 1 0 0 -40 0 -80 0 -80 N +P 3 0 1 0 10 -50 10 -70 10 -70 N +P 3 0 1 0 20 -40 20 -80 20 -80 N +P 3 0 1 0 30 -50 30 -70 30 -70 N +P 3 0 1 0 40 -40 40 -80 40 -80 N +P 3 0 1 0 50 -50 50 -70 50 -70 N +P 3 0 1 0 50 0 100 0 100 0 N +P 3 0 1 0 60 -40 60 -80 60 -80 N +P 3 0 1 0 70 -50 70 -70 70 -70 N +P 3 0 1 0 80 -40 80 -80 80 -80 N +P 3 0 1 0 100 -40 100 -80 100 -80 N +P 4 0 1 0 90 -50 90 -70 90 -70 90 -70 N +P 5 0 1 0 -100 -60 100 -60 100 -60 100 -60 100 -60 N X ~ 1 200 0 100 L 10 40 1 1 W X ~ 2 -200 0 100 R 10 40 1 1 w ENDDRAW @@ -293,11 +293,11 @@ ENDDEF DEF P_10A EP 0 10 N Y 1 F N F0 "EP" -160 120 40 H V C CNN F1 "P_10A" -80 -140 40 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN +F2 "" 0 0 60 H I C CNN +F3 "" 0 0 60 H I C CNN DRAW A 0 0 80 891 -891 0 0 0 N 1 80 1 -80 -P 2 0 0 0 200 -200 200 -200 N +P 2 0 0 0 200 -200 200 -200 N X ~ 1 200 0 120 L 10 40 1 1 W ENDDRAW ENDDEF @@ -307,19 +307,19 @@ ENDDEF DEF Q_25A_2F2O EQ 0 10 N Y 1 F N F0 "EQ" -160 120 40 H V C CNN F1 "Q_25A_2F2O" 0 -140 40 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN +F2 "" 0 0 60 H I C CNN +F3 "" 0 0 60 H I C CNN DRAW -T 0 90 150 20 0 0 0 O+F Normal 0 C C +T 0 90 150 20 0 0 0 O+F Normal 0 C C S -100 -30 100 -70 0 0 0 N -P 2 0 0 0 200 -200 200 -200 N -P 3 0 0 0 0 60 0 -60 0 -60 N -P 3 0 0 0 20 100 20 60 20 60 N -P 3 0 0 0 40 100 40 90 40 90 N -P 4 0 0 0 -100 -30 -100 -30 100 -70 100 -70 N -P 3 0 1 0 -100 0 60 100 60 100 N -P 5 0 1 0 20 60 20 50 100 50 100 50 100 50 N -P 12 0 1 0 40 100 40 150 50 150 50 160 50 170 120 170 140 150 120 130 60 130 50 130 50 150 50 150 N +P 2 0 0 0 200 -200 200 -200 N +P 3 0 0 0 0 60 0 -60 0 -60 N +P 3 0 0 0 20 100 20 60 20 60 N +P 3 0 0 0 40 100 40 90 40 90 N +P 4 0 0 0 -100 -30 -100 -30 100 -70 100 -70 N +P 3 0 1 0 -100 0 60 100 60 100 N +P 5 0 1 0 20 60 20 50 100 50 100 50 100 50 N +P 12 0 1 0 40 100 40 150 50 150 50 160 50 170 120 170 140 150 120 130 60 130 50 130 50 150 50 150 N X ~ 1 -200 0 100 R 10 40 1 1 U X ~ 2 200 50 100 L 10 40 1 1 U X ~ 3 200 0 120 L 10 40 1 1 U @@ -333,25 +333,25 @@ ENDDEF DEF Q_2A_12O_40KV EQ 0 10 N Y 1 F N F0 "EQ" -160 120 40 H V C CNN F1 "Q_2A_12O_40KV" 0 -730 40 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN +F2 "" 0 0 60 H I C CNN +F3 "" 0 0 60 H I C CNN DRAW S -100 -580 100 -620 0 0 0 N -P 2 0 0 0 200 -200 200 -200 N -P 4 0 0 0 -100 -580 -100 -580 100 -620 100 -620 N -P 3 0 1 0 -100 -550 80 -520 80 -520 N -P 3 0 1 0 -100 -500 80 -470 80 -470 N -P 3 0 1 0 -100 -450 80 -420 80 -420 N -P 3 0 1 0 -100 -400 80 -370 80 -370 N -P 3 0 1 0 -100 -350 80 -320 80 -320 N -P 3 0 1 0 -100 -300 80 -270 80 -270 N -P 3 0 1 0 -100 -250 80 -220 80 -220 N -P 3 0 1 0 -100 -200 80 -170 80 -170 N -P 3 0 1 0 -100 -150 80 -120 80 -120 N -P 3 0 1 0 -100 -100 80 -70 80 -70 N -P 3 0 1 0 0 -580 0 20 0 20 N -P 5 0 1 0 -100 0 80 30 80 30 80 30 80 30 N -P 6 0 1 0 -100 -50 80 -20 80 -20 80 -20 80 -20 80 -20 N +P 2 0 0 0 200 -200 200 -200 N +P 4 0 0 0 -100 -580 -100 -580 100 -620 100 -620 N +P 3 0 1 0 -100 -550 80 -520 80 -520 N +P 3 0 1 0 -100 -500 80 -470 80 -470 N +P 3 0 1 0 -100 -450 80 -420 80 -420 N +P 3 0 1 0 -100 -400 80 -370 80 -370 N +P 3 0 1 0 -100 -350 80 -320 80 -320 N +P 3 0 1 0 -100 -300 80 -270 80 -270 N +P 3 0 1 0 -100 -250 80 -220 80 -220 N +P 3 0 1 0 -100 -200 80 -170 80 -170 N +P 3 0 1 0 -100 -150 80 -120 80 -120 N +P 3 0 1 0 -100 -100 80 -70 80 -70 N +P 3 0 1 0 0 -580 0 20 0 20 N +P 5 0 1 0 -100 0 80 30 80 30 80 30 80 30 N +P 6 0 1 0 -100 -50 80 -20 80 -20 80 -20 80 -20 80 -20 N X ~ 1 -200 0 100 R 10 40 1 1 U X ~ 2 200 0 120 L 10 40 1 1 U X ~ 3 -200 -50 100 R 10 50 1 1 U @@ -386,25 +386,25 @@ ENDDEF DEF R_16A_30mA ER 0 10 N Y 1 F N F0 "ER" -210 180 40 H V C CNN F1 "R_16A_30mA" 0 -200 40 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN +F2 "" 0 0 60 H I C CNN +F3 "" 0 0 60 H I C CNN DRAW -T 0 20 -100 50 0 0 0 M Normal 0 C C -T 0 120 200 20 0 0 0 OF Normal 0 C C -P 2 0 0 0 200 -200 200 -200 N -P 2 0 0 0 400 -200 400 -200 N -P 3 0 0 0 20 -50 20 50 20 50 N +T 0 20 -100 50 0 0 0 M Normal 0 C C +T 0 120 200 20 0 0 0 OF Normal 0 C C +P 2 0 0 0 200 -200 200 -200 N +P 2 0 0 0 400 -200 400 -200 N +P 3 0 0 0 20 -50 20 50 20 50 N A -120 60 20 1799 1 0 1 0 N -140 60 -100 60 C 20 -100 50 0 1 0 N -P 3 0 1 0 -140 0 -60 0 -60 0 N -P 3 0 1 0 -140 60 -140 -60 -140 -60 N -P 3 0 1 0 -60 0 100 100 100 100 N -P 3 0 1 0 140 20 100 -20 100 -20 N -P 4 0 1 0 100 20 140 -20 140 -20 140 -20 N -P 5 0 1 0 -140 -60 -100 -60 -100 -60 -100 -60 -100 -60 N -P 5 0 1 0 -100 60 -100 -60 -100 -40 -100 -40 -100 -40 N -P 6 0 1 0 -120 80 -120 120 40 120 40 60 40 60 40 60 N -P 10 0 1 0 60 80 60 200 80 200 80 220 160 220 180 200 160 180 80 180 80 200 80 200 N +P 3 0 1 0 -140 0 -60 0 -60 0 N +P 3 0 1 0 -140 60 -140 -60 -140 -60 N +P 3 0 1 0 -60 0 100 100 100 100 N +P 3 0 1 0 140 20 100 -20 100 -20 N +P 4 0 1 0 100 20 140 -20 140 -20 140 -20 N +P 5 0 1 0 -140 -60 -100 -60 -100 -60 -100 -60 -100 -60 N +P 5 0 1 0 -100 60 -100 -60 -100 -40 -100 -40 -100 -40 N +P 6 0 1 0 -120 80 -120 120 40 120 40 60 40 60 40 60 N +P 10 0 1 0 60 80 60 200 80 200 80 220 160 220 180 200 160 180 80 180 80 200 80 200 N X ~ 1 250 0 130 L 10 40 1 1 W X ~ 2 -250 0 110 R 10 40 1 1 w X ~ 3 250 200 70 L 10 10 1 1 O @@ -417,23 +417,23 @@ ENDDEF DEF S_63A ES 0 10 N Y 1 F N F0 "ES" -210 180 40 H V C CNN F1 "S_63A" 0 -110 40 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN +F2 "" 0 0 60 H I C CNN +F3 "" 0 0 60 H I C CNN DRAW -T 0 120 200 20 0 0 0 OFS Normal 0 C C -P 2 0 0 0 200 -200 200 -200 N -P 2 0 0 0 400 -200 400 -200 N -P 3 0 0 0 -150 0 -100 0 -100 0 N -P 3 0 0 0 120 20 120 -20 120 -20 N -P 3 0 1 0 -140 0 -60 0 -60 0 N -P 3 0 1 0 -140 60 -140 -60 -140 -60 N -P 3 0 1 0 -140 60 -100 60 -100 60 N -P 3 0 1 0 -120 60 -120 80 -120 80 N -P 3 0 1 0 -60 0 100 100 100 100 N -P 5 0 1 0 -140 -60 -100 -60 -100 -60 -100 -60 -100 -60 N -P 5 0 1 0 -100 60 -100 -60 -100 -40 -100 -40 -100 -40 N -P 6 0 1 0 -120 80 -120 120 40 120 40 60 40 60 40 60 N -P 10 0 1 0 60 80 60 200 80 200 80 220 160 220 180 200 160 180 80 180 80 200 80 200 N +T 0 120 200 20 0 0 0 OFS Normal 0 C C +P 2 0 0 0 200 -200 200 -200 N +P 2 0 0 0 400 -200 400 -200 N +P 3 0 0 0 -150 0 -100 0 -100 0 N +P 3 0 0 0 120 20 120 -20 120 -20 N +P 3 0 1 0 -140 0 -60 0 -60 0 N +P 3 0 1 0 -140 60 -140 -60 -140 -60 N +P 3 0 1 0 -140 60 -100 60 -100 60 N +P 3 0 1 0 -120 60 -120 80 -120 80 N +P 3 0 1 0 -60 0 100 100 100 100 N +P 5 0 1 0 -140 -60 -100 -60 -100 -60 -100 -60 -100 -60 N +P 5 0 1 0 -100 60 -100 -60 -100 -40 -100 -40 -100 -40 N +P 6 0 1 0 -120 80 -120 120 40 120 40 60 40 60 40 60 N +P 10 0 1 0 60 80 60 200 80 200 80 220 160 220 180 200 160 180 80 180 80 200 80 200 N X ~ 1 250 0 130 L 10 40 1 1 W X ~ 2 -250 0 100 R 10 40 1 1 w X ~ 3 250 200 70 L 10 10 1 1 O @@ -445,13 +445,13 @@ ENDDEF DEF V_A10A EV 0 10 N Y 1 F N F0 "EV" -160 120 40 H V C CNN F1 "V_A10A" -60 -140 40 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN +F2 "" 0 0 60 H I C CNN +F3 "" 0 0 60 H I C CNN DRAW -T 0 0 0 70 0 0 0 A Normal 0 C C -P 2 0 0 0 200 -200 200 -200 N +T 0 0 0 70 0 0 0 A Normal 0 C C +P 2 0 0 0 200 -200 200 -200 N C 0 0 84 0 1 0 N -P 3 0 1 0 -100 0 -80 0 -80 0 N +P 3 0 1 0 -100 0 -80 0 -80 0 N X ~ 1 -200 0 100 R 10 40 1 1 W X ~ 2 200 0 118 L 10 40 1 1 w ENDDRAW @@ -462,11 +462,11 @@ ENDDEF DEF V_F50Hz EV 0 10 N Y 1 F N F0 "EV" -160 120 40 H V C CNN F1 "V_F50Hz" -40 -140 40 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN +F2 "" 0 0 60 H I C CNN +F3 "" 0 0 60 H I C CNN DRAW -T 0 0 0 50 0 0 0 Hz Normal 0 C C -P 2 0 0 0 200 -200 200 -200 N +T 0 0 0 50 0 0 0 Hz Normal 0 C C +P 2 0 0 0 200 -200 200 -200 N C 0 0 84 0 1 0 N X ~ 1 200 0 118 L 10 40 1 1 W ENDDRAW @@ -477,11 +477,11 @@ ENDDEF DEF V_U400V EV 0 10 N Y 1 F N F0 "EV" -160 120 40 H V C CNN F1 "V_U400V" -60 -140 40 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN +F2 "" 0 0 60 H I C CNN +F3 "" 0 0 60 H I C CNN DRAW -T 0 0 0 70 0 0 0 V Normal 0 C C -P 2 0 0 0 200 -200 200 -200 N +T 0 0 0 70 0 0 0 V Normal 0 C C +P 2 0 0 0 200 -200 200 -200 N C 0 0 84 0 1 0 N X ~ 1 200 0 118 L 10 40 1 1 W ENDDRAW @@ -492,15 +492,15 @@ ENDDEF DEF W_15KA EW 0 10 N Y 1 F N F0 "EW" -160 120 40 H V C CNN F1 "W_15KA" -50 -210 40 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN +F2 "" 0 0 60 H I C CNN +F3 "" 0 0 60 H I C CNN DRAW -P 2 0 0 0 200 -200 200 -200 N +P 2 0 0 0 200 -200 200 -200 N S -120 60 120 -60 0 1 0 N S -10 -40 10 -60 0 1 0 N -P 3 0 1 0 -100 0 -80 0 -80 0 N -P 7 0 1 0 -80 0 -40 0 -80 40 -80 0 -80 -40 -40 0 -40 0 F -P 8 0 1 0 80 0 40 0 80 40 80 -40 80 0 80 -40 40 0 40 0 F +P 3 0 1 0 -100 0 -80 0 -80 0 N +P 7 0 1 0 -80 0 -40 0 -80 40 -80 0 -80 -40 -40 0 -40 0 F +P 8 0 1 0 80 0 40 0 80 40 80 -40 80 0 80 -40 40 0 40 0 F X ~ 1 200 0 100 L 10 40 1 1 W X ~ 2 -200 0 100 R 10 40 1 1 w X ~ 3 0 -100 50 U 10 50 1 1 O @@ -512,17 +512,17 @@ ENDDEF DEF Y_ELC EY 0 10 N Y 1 F N F0 "EY" -10 120 40 H V C CNN F1 "Y_ELC" 60 -120 40 H V C CNN -F2 "" 0 0 60 H V C CNN -F3 "" 0 0 60 H V C CNN +F2 "" 0 0 60 H I C CNN +F3 "" 0 0 60 H I C CNN DRAW -P 2 0 0 0 200 -200 200 -200 N -P 3 0 0 0 -50 10 -50 -10 -50 -10 N -P 3 0 0 0 -40 20 -40 -20 -40 -20 N -P 3 0 0 0 -30 30 -30 -30 -30 -30 N -P 3 0 0 0 -10 50 -10 -50 -10 -50 N -P 4 0 0 0 -60 0 70 0 80 0 70 0 N -P 4 0 0 0 -20 40 -20 -40 -20 -40 -20 -40 N -P 4 0 0 0 0 60 0 60 0 -60 0 -60 N +P 2 0 0 0 200 -200 200 -200 N +P 3 0 0 0 -50 10 -50 -10 -50 -10 N +P 3 0 0 0 -40 20 -40 -20 -40 -20 N +P 3 0 0 0 -30 30 -30 -30 -30 -30 N +P 3 0 0 0 -10 50 -10 -50 -10 -50 N +P 4 0 0 0 -60 0 70 0 80 0 70 0 N +P 4 0 0 0 -20 40 -20 -40 -20 -40 -20 -40 N +P 4 0 0 0 0 60 0 60 0 -60 0 -60 N X ~ 1 200 0 118 L 10 40 1 1 W ENDDRAW ENDDEF diff --git a/demos/electric/electric.sch b/demos/electric/electric.sch index 2c4acfefe1..3b78bd131f 100644 --- a/demos/electric/electric.sch +++ b/demos/electric/electric.sch @@ -1,12 +1,10 @@ EESchema Schematic File Version 2 -LIBS:electric-rescue LIBS:power LIBS:elec-unifil LIBS:device LIBS:conn -LIBS:regul LIBS:electric-cache -EELAYER 25 0 +EELAYER 26 0 EELAYER END $Descr A4 11693 8268 encoding utf-8 @@ -137,10 +135,10 @@ Wire Wire Line Wire Wire Line 850 3350 1200 3350 $Comp -L R_16A_30mA ER01 +L R_16A_30mA ER1 U 1 1 416242BF P 1450 2150 -F 0 "ER01" H 1400 2380 40 0000 C CNN +F 0 "ER1" H 1400 2380 40 0000 C CNN F 1 "R_16A_30mA" H 1450 1950 40 0000 C CNN F 2 "Courbe D" H 1450 1900 30 0000 C CNN F 3 "" H 1450 2150 60 0001 C CNN @@ -150,10 +148,10 @@ $EndComp Wire Wire Line 850 2750 1200 2750 $Comp -L C_3x2.5mm2 EC? +L C_3x2.5mm2 EC102 U 1 1 41652EC2 P 2950 6950 -F 0 "EC?" H 2780 7080 40 0000 C CNN +F 0 "EC102" H 2780 7080 40 0000 C CNN F 1 "C_3x2.5mm2" H 2950 6850 40 0000 C CNN F 2 "" H 2950 6950 60 0001 C CNN F 3 "" H 2950 6950 60 0001 C CNN @@ -283,10 +281,10 @@ F 3 "" H 6300 3350 60 0001 C CNN 1 0 0 -1 $EndComp $Comp -L C_3x2.5mm2 EC? +L C_3x2.5mm2 EC101 U 1 1 41642129 P 2950 6600 -F 0 "EC?" H 2780 6730 40 0000 C CNN +F 0 "EC101" H 2780 6730 40 0000 C CNN F 1 "C_3x2.5mm2" H 2950 6500 40 0000 C CNN F 2 "" H 2950 6600 60 0001 C CNN F 3 "" H 2950 6600 60 0001 C CNN @@ -821,7 +819,7 @@ F 3 "" H 2550 6100 60 0001 C CNN $EndComp $Comp L D_16A ED54 -U 1 1 4162F875 +U 1 1 5831E95C P 2550 5750 F 0 "ED54" H 2390 5870 40 0000 C CNN F 1 "D_16A" H 2450 5670 40 0000 C CNN @@ -865,7 +863,7 @@ F 3 "" H 2550 4700 60 0001 C CNN $EndComp $Comp L D_16A ED50 -U 1 1 4162F848 +U 1 1 5831E958 P 2550 4350 F 0 "ED50" H 2390 4470 40 0000 C CNN F 1 "D_16A" H 2450 4270 40 0000 C CNN @@ -887,7 +885,7 @@ F 3 "" H 8550 6100 60 0001 C CNN $EndComp $Comp L D_16A ED63 -U 1 1 4162F862 +U 1 1 5831E95B P 8550 5750 F 0 "ED63" H 8390 5870 40 0000 C CNN F 1 "D_16A" H 8450 5670 40 0000 C CNN @@ -898,7 +896,7 @@ F 3 "" H 8550 5750 60 0001 C CNN $EndComp $Comp L D_16A ED62 -U 1 1 4162F856 +U 1 1 5831E95A P 8550 5400 F 0 "ED62" H 8390 5520 40 0000 C CNN F 1 "D_16A" H 8450 5320 40 0000 C CNN @@ -909,7 +907,7 @@ F 3 "" H 8550 5400 60 0001 C CNN $EndComp $Comp L D_16A ED61 -U 1 1 4162F84D +U 1 1 5831E959 P 8550 4800 F 0 "ED61" H 8390 4920 40 0000 C CNN F 1 "D_16A" H 8450 4720 40 0000 C CNN @@ -1042,7 +1040,7 @@ F 3 "" H 5900 3350 60 0001 C CNN $EndComp $Comp L D_06A ED32 -U 1 1 4162F2EE +U 1 1 5831E955 P 8550 3600 F 0 "ED32" H 8390 3720 40 0000 C CNN F 1 "D_06A" H 8450 3520 40 0000 C CNN @@ -1053,7 +1051,7 @@ F 3 "" H 8550 3600 60 0001 C CNN $EndComp $Comp L D_06A ED33 -U 1 1 4162F2D8 +U 1 1 5831E954 P 8550 3950 F 0 "ED33" H 8390 4070 40 0000 C CNN F 1 "D_06A" H 8450 3870 40 0000 C CNN @@ -1109,7 +1107,7 @@ F 3 "" H 8550 2400 60 0001 C CNN $EndComp $Comp L D_06A ED31 -U 1 1 4162F2D8 +U 1 1 5831E953 P 8550 3250 F 0 "ED31" H 8390 3370 40 0000 C CNN F 1 "D_06A" H 8450 3170 40 0000 C CNN @@ -1120,7 +1118,7 @@ F 3 "" H 8550 3250 60 0001 C CNN $EndComp $Comp L D_06A ED11 -U 1 1 4162F301 +U 1 1 5831E957 P 8550 650 F 0 "ED11" H 8390 770 40 0000 C CNN F 1 "D_06A" H 8450 570 40 0000 C CNN @@ -1131,7 +1129,7 @@ F 3 "" H 8550 650 60 0001 C CNN $EndComp $Comp L D_06A ED12 -U 1 1 4162F2F6 +U 1 1 5831E956 P 8550 1000 F 0 "ED12" H 8390 1120 40 0000 C CNN F 1 "D_06A" H 8450 920 40 0000 C CNN @@ -1164,7 +1162,7 @@ F 3 "wc2, douche, lingerie" H 10180 1680 40 0000 C CNN $EndComp $Comp L D_10A ED25 -U 1 1 4162F22A +U 1 1 5831E952 P 5900 1900 F 0 "ED25" H 5740 2020 40 0000 C CNN F 1 "D_10A" H 5800 1820 40 0000 C CNN @@ -1175,7 +1173,7 @@ F 3 "" H 5900 1900 60 0001 C CNN $EndComp $Comp L D_10A ED22 -U 1 1 4162F1F7 +U 1 1 5831E951 P 5900 1500 F 0 "ED22" H 5740 1620 40 0000 C CNN F 1 "D_10A" H 5800 1420 40 0000 C CNN @@ -1186,7 +1184,7 @@ F 3 "" H 5900 1500 60 0001 C CNN $EndComp $Comp L D_10A ED21 -U 1 1 4162F1F0 +U 1 1 5831E950 P 5900 1150 F 0 "ED21" H 5750 1250 40 0000 C CNN F 1 "D_10A" H 5800 1070 40 0000 C CNN @@ -1197,7 +1195,7 @@ F 3 "" H 5900 1150 60 0001 C CNN $EndComp $Comp L D_10A ED20 -U 1 1 4162F1CA +U 1 1 5831E94F P 5900 800 F 0 "ED20" H 5740 920 40 0000 C CNN F 1 "D_10A" H 5800 720 40 0000 C CNN @@ -1314,10 +1312,10 @@ F 3 "" H 4250 2400 60 0001 C CNN -1 0 0 1 $EndComp $Comp -L Q_25A_2F2O EQ1b +L Q_25A_2F2O EQ1b101 U 1 1 416245A7 P 2800 2400 -F 0 "EQ1b" H 2700 2550 40 0000 C CNN +F 0 "EQ1b101" H 2700 2550 40 0000 C CNN F 1 "Q_25A_2F2O" H 2800 2260 40 0000 C CNN F 2 "" H 2800 2400 60 0001 C CNN F 3 "" H 2800 2400 60 0001 C CNN @@ -1336,10 +1334,10 @@ F 3 "" H 2400 2400 60 0001 C CNN 1 0 0 -1 $EndComp $Comp -L Q_25A_2F2O EQ1a +L Q_25A_2F2O EQ1a101 U 1 1 41624555 P 2000 2400 -F 0 "EQ1a" H 1900 2550 40 0000 C CNN +F 0 "EQ1a101" H 1900 2550 40 0000 C CNN F 1 "Q_25A_2F2O" H 2000 2260 40 0000 C CNN F 2 "" H 2000 2400 60 0001 C CNN F 3 "" H 2000 2400 60 0001 C CNN @@ -1391,10 +1389,10 @@ F 3 "" H 1450 3350 60 0001 C CNN 1 0 0 -1 $EndComp $Comp -L R_16A_30mA ER02 +L R_16A_30mA ER2 U 1 1 416242F0 P 1450 2750 -F 0 "ER02" H 1240 2930 40 0000 C CNN +F 0 "ER2" H 1240 2930 40 0000 C CNN F 1 "R_16A_30mA" H 1450 2550 40 0000 C CNN F 2 "Courbe B" H 1450 2500 30 0000 C CNN F 3 "" H 1450 2750 60 0001 C CNN @@ -1439,10 +1437,10 @@ $EndComp Wire Wire Line 1350 1350 1350 1500 $Comp -L W_15KA EW01 +L W_15KA EW1 U 1 1 41618802 P 1800 1150 -F 0 "EW01" H 1800 1300 40 0000 C CNN +F 0 "EW1" H 1800 1300 40 0000 C CNN F 1 "W_15KA" H 1800 950 40 0000 C CNN F 2 "" H 1800 1150 60 0001 C CNN F 3 "" H 1800 1150 60 0001 C CNN diff --git a/eeschema/sch_legacy_plugin.cpp b/eeschema/sch_legacy_plugin.cpp index e0786fb2d8..2d823a8748 100644 --- a/eeschema/sch_legacy_plugin.cpp +++ b/eeschema/sch_legacy_plugin.cpp @@ -2364,9 +2364,9 @@ LIB_PART* SCH_LEGACY_PLUGIN_CACHE::loadPart( FILE_LINE_READER& aReader ) reference.SetText( prefix ); } - // In version 2.0 and earlier, this parameter was a '0' which was just a place holder. + // In version 2.2 and earlier, this parameter was a '0' which was just a place holder. // The was no concept of interchangeable multiple unit symbols. - if( LIB_VERSION( m_versionMajor, m_versionMinor ) <= LIB_VERSION( 2, 0 ) ) + if( LIB_VERSION( m_versionMajor, m_versionMinor ) <= LIB_VERSION( 2, 2 ) ) { // Nothing needs to be set since the default setting for symbols with multiple // units were never interchangeable. Just parse the 0 an move on. @@ -2735,12 +2735,11 @@ LIB_ARC* SCH_LEGACY_PLUGIN_CACHE::loadArc( std::unique_ptr< LIB_PART >& aPart, arc->SetUnit( parseInt( aReader, line, &line ) ); arc->SetConvert( parseInt( aReader, line, &line ) ); arc->SetWidth( parseInt( aReader, line, &line ) ); + arc->SetFillMode( parseFillMode( aReader, line, &line ) ); // Actual Coordinates of arc ends are read from file if( *line != 0 ) { - arc->SetFillMode( parseFillMode( aReader, line, &line ) ); - wxPoint arcStart, arcEnd; arcStart.x = parseInt( aReader, line, &line );