summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/kicadtoNgspice/Convert.py10
-rw-r--r--src/kicadtoNgspice/Convert.pycbin14775 -> 14623 bytes
-rw-r--r--src/kicadtoNgspice/DeviceModel.py8
-rw-r--r--src/kicadtoNgspice/DeviceModel.pycbin8603 -> 8421 bytes
-rw-r--r--src/kicadtoNgspice/Model.py1
-rw-r--r--src/kicadtoNgspice/Model.pycbin3191 -> 3188 bytes
-rw-r--r--src/kicadtoNgspice/Processing.py12
-rw-r--r--src/kicadtoNgspice/Processing.pycbin10806 -> 10595 bytes
-rw-r--r--src/kicadtoNgspice/Source.py2
-rw-r--r--src/kicadtoNgspice/Source.pycbin6388 -> 6351 bytes
-rw-r--r--src/kicadtoNgspice/SubcircuitTab.py6
-rw-r--r--src/kicadtoNgspice/SubcircuitTab.pycbin5416 -> 5249 bytes
-rw-r--r--src/ngspiceSimulation/NgspiceWidget.pycbin1662 -> 1662 bytes
13 files changed, 19 insertions, 20 deletions
diff --git a/src/kicadtoNgspice/Convert.py b/src/kicadtoNgspice/Convert.py
index f02435d2..f3749cab 100644
--- a/src/kicadtoNgspice/Convert.py
+++ b/src/kicadtoNgspice/Convert.py
@@ -321,11 +321,11 @@ class Convert:
for eachline in schematicInfo:
words = eachline.split()
if words[0] in deviceLibList:
- print "Found Library line"
+ # print "Found Library line"
index = schematicInfo.index(eachline)
completeLibPath = deviceLibList[words[0]]
(libpath,libname) = os.path.split(completeLibPath)
- print "Library Path :",libpath
+ # print "Library Path :",libpath
#Copying library from devicemodelLibrary to Project Path
#Special case for MOSFET
if eachline[0] == 'm':
@@ -401,11 +401,11 @@ class Convert:
for eachline in schematicInfo:
words = eachline.split()
if words[0] in subList:
- print "Found Subcircuit line"
+ # print "Found Subcircuit line"
index = schematicInfo.index(eachline)
completeSubPath = subList[words[0]]
(subpath,subname) = os.path.split(completeSubPath)
- print "Library Path :",subpath
+ # print "Library Path :",subpath
#Copying library from devicemodelLibrary to Project Path
#Replace last word with library name
@@ -415,7 +415,7 @@ class Convert:
src = completeSubPath
dst = projpath
- print os.listdir(src)
+ # print os.listdir(src)
for files in os.listdir(src):
if os.path.isfile(os.path.join(src,files)):
if files != "analysis":
diff --git a/src/kicadtoNgspice/Convert.pyc b/src/kicadtoNgspice/Convert.pyc
index 4f80394c..e95e229d 100644
--- a/src/kicadtoNgspice/Convert.pyc
+++ b/src/kicadtoNgspice/Convert.pyc
Binary files differ
diff --git a/src/kicadtoNgspice/DeviceModel.py b/src/kicadtoNgspice/DeviceModel.py
index a982d05f..6f1e8a7e 100644
--- a/src/kicadtoNgspice/DeviceModel.py
+++ b/src/kicadtoNgspice/DeviceModel.py
@@ -52,12 +52,12 @@ class DeviceModel(QtGui.QWidget):
#Set Layout
self.grid = QtGui.QGridLayout()
self.setLayout(self.grid)
- print "Reading Device model details from Schematic"
+ # print "Reading Device model details from Schematic"
for eachline in schematicInfo:
words = eachline.split()
if eachline[0] == 'q':
- print "Device Model Transistor: ",words[0]
+ # print "Device Model Transistor: ",words[0]
self.devicemodel_dict_beg[words[0]]=self.count
transbox=QtGui.QGroupBox()
transgrid=QtGui.QGridLayout()
@@ -108,7 +108,7 @@ class DeviceModel(QtGui.QWidget):
self.count = self.count+1
elif eachline[0] == 'd':
- print "Device Model Diode:",words[0]
+ # print "Device Model Diode:",words[0]
self.devicemodel_dict_beg[words[0]]=self.count
diodebox=QtGui.QGroupBox()
diodegrid=QtGui.QGridLayout()
@@ -159,7 +159,7 @@ class DeviceModel(QtGui.QWidget):
self.count = self.count+1
elif eachline[0] == 'j':
- print "Device Model JFET:",words[0]
+ # print "Device Model JFET:",words[0]
self.devicemodel_dict_beg[words[0]]=self.count
jfetbox=QtGui.QGroupBox()
jfetgrid=QtGui.QGridLayout()
diff --git a/src/kicadtoNgspice/DeviceModel.pyc b/src/kicadtoNgspice/DeviceModel.pyc
index 6ac8f337..7a21b067 100644
--- a/src/kicadtoNgspice/DeviceModel.pyc
+++ b/src/kicadtoNgspice/DeviceModel.pyc
Binary files differ
diff --git a/src/kicadtoNgspice/Model.py b/src/kicadtoNgspice/Model.py
index 25a23d8c..703208ee 100644
--- a/src/kicadtoNgspice/Model.py
+++ b/src/kicadtoNgspice/Model.py
@@ -1,4 +1,3 @@
-
from PyQt4 import QtGui
import TrackWidget
diff --git a/src/kicadtoNgspice/Model.pyc b/src/kicadtoNgspice/Model.pyc
index 0d93058f..48c5251d 100644
--- a/src/kicadtoNgspice/Model.pyc
+++ b/src/kicadtoNgspice/Model.pyc
Binary files differ
diff --git a/src/kicadtoNgspice/Processing.py b/src/kicadtoNgspice/Processing.py
index 09544f19..1eb1686b 100644
--- a/src/kicadtoNgspice/Processing.py
+++ b/src/kicadtoNgspice/Processing.py
@@ -23,7 +23,7 @@ class PrcocessNetlist:
"""Read Parameter information and store it into dictionary"""
param={}
for eachline in kicadNetlis:
- print eachline
+ # print eachline
eachline=eachline.strip()
if len(eachline)>1:
words=eachline.split()
@@ -84,7 +84,7 @@ class PrcocessNetlist:
#Inser Special source parameter
schematicInfo1=[]
- print "Reading schematic info for source details"
+ # print "Reading schematic info for source details"
for compline in schematicInfo:
words=compline.split()
@@ -149,13 +149,13 @@ class PrcocessNetlist:
schematicInfo1.append(compName+" "+words[1]+" "+words[2]+" "+"V"+compName+" "+words[5])
schematicInfo=schematicInfo+schematicInfo1
- print "Source List : ",sourcelist
+ # print "Source List : ",sourcelist
#print schematicInfo
return schematicInfo,sourcelist
def convertICintoBasicBlocks(self,schematicInfo,outputOption,modelList,plotText):
- print "Reading Schematic info for Model"
+ # print "Reading Schematic info for Model"
#Insert details of Ngspice model
unknownModelList = []
multipleModelList = []
@@ -252,7 +252,7 @@ class PrcocessNetlist:
modelLine += compName
else:
- print "Split Details :",splitDetail
+ # print "Split Details :",splitDetail
modelLine = "a"+str(k)+" "
vectorDetail = splitDetail.split(':')
#print "Vector Details",vectorDetail
@@ -372,7 +372,7 @@ class PrcocessNetlist:
print "UnknownModelList Used in the Schematic",unknownModelList
print "Multiple Model XML file with same name ",multipleModelList
- print "Model List Details : ",modelList
+ # print "Model List Details : ",modelList
return schematicInfo,outputOption,modelList,unknownModelList,multipleModelList,plotText
diff --git a/src/kicadtoNgspice/Processing.pyc b/src/kicadtoNgspice/Processing.pyc
index 92c86492..1c66c6fc 100644
--- a/src/kicadtoNgspice/Processing.pyc
+++ b/src/kicadtoNgspice/Processing.pyc
Binary files differ
diff --git a/src/kicadtoNgspice/Source.py b/src/kicadtoNgspice/Source.py
index 1cf1487d..d31f5188 100644
--- a/src/kicadtoNgspice/Source.py
+++ b/src/kicadtoNgspice/Source.py
@@ -51,7 +51,7 @@ class Source(QtGui.QWidget):
if sourcelist:
for line in sourcelist:
#print "Voltage source line index: ",line[0]
- print "SourceList line: ",line
+ # print "SourceList line: ",line
track_id=line[0]
#print "track_id is ",track_id
if line[2]=='ac':
diff --git a/src/kicadtoNgspice/Source.pyc b/src/kicadtoNgspice/Source.pyc
index fe03449f..d0d28556 100644
--- a/src/kicadtoNgspice/Source.pyc
+++ b/src/kicadtoNgspice/Source.pyc
Binary files differ
diff --git a/src/kicadtoNgspice/SubcircuitTab.py b/src/kicadtoNgspice/SubcircuitTab.py
index e7a9ed66..e4c36eb9 100644
--- a/src/kicadtoNgspice/SubcircuitTab.py
+++ b/src/kicadtoNgspice/SubcircuitTab.py
@@ -53,7 +53,7 @@ class SubcircuitTab(QtGui.QWidget):
for eachline in schematicInfo:
words = eachline.split()
if eachline[0] == 'x':
- print "Subcircuit : Words",words[0]
+ # print "Subcircuit : Words",words[0]
self.obj_trac.subcircuitList[project_name+words[0]]=words
self.subcircuit_dict_beg[words[0]]=self.count
subbox=QtGui.QGroupBox()
@@ -66,7 +66,7 @@ class SubcircuitTab(QtGui.QWidget):
try:
for child in root:
if child.tag[0]==eachline[0] and child.tag[1]==eachline[1]:
- print "Subcircuit MATCHING---",child.tag[0],child.tag[1],eachline[0],eachline[1]
+ # print "Subcircuit MATCHING---",child.tag[0],child.tag[1],eachline[0],eachline[1]
try:
if os.path.exists(child[0].text):
self.entry_var[self.count].setText(child[0].text)
@@ -85,7 +85,7 @@ class SubcircuitTab(QtGui.QWidget):
#Send the number of ports specified with the given subcircuit for verification.
#eg. If the line is 'x1 4 0 3 ua741', there are 3 ports(4, 0 and 3).
self.numPorts.append(len(words)-2)
- print "Number of ports of sub circuit : ",self.numPorts
+ # print "Number of ports of sub circuit : ",self.numPorts
self.addbtn.clicked.connect(self.trackSubcircuit)
subgrid.addWidget(self.addbtn,self.row,2)
subbox.setLayout(subgrid)
diff --git a/src/kicadtoNgspice/SubcircuitTab.pyc b/src/kicadtoNgspice/SubcircuitTab.pyc
index 23f27032..e1781ace 100644
--- a/src/kicadtoNgspice/SubcircuitTab.pyc
+++ b/src/kicadtoNgspice/SubcircuitTab.pyc
Binary files differ
diff --git a/src/ngspiceSimulation/NgspiceWidget.pyc b/src/ngspiceSimulation/NgspiceWidget.pyc
index d3d0db31..a8b4f71a 100644
--- a/src/ngspiceSimulation/NgspiceWidget.pyc
+++ b/src/ngspiceSimulation/NgspiceWidget.pyc
Binary files differ