common code for Win and Linux, merged py2 changes

8 files changed, 101 insertions, 165 deletions

diff --git a/Examples/Parallel_Resonance/Parallel_Resonance-cache.lib b/Examples/Parallel_Resonance/Parallel_Resonance-cache.lib
index 340e06f7..603f5e5b 100644
--- a/Examples/Parallel_Resonance/Parallel_Resonance-cache.lib
+++ b/Examples/Parallel_Resonance/Parallel_Resonance-cache.lib
@@ -25,20 +25,16 @@ ENDDEF
 DEF C C 0 10 N Y 1 F N
 F0 "C" 25 100 50 H V L CNN
 F1 "C" 25 -100 50 H V L CNN
-F2 "" 38 -150 30 H V C CNN
-F3 "" 0 0 60 H V C CNN
+F2 "" 38 -150 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
 $FPLIST
- C?
- C_????_*
- C_????
- SMD*_c
- Capacitor*
+ C_*
 $ENDFPLIST
 DRAW
-P 2 0 1 20  -80 -30  80 -30 N
-P 2 0 1 20  -80 30  80 30 N
-X ~ 1 0 150 110 D 40 40 1 1 P
-X ~ 2 0 -150 110 U 40 40 1 1 P
+P 2 0 1 20 -80 -30 80 -30 N
+P 2 0 1 20 -80 30 80 30 N
+X ~ 1 0 150 110 D 50 50 1 1 P
+X ~ 2 0 -150 110 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
@@ -47,19 +43,19 @@ ENDDEF
 DEF GND #PWR 0 0 Y Y 1 F P
 F0 "#PWR" 0 -250 50 H I C CNN
 F1 "GND" 0 -150 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
+F2 "" 0 0 50 H I C CNN
+F3 "" 0 0 50 H I C CNN
 DRAW
-P 6 0 1 0  0 0  0 -50  50 -50  0 -100  -50 -50  0 -50 N
+P 6 0 1 0 0 0 0 -50 50 -50 0 -100 -50 -50 0 -50 N
 X GND 1 0 0 0 D 50 50 1 1 W N
 ENDDRAW
 ENDDEF
 #
-# L
+# L-RESCUE-Parallel_Resonance
 #
-DEF L L 0 40 N N 1 F N
+DEF L-RESCUE-Parallel_Resonance L 0 40 N N 1 F N
 F0 "L" 1950 500 50 H V C CNN
-F1 "L" 1950 650 50 H V C CNN
+F1 "L-RESCUE-Parallel_Resonance" 1950 650 50 H V C CNN
 F2 "" 1950 550 60 V V C CNN
 F3 "" 1950 550 60 V V C CNN
 DRAW
@@ -72,11 +68,11 @@ X 2 2 2250 550 100 L 70 70 1 1 P
 ENDDRAW
 ENDDEF
 #
-# R
+# R-RESCUE-Parallel_Resonance
 #
-DEF R R 0 0 N Y 1 F N
+DEF R-RESCUE-Parallel_Resonance R 0 0 N Y 1 F N
 F0 "R" 50 130 50 H V C CNN
-F1 "R" 50 50 50 H V C CNN
+F1 "R-RESCUE-Parallel_Resonance" 50 50 50 H V C CNN
 F2 "" 50 -20 30 H V C CNN
 F3 "" 50 50 30 V V C CNN
 $FPLIST
diff --git a/Examples/Parallel_Resonance/Parallel_Resonance-rescue.lib b/Examples/Parallel_Resonance/Parallel_Resonance-rescue.lib
new file mode 100644
index 00000000..15083855
--- /dev/null
+++ b/Examples/Parallel_Resonance/Parallel_Resonance-rescue.lib
@@ -0,0 +1,39 @@
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# L-RESCUE-Parallel_Resonance
+#
+DEF L-RESCUE-Parallel_Resonance L 0 40 N N 1 F N
+F0 "L" 1950 500 50 H V C CNN
+F1 "L-RESCUE-Parallel_Resonance" 1950 650 50 H V C CNN
+F2 "" 1950 550 60 V V C CNN
+F3 "" 1950 550 60 V V C CNN
+DRAW
+A 1802 550 48 11 1789 0 1 0 N 1849 551 1754 551
+A 1899 550 51 11 1789 0 1 0 N 1949 551 1848 551
+A 1999 550 51 11 1789 0 1 0 N 2049 551 1948 551
+A 2100 550 50 11 1789 0 1 0 N 2149 551 2050 551
+X 1 1 1650 550 100 R 70 70 1 1 P
+X 2 2 2250 550 100 L 70 70 1 1 P
+ENDDRAW
+ENDDEF
+#
+# R-RESCUE-Parallel_Resonance
+#
+DEF R-RESCUE-Parallel_Resonance R 0 0 N Y 1 F N
+F0 "R" 50 130 50 H V C CNN
+F1 "R-RESCUE-Parallel_Resonance" 50 50 50 H V C CNN
+F2 "" 50 -20 30 H V C CNN
+F3 "" 50 50 30 V V C CNN
+$FPLIST
+ R_*
+ Resistor_*
+$ENDFPLIST
+DRAW
+S 150 10 -50 90 0 1 10 N
+X ~ 1 -100 50 50 R 60 60 1 1 P
+X ~ 2 200 50 50 L 60 60 1 1 P
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/Examples/Parallel_Resonance/Parallel_Resonance.cir.out b/Examples/Parallel_Resonance/Parallel_Resonance.cir.out
index 263900cb..3e249439 100644
--- a/Examples/Parallel_Resonance/Parallel_Resonance.cir.out
+++ b/Examples/Parallel_Resonance/Parallel_Resonance.cir.out
@@ -3,7 +3,7 @@
 r1  out gnd 100
 l1  out gnd 100m
 c1  gnd out 10u
-v1 in gnd  ac 10 0
+v1 in gnd  ac 1 0
 r2  out in 1000
 * u1  in plot_v1
 * u3  out plot_v1
diff --git a/Examples/Parallel_Resonance/Parallel_Resonance.pro b/Examples/Parallel_Resonance/Parallel_Resonance.pro
index 2eb1bf13..c374d238 100644
--- a/Examples/Parallel_Resonance/Parallel_Resonance.pro
+++ b/Examples/Parallel_Resonance/Parallel_Resonance.pro
@@ -1,4 +1,4 @@
-update=Thu Mar  3 22:41:36 2016
+update=Tue Jun  4 16:15:35 2019
 version=1
 last_client=eeschema
 [general]
@@ -31,41 +31,42 @@ NetIExt=net
 version=1
 LibDir=
 [eeschema/libraries]
-LibName1=eSim_Analog
-LibName2=eSim_Devices
-LibName3=eSim_Digital
-LibName4=eSim_Hybrid
-LibName5=eSim_Miscellaneous
-LibName6=eSim_Plot
-LibName7=eSim_Power
-LibName8=eSim_Sources
-LibName9=eSim_Subckt
-LibName10=eSim_User
-LibName11=adc-dac
-LibName12=memory
-LibName13=xilinx
-LibName14=microcontrollers
-LibName15=dsp
-LibName16=microchip
-LibName17=analog_switches
-LibName18=motorola
-LibName19=texas
-LibName20=intel
-LibName21=audio
-LibName22=interface
-LibName23=digital-audio
-LibName24=philips
-LibName25=display
-LibName26=cypress
-LibName27=siliconi
-LibName28=opto
-LibName29=atmel
-LibName30=contrib
-LibName31=power
-LibName32=device
-LibName33=transistors
-LibName34=conn
-LibName35=linear
-LibName36=regul
-LibName37=74xx
-LibName38=cmos4000
+LibName1=Parallel_Resonance-rescue
+LibName2=eSim_Analog
+LibName3=eSim_Devices
+LibName4=eSim_Digital
+LibName5=eSim_Hybrid
+LibName6=eSim_Miscellaneous
+LibName7=eSim_Plot
+LibName8=eSim_Power
+LibName9=eSim_Sources
+LibName10=eSim_Subckt
+LibName11=eSim_User
+LibName12=adc-dac
+LibName13=memory
+LibName14=xilinx
+LibName15=microcontrollers
+LibName16=dsp
+LibName17=microchip
+LibName18=analog_switches
+LibName19=motorola
+LibName20=texas
+LibName21=intel
+LibName22=audio
+LibName23=interface
+LibName24=digital-audio
+LibName25=philips
+LibName26=display
+LibName27=cypress
+LibName28=siliconi
+LibName29=opto
+LibName30=atmel
+LibName31=contrib
+LibName32=power
+LibName33=device
+LibName34=transistors
+LibName35=conn
+LibName36=linear
+LibName37=regul
+LibName38=74xx
+LibName39=cmos4000
diff --git a/Examples/Parallel_Resonance/Parallel_Resonance.sch b/Examples/Parallel_Resonance/Parallel_Resonance.sch
index e3c0322f..40ff6c2c 100644
--- a/Examples/Parallel_Resonance/Parallel_Resonance.sch
+++ b/Examples/Parallel_Resonance/Parallel_Resonance.sch
@@ -1,4 +1,5 @@
 EESchema Schematic File Version 2
+LIBS:Parallel_Resonance-rescue
 LIBS:eSim_Analog
 LIBS:eSim_Devices
 LIBS:eSim_Digital
@@ -53,7 +54,7 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
-L R R1
+L R-RESCUE-Parallel_Resonance R1
 U 1 1 56C172A1
 P 5100 3150
 F 0 "R1" H 5150 3280 50  0000 C CNN
@@ -64,7 +65,7 @@ F 3 "" V 5150 3200 30  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L L L1
+L L-RESCUE-Parallel_Resonance L1
 U 1 1 56C172D6
 P 5850 1250
 F 0 "L1" H 7800 1750 50  0000 C CNN
@@ -145,7 +146,7 @@ Wire Wire Line
 	5900 3300 5900 3850
 Connection ~ 5900 3850
 $Comp
-L R R2
+L R-RESCUE-Parallel_Resonance R2
 U 1 1 56C1A863
 P 4600 2600
 F 0 "R2" H 4650 2730 50  0000 C CNN
diff --git a/Examples/Parallel_Resonance/Parallel_Resonance_Previous_Values.xml b/Examples/Parallel_Resonance/Parallel_Resonance_Previous_Values.xml
new file mode 100644
index 00000000..9a5ac67d
--- /dev/null
+++ b/Examples/Parallel_Resonance/Parallel_Resonance_Previous_Values.xml
@@ -0,0 +1 @@
+<KicadtoNgspice><source><v1 name="Source type">ac<field1 name="Amplitude">1</field1><field2 name="Phase" /></v1></source><model /><devicemodel /><subcircuit /><analysis><ac><field1 name="Lin">true</field1><field2 name="Dec">false</field2><field3 name="Oct">false</field3><field4 name="Start Frequency">1</field4><field5 name="Stop Frequency">700</field5><field6 name="No. of points">20</field6><field7 name="Start Fre Combo">Hz</field7><field8 name="Stop Fre Combo">Hz</field8></ac><dc><field1 name="Source 1" /><field2 name="Start" /><field3 name="Increment" /><field4 name="Stop" /><field5 name="Operating Point">0</field5><field6 name="Start Combo">Volts or Amperes</field6><field7 name="Increment Combo">Volts or Amperes</field7><field8 name="Stop Combo">Volts or Amperes</field8><field9 name="Source 2" /><field10 name="Start" /><field11 name="Increment" /><field12 name="Stop" /><field13 name="Start Combo">Volts or Amperes</field13><field14 name="Increment Combo">Volts or Amperes</field14><field15 name="Stop Combo">Volts or Amperes</field15></dc><tran><field1 name="Start Time" /><field2 name="Step Time" /><field3 name="Stop Time" /><field4 name="Start Combo">Sec</field4><field5 name="Step Combo">Sec</field5><field6 name="Stop Combo">Sec</field6></tran></analysis></KicadtoNgspice>
\ No newline at end of file
diff --git a/Examples/Parallel_Resonance/plot_data_i.txt b/Examples/Parallel_Resonance/plot_data_i.txt
deleted file mode 100644
index 5424279c..00000000
--- a/Examples/Parallel_Resonance/plot_data_i.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-    * /home/fossee/updatedexamples/parallel_resonance/parallel_resonance.cir
-    AC Analysis  Fri Sep  1 14:47:46  2017
---------------------------------------------------------------------------------
-Index   frequency       l1#branch                       
---------------------------------------------------------------------------------
-0	1.000000e+00	9.999917e-03,	-6.91172e-05	
-1	3.778947e+01	9.843346e-03,	-2.72450e-03	
-2	7.457895e+01	8.921666e-03,	-5.89259e-03	
-3	1.113684e+02	5.983495e-03,	-9.02443e-03	
-4	1.481579e+02	1.251155e-03,	-9.60267e-03	
-5	1.849474e+02	-1.99451e-03,	-7.27640e-03	
-6	2.217368e+02	-2.90964e-03,	-4.73849e-03	
-7	2.585263e+02	-2.78783e-03,	-3.04003e-03	
-8	2.953158e+02	-2.41064e-03,	-2.01407e-03	
-9	3.321053e+02	-2.03047e-03,	-1.38948e-03	
-10	3.688947e+02	-1.70675e-03,	-9.95243e-04	
-11	4.056842e+02	-1.44353e-03,	-7.36265e-04	
-12	4.424737e+02	-1.23168e-03,	-5.59749e-04	
-13	4.792632e+02	-1.06068e-03,	-4.35482e-04	
-14	5.160526e+02	-9.21600e-04,	-3.45516e-04	
-15	5.528421e+02	-8.07408e-04,	-2.78790e-04	
-16	5.896316e+02	-7.12740e-04,	-2.28253e-04	
-17	6.264211e+02	-6.33514e-04,	-1.89271e-04	
-18	6.632105e+02	-5.66622e-04,	-1.58714e-04	
-19	7.000000e+02	-5.09674e-04,	-1.34418e-04	
-
-    * /home/fossee/updatedexamples/parallel_resonance/parallel_resonance.cir
-    AC Analysis  Fri Sep  1 14:47:46  2017
---------------------------------------------------------------------------------
-Index   frequency       v1#branch                       
---------------------------------------------------------------------------------
-0	1.000000e+00	-9.99996e-03,	6.283133e-06	
-1	3.778947e+01	-9.93531e-03,	2.337187e-04	
-2	7.457895e+01	-9.72388e-03,	4.180633e-04	
-3	1.113684e+02	-9.36852e-03,	4.186941e-04	
-4	1.481579e+02	-9.10608e-03,	1.164705e-04	
-5	1.849474e+02	-9.15444e-03,	-2.31773e-04	
-6	2.217368e+02	-9.33983e-03,	-4.05375e-04	
-7	2.585263e+02	-9.50619e-03,	-4.52846e-04	
-8	2.953158e+02	-9.62628e-03,	-4.47301e-04	
-9	3.321053e+02	-9.71006e-03,	-4.23694e-04	
-10	3.688947e+02	-9.76932e-03,	-3.95596e-04	
-11	4.056842e+02	-9.81233e-03,	-3.67955e-04	
-12	4.424737e+02	-9.84438e-03,	-3.42424e-04	
-13	4.792632e+02	-9.86886e-03,	-3.19403e-04	
-14	5.160526e+02	-9.88797e-03,	-2.98825e-04	
-15	5.528421e+02	-9.90316e-03,	-2.80462e-04	
-16	5.896316e+02	-9.91544e-03,	-2.64053e-04	
-17	6.264211e+02	-9.92550e-03,	-2.49346e-04	
-18	6.632105e+02	-9.93386e-03,	-2.36116e-04	
-19	7.000000e+02	-9.94088e-03,	-2.24166e-04	
diff --git a/Examples/Parallel_Resonance/plot_data_v.txt b/Examples/Parallel_Resonance/plot_data_v.txt
deleted file mode 100644
index 56d03c04..00000000
--- a/Examples/Parallel_Resonance/plot_data_v.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-    * /home/fossee/updatedexamples/parallel_resonance/parallel_resonance.cir
-    AC Analysis  Fri Sep  1 14:47:46  2017
---------------------------------------------------------------------------------
-Index   frequency       in                              
---------------------------------------------------------------------------------
-0	1.000000e+00	1.000000e+01,	0.000000e+00	
-1	3.778947e+01	1.000000e+01,	0.000000e+00	
-2	7.457895e+01	1.000000e+01,	0.000000e+00	
-3	1.113684e+02	1.000000e+01,	0.000000e+00	
-4	1.481579e+02	1.000000e+01,	0.000000e+00	
-5	1.849474e+02	1.000000e+01,	0.000000e+00	
-6	2.217368e+02	1.000000e+01,	0.000000e+00	
-7	2.585263e+02	1.000000e+01,	0.000000e+00	
-8	2.953158e+02	1.000000e+01,	0.000000e+00	
-9	3.321053e+02	1.000000e+01,	0.000000e+00	
-10	3.688947e+02	1.000000e+01,	0.000000e+00	
-11	4.056842e+02	1.000000e+01,	0.000000e+00	
-12	4.424737e+02	1.000000e+01,	0.000000e+00	
-13	4.792632e+02	1.000000e+01,	0.000000e+00	
-14	5.160526e+02	1.000000e+01,	0.000000e+00	
-15	5.528421e+02	1.000000e+01,	0.000000e+00	
-16	5.896316e+02	1.000000e+01,	0.000000e+00	
-17	6.264211e+02	1.000000e+01,	0.000000e+00	
-18	6.632105e+02	1.000000e+01,	0.000000e+00	
-19	7.000000e+02	1.000000e+01,	0.000000e+00	
-
-    * /home/fossee/updatedexamples/parallel_resonance/parallel_resonance.cir
-    AC Analysis  Fri Sep  1 14:47:46  2017
---------------------------------------------------------------------------------
-Index   frequency       out                             
---------------------------------------------------------------------------------
-0	1.000000e+00	4.342761e-05,	6.283133e-03	
-1	3.778947e+01	6.469017e-02,	2.337187e-01	
-2	7.457895e+01	2.761228e-01,	4.180633e-01	
-3	1.113684e+02	6.314828e-01,	4.186941e-01	
-4	1.481579e+02	8.939157e-01,	1.164705e-01	
-5	1.849474e+02	8.455604e-01,	-2.31773e-01	
-6	2.217368e+02	6.601726e-01,	-4.05375e-01	
-7	2.585263e+02	4.938124e-01,	-4.52846e-01	
-8	2.953158e+02	3.737155e-01,	-4.47301e-01	
-9	3.321053e+02	2.899398e-01,	-4.23694e-01	
-10	3.688947e+02	2.306809e-01,	-3.95596e-01	
-11	4.056842e+02	1.876731e-01,	-3.67955e-01	
-12	4.424737e+02	1.556182e-01,	-3.42424e-01	
-13	4.792632e+02	1.311366e-01,	-3.19403e-01	
-14	5.160526e+02	1.120320e-01,	-2.98825e-01	
-15	5.528421e+02	9.684087e-02,	-2.80462e-01	
-16	5.896316e+02	8.456245e-02,	-2.64053e-01	
-17	6.264211e+02	7.449539e-02,	-2.49346e-01	
-18	6.632105e+02	6.613717e-02,	-2.36116e-01	
-19	7.000000e+02	5.912034e-02,	-2.24166e-01