From 0e3b9d36db73b525ece44933b88e49731e6f2ff1 Mon Sep 17 00:00:00 2001
From: fahim
Date: Wed, 10 Jun 2015 15:22:47 +0530
Subject: Subject: Bug fixing for adding device model library for windows

Description: Bug fixing for adding device model library for windows
---
 src/deviceModelLibrary/Transistor/NPN.xml | 2 +-
 src/deviceModelLibrary/Transistor/PNP.xml | 2 +-
 src/kicadtoNgspice/Analysis.py            | 3 +--
 src/kicadtoNgspice/Convert.py             | 6 +++++-
 4 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/deviceModelLibrary/Transistor/NPN.xml b/src/deviceModelLibrary/Transistor/NPN.xml
index f0679885..b2698bb1 100644
--- a/src/deviceModelLibrary/Transistor/NPN.xml
+++ b/src/deviceModelLibrary/Transistor/NPN.xml
@@ -1,6 +1,6 @@
 <library>
 <model_name>NPN</model_name>
-<refrence>Q2N2222</refrence>
+<ref_model>Q2N2222</ref_model>
 <param>
 <Is>14.34f </Is>
 <Xti>3 </Xti>
diff --git a/src/deviceModelLibrary/Transistor/PNP.xml b/src/deviceModelLibrary/Transistor/PNP.xml
index a25276a9..681b3fd9 100644
--- a/src/deviceModelLibrary/Transistor/PNP.xml
+++ b/src/deviceModelLibrary/Transistor/PNP.xml
@@ -1,6 +1,6 @@
 <library>
 <model_name>PNP</model_name>
-<refrence>Q2N2907A</refrence>
+<ref_model>Q2N2907A</ref_model>
 <param>
 <Is>650.6E-18</Is> 
 <Xti>3 </Xti>
diff --git a/src/kicadtoNgspice/Analysis.py b/src/kicadtoNgspice/Analysis.py
index 22383c5b..7ac430c4 100644
--- a/src/kicadtoNgspice/Analysis.py
+++ b/src/kicadtoNgspice/Analysis.py
@@ -1,6 +1,5 @@
 
-from PyQt4 import QtGui,QtCore
-from PyQt4.Qt import QRect
+from PyQt4 import QtGui
 import TrackWidget
 import os
 import sys
diff --git a/src/kicadtoNgspice/Convert.py b/src/kicadtoNgspice/Convert.py
index 50b2f98b..739963ba 100644
--- a/src/kicadtoNgspice/Convert.py
+++ b/src/kicadtoNgspice/Convert.py
@@ -320,7 +320,11 @@ class Convert:
                         deviceLine[index] = words                    
                         includeLine.append(".include "+libname)
                         
-                        src = completeLibPath.split(':')[0]
+                        #src = completeLibPath.split(':')[0] # <----- Not working in Windows
+                        
+                        (src_path,src_lib) = os.path.split(completeLibPath)
+                        src_lib = src_lib.split(':')[0]
+                        src = os.path.join(src_path,src_lib)
                         dst = projpath
                         shutil.copy2(src, dst)
                     else:
-- 
cgit