common code for Win and Linux, merged py2 changes

8 files changed, 102 insertions, 208 deletions

diff --git a/Examples/Clippercircuit/Clippercircuit-cache.lib b/Examples/Clippercircuit/Clippercircuit-cache.lib
index dd1a1ef2..4251abf4 100644
--- a/Examples/Clippercircuit/Clippercircuit-cache.lib
+++ b/Examples/Clippercircuit/Clippercircuit-cache.lib
@@ -1,11 +1,11 @@
 EESchema-LIBRARY Version 2.3
 #encoding utf-8
 #
-# D
+# D-RESCUE-Clippercircuit
 #
-DEF D D 0 40 N N 1 F N
+DEF D-RESCUE-Clippercircuit D 0 40 N N 1 F N
 F0 "D" 0 100 50 H V C CNN
-F1 "D" 0 -100 50 H V C CNN
+F1 "D-RESCUE-Clippercircuit" 0 -100 50 H V C CNN
 F2 "" 0 0 60 H V C CNN
 F3 "" 0 0 60 H V C CNN
 $FPLIST
@@ -16,8 +16,8 @@ $FPLIST
  *SingleDiode*
 $ENDFPLIST
 DRAW
-P 2 0 1 6  50 50  50 -50 N
-P 3 0 1 0  -50 50  50 0  -50 -50 F
+P 2 0 1 6 50 50 50 -50 N
+P 3 0 1 0 -50 50 50 0 -50 -50 F
 X A 1 -150 0 100 R 40 40 1 1 P
 X K 2 150 0 100 L 40 40 1 1 P
 ENDDRAW
@@ -28,19 +28,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
 #
-# R
+# R-RESCUE-Clippercircuit
 #
-DEF R R 0 0 N Y 1 F N
+DEF R-RESCUE-Clippercircuit 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-Clippercircuit" 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/Clippercircuit/Clippercircuit-rescue.lib b/Examples/Clippercircuit/Clippercircuit-rescue.lib
new file mode 100644
index 00000000..0adb5ae5
--- /dev/null
+++ b/Examples/Clippercircuit/Clippercircuit-rescue.lib
@@ -0,0 +1,44 @@
+EESchema-LIBRARY Version 2.3
+#encoding utf-8
+#
+# D-RESCUE-Clippercircuit
+#
+DEF D-RESCUE-Clippercircuit D 0 40 N N 1 F N
+F0 "D" 0 100 50 H V C CNN
+F1 "D-RESCUE-Clippercircuit" 0 -100 50 H V C CNN
+F2 "" 0 0 60 H V C CNN
+F3 "" 0 0 60 H V C CNN
+$FPLIST
+ Diode_*
+ D-Pak_TO252AA
+ *SingleDiode
+ *_Diode_*
+ *SingleDiode*
+$ENDFPLIST
+DRAW
+P 2 0 1 6 50 50 50 -50 N
+P 3 0 1 0 -50 50 50 0 -50 -50 F
+X A 1 -150 0 100 R 40 40 1 1 P
+X K 2 150 0 100 L 40 40 1 1 P
+ENDDRAW
+ENDDEF
+#
+# R-RESCUE-Clippercircuit
+#
+DEF R-RESCUE-Clippercircuit R 0 0 N Y 1 F N
+F0 "R" 50 130 50 H V C CNN
+F1 "R-RESCUE-Clippercircuit" 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/Clippercircuit/Clippercircuit.pro b/Examples/Clippercircuit/Clippercircuit.pro
index 4a10656b..ac02ae0c 100644
--- a/Examples/Clippercircuit/Clippercircuit.pro
+++ b/Examples/Clippercircuit/Clippercircuit.pro
@@ -1,4 +1,4 @@
-update=Mon Feb 29 18:20:17 2016
+update=Fri Jun  7 10:07:33 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=Clippercircuit-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/Clippercircuit/Clippercircuit.sch b/Examples/Clippercircuit/Clippercircuit.sch
index 3a5d8bd2..f0c57a5a 100644
--- a/Examples/Clippercircuit/Clippercircuit.sch
+++ b/Examples/Clippercircuit/Clippercircuit.sch
@@ -1,4 +1,5 @@
 EESchema Schematic File Version 2
+LIBS:Clippercircuit-rescue
 LIBS:eSim_Analog
 LIBS:eSim_Devices
 LIBS:eSim_Digital
@@ -64,7 +65,7 @@ F 3 "" H 4100 3500 60  0000 C CNN
 	1    0    0    -1  
 $EndComp
 $Comp
-L D D1
+L D-RESCUE-Clippercircuit D1
 U 1 1 56A86229
 P 5550 3450
 F 0 "D1" H 5550 3550 50  0000 C CNN
@@ -75,7 +76,7 @@ F 3 "" H 5550 3450 60  0000 C CNN
 	0    -1   -1   0   
 $EndComp
 $Comp
-L D D2
+L D-RESCUE-Clippercircuit D2
 U 1 1 56A863C8
 P 6250 3450
 F 0 "D2" H 6250 3550 50  0000 C CNN
@@ -86,7 +87,7 @@ F 3 "" H 6250 3450 60  0000 C CNN
 	0    1    1    0   
 $EndComp
 $Comp
-L R R1
+L R-RESCUE-Clippercircuit R1
 U 1 1 56A86416
 P 4700 3050
 F 0 "R1" H 4750 3180 50  0000 C CNN
diff --git a/Examples/Clippercircuit/Clippercircuit_Previous_Values.xml b/Examples/Clippercircuit/Clippercircuit_Previous_Values.xml
new file mode 100644
index 00000000..cdd0fd76
--- /dev/null
+++ b/Examples/Clippercircuit/Clippercircuit_Previous_Values.xml
@@ -0,0 +1 @@
+<KicadtoNgspice><source><v1 name="Source type">sine<field1 name="Offset Value">0</field1><field2 name="Amplitude">5</field2><field3 name="Frequency">50</field3><field4 name="Delay Time">0</field4><field5 name="Damping Factor">0</field5></v1></source><model /><devicemodel><d2><field>/home/saurabh/Downloads/eSim-1.1.2/src/deviceModelLibrary/Diode/D.lib</field></d2><d1><field>/home/saurabh/Downloads/eSim-1.1.2/src/deviceModelLibrary/Diode/D.lib</field></d1></devicemodel><subcircuit /><analysis><ac><field1 name="Lin">true</field1><field2 name="Dec">false</field2><field3 name="Oct">false</field3><field4 name="Start Frequency" /><field5 name="Stop Frequency" /><field6 name="No. of points" /><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">0</field1><field2 name="Step Time">10</field2><field3 name="Stop Time">100</field3><field4 name="Start Combo">Sec</field4><field5 name="Step Combo">ms</field5><field6 name="Stop Combo">ms</field6></tran></analysis></KicadtoNgspice>
\ No newline at end of file
diff --git a/Examples/Clippercircuit/D.lib b/Examples/Clippercircuit/D.lib
index 974dd402..8a7fb4da 100644
--- a/Examples/Clippercircuit/D.lib
+++ b/Examples/Clippercircuit/D.lib
@@ -1 +1,2 @@
-.model 1n4148 D( is=2.495E-09 rs=4.755E-01 n=1.679E+00 tt=3.030E-09 cjo=1.700E-12 vj=1 m=1.959E-01 bv=1.000E+02 ibv=1.000E-04 )
+.model 1n4148 D(is=2.495E-09 rs=4.755E-01 n=1.679E+00 tt=3.030E-09 cjo=1.700E-12 vj=1 m=1.959E-01 bv=1.000E+02 ibv=1.000E-04)
+
diff --git a/Examples/Clippercircuit/plot_data_i.txt b/Examples/Clippercircuit/plot_data_i.txt
deleted file mode 100644
index 057f30bd..00000000
--- a/Examples/Clippercircuit/plot_data_i.txt
+++ /dev/null
@@ -1,77 +0,0 @@
-        * /home/fossee/esim-workspace/clippercircuit/clippercircuit.cir
-        Transient Analysis  Tue Aug 29 19:51:35  2017
---------------------------------------------------------------------------------
-Index   time            alli            
---------------------------------------------------------------------------------
-0	0.000000e+00	-1.21023e-25	
-1	1.000000e-05	-7.18261e-09	
-2	2.000000e-05	-9.27278e-09	
-3	4.000000e-05	-1.53546e-08	
-4	8.000000e-05	-5.02056e-08	
-5	1.600000e-04	-8.02233e-07	
-6	3.200000e-04	-6.21680e-05	
-7	5.343163e-04	-3.23639e-04	
-8	7.511639e-04	-6.28549e-04	
-9	1.014269e-03	-1.00538e-03	
-10	1.540478e-03	-1.74117e-03	
-11	2.592896e-03	-3.02708e-03	
-12	4.592896e-03	-4.33317e-03	
-13	6.592896e-03	-3.76704e-03	
-14	8.592896e-03	-1.55871e-03	
-15	1.059290e-02	4.047519e-04	
-16	1.168731e-02	1.937990e-03	
-17	1.260627e-02	3.041544e-03	
-18	1.351234e-02	3.843251e-03	
-19	1.532450e-02	4.347845e-03	
-20	1.732450e-02	3.113754e-03	
-21	1.932450e-02	5.209497e-04	
-22	2.109176e-02	-1.11569e-03	
-23	2.284255e-02	-3.28113e-03	
-24	2.446551e-02	-4.30399e-03	
-25	2.603276e-02	-4.11545e-03	
-26	2.803276e-02	-2.29936e-03	
-27	3.003276e-02	1.323245e-08	
-28	3.181211e-02	2.101648e-03	
-29	3.353100e-02	3.856183e-03	
-30	3.548425e-02	4.316048e-03	
-31	3.748425e-02	2.944182e-03	
-32	3.948425e-02	2.986236e-04	
-33	4.084025e-02	-7.56052e-04	
-34	4.232563e-02	-2.73131e-03	
-35	4.432563e-02	-4.26261e-03	
-36	4.614809e-02	-4.05512e-03	
-37	4.814809e-02	-2.15266e-03	
-38	5.014809e-02	5.269492e-07	
-39	5.106495e-02	1.077659e-03	
-40	5.192012e-02	2.240032e-03	
-41	5.288026e-02	3.317656e-03	
-42	5.433190e-02	4.264945e-03	
-43	5.633190e-02	3.946775e-03	
-44	5.833190e-02	1.912051e-03	
-45	6.033190e-02	-7.34851e-05	
-46	6.201058e-02	-2.35381e-03	
-47	6.359054e-02	-3.89659e-03	
-48	6.524527e-02	-4.35879e-03	
-49	6.724527e-02	-3.19449e-03	
-50	6.924527e-02	-6.33381e-04	
-51	7.069407e-02	5.472455e-04	
-52	7.237416e-02	2.786905e-03	
-53	7.412120e-02	4.185885e-03	
-54	7.582571e-02	4.207954e-03	
-
-Index   time            alli            
---------------------------------------------------------------------------------
-55	7.782571e-02	2.553494e-03	
-56	7.982571e-02	1.314879e-06	
-57	8.082874e-02	-7.39190e-04	
-58	8.192022e-02	-2.24020e-03	
-59	8.332868e-02	-3.70751e-03	
-60	8.468753e-02	-4.34972e-03	
-61	8.668753e-02	-3.69479e-03	
-62	8.868753e-02	-1.42731e-03	
-63	9.068753e-02	5.379509e-04	
-64	9.256918e-02	3.002109e-03	
-65	9.445688e-02	4.301241e-03	
-66	9.621191e-02	4.019264e-03	
-67	9.821191e-02	2.070093e-03	
-68	1.000000e-01	-5.42079e-09	
diff --git a/Examples/Clippercircuit/plot_data_v.txt b/Examples/Clippercircuit/plot_data_v.txt
deleted file mode 100644
index d6d50e31..00000000
--- a/Examples/Clippercircuit/plot_data_v.txt
+++ /dev/null
@@ -1,77 +0,0 @@
-        * /home/fossee/esim-workspace/clippercircuit/clippercircuit.cir
-        Transient Analysis  Tue Aug 29 19:51:35  2017
---------------------------------------------------------------------------------
-Index   time            in              out             
---------------------------------------------------------------------------------
-0	0.000000e+00	0.000000e+00	-1.21023e-22	
-1	1.000000e-05	1.570794e-02	1.570075e-02	
-2	2.000000e-05	3.141572e-02	3.140645e-02	
-3	4.000000e-05	6.283020e-02	6.281484e-02	
-4	8.000000e-05	1.256505e-01	1.256003e-01	
-5	1.600000e-04	2.512216e-01	2.504194e-01	
-6	3.200000e-04	5.018086e-01	4.396405e-01	
-7	5.343163e-04	8.353661e-01	5.117272e-01	
-8	7.511639e-04	1.169004e+00	5.404550e-01	
-9	1.014269e-03	1.566385e+00	5.610074e-01	
-10	1.540478e-03	2.326420e+00	5.852507e-01	
-11	2.592896e-03	3.637196e+00	6.101154e-01	
-12	4.592896e-03	4.959163e+00	6.259915e-01	
-13	6.592896e-03	4.386898e+00	6.198553e-01	
-14	8.592896e-03	2.138988e+00	5.802750e-01	
-15	1.059290e-02	-9.25943e-01	-5.21192e-01	
-16	1.168731e-02	-2.52802e+00	-5.90034e-01	
-17	1.260627e-02	-3.65157e+00	-6.10029e-01	
-18	1.351234e-02	-4.46380e+00	-6.20549e-01	
-19	1.532450e-02	-4.97404e+00	-6.26197e-01	
-20	1.732450e-02	-3.72500e+00	-6.11244e-01	
-21	1.932450e-02	-1.05313e+00	-5.32182e-01	
-22	2.109176e-02	1.681502e+00	5.658107e-01	
-23	2.284255e-02	3.894825e+00	6.136953e-01	
-24	2.446551e-02	4.929676e+00	6.256863e-01	
-25	2.603276e-02	4.739130e+00	6.236773e-01	
-26	2.803276e-02	2.897143e+00	5.977803e-01	
-27	3.003276e-02	-5.14551e-02	-5.14419e-02	
-28	3.181211e-02	-2.69517e+00	-5.93524e-01	
-29	3.353100e-02	-4.47693e+00	-6.20747e-01	
-30	3.548425e-02	-4.94225e+00	-6.26203e-01	
-31	3.748425e-02	-3.55298e+00	-6.08802e-01	
-32	3.948425e-02	-8.06597e-01	-5.07973e-01	
-33	4.084025e-02	1.304594e+00	5.485420e-01	
-34	4.232563e-02	3.336652e+00	6.053367e-01	
-35	4.432563e-02	4.888208e+00	6.256007e-01	
-36	4.614809e-02	4.678280e+00	6.231567e-01	
-37	4.814809e-02	2.747621e+00	5.949600e-01	
-38	5.014809e-02	-2.32536e-01	-2.32009e-01	
-39	5.106495e-02	-1.64179e+00	-5.64133e-01	
-40	5.192012e-02	-2.83650e+00	-5.96466e-01	
-41	5.288026e-02	-3.93170e+00	-6.14042e-01	
-42	5.433190e-02	-4.89027e+00	-6.25323e-01	
-43	5.633190e-02	-4.56865e+00	-6.21871e-01	
-44	5.833190e-02	-2.50196e+00	-5.89905e-01	
-45	6.033190e-02	5.203957e-01	4.469106e-01	
-46	6.201058e-02	2.952352e+00	5.985459e-01	
-47	6.359054e-02	4.517790e+00	6.212035e-01	
-48	6.524527e-02	4.985165e+00	6.263736e-01	
-49	6.724527e-02	3.806855e+00	6.123643e-01	
-50	6.924527e-02	1.174457e+00	5.410754e-01	
-51	7.069407e-02	-1.08163e+00	-5.34385e-01	
-52	7.237416e-02	-3.39303e+00	-6.06125e-01	
-53	7.412120e-02	-4.81065e+00	-6.24769e-01	
-54	7.582571e-02	-4.83272e+00	-6.24761e-01	
-
-Index   time            in              out             
---------------------------------------------------------------------------------
-55	7.782571e-02	-3.15590e+00	-6.02409e-01	
-56	7.982571e-02	-2.73642e-01	-2.72327e-01	
-57	8.082874e-02	1.287121e+00	5.479313e-01	
-58	8.192022e-02	2.836635e+00	5.964361e-01	
-59	8.332868e-02	4.326466e+00	6.189574e-01	
-60	8.468753e-02	4.975928e+00	6.262056e-01	
-61	8.668753e-02	4.313648e+00	6.188623e-01	
-62	8.868753e-02	2.003700e+00	5.763923e-01	
-63	9.068753e-02	-1.07159e+00	-5.33641e-01	
-64	9.256918e-02	-3.61153e+00	-6.09422e-01	
-65	9.445688e-02	-4.92739e+00	-6.26152e-01	
-66	9.621191e-02	-4.64196e+00	-6.22698e-01	
-67	9.821191e-02	-2.66332e+00	-5.93225e-01	
-68	1.000000e-01	-6.12323e-15	-5.42079e-06