summaryrefslogtreecommitdiff
path: root/src/kicadtoNgspice
diff options
context:
space:
mode:
Diffstat (limited to 'src/kicadtoNgspice')
-rw-r--r--src/kicadtoNgspice/Convert.py2
-rw-r--r--src/kicadtoNgspice/DeviceModel.py13
-rw-r--r--src/kicadtoNgspice/KicadtoNgspice.py6
-rw-r--r--src/kicadtoNgspice/Model.py6
-rw-r--r--src/kicadtoNgspice/Processing.py6
-rw-r--r--src/kicadtoNgspice/SubcircuitTab.py4
6 files changed, 22 insertions, 15 deletions
diff --git a/src/kicadtoNgspice/Convert.py b/src/kicadtoNgspice/Convert.py
index 76b6ba57..8280f9e7 100644
--- a/src/kicadtoNgspice/Convert.py
+++ b/src/kicadtoNgspice/Convert.py
@@ -443,7 +443,7 @@ class Convert:
default = 0
# Cheking if value is iterable.its for vector
if (
- type(value) is not str and
+ not isinstance(value, str) and
hasattr(value, '__iter__')
):
addmodelLine += param + "=["
diff --git a/src/kicadtoNgspice/DeviceModel.py b/src/kicadtoNgspice/DeviceModel.py
index 57fd3f25..e1367181 100644
--- a/src/kicadtoNgspice/DeviceModel.py
+++ b/src/kicadtoNgspice/DeviceModel.py
@@ -65,6 +65,8 @@ class DeviceModel(QtGui.QWidget):
print("Reading Device model details from Schematic")
for eachline in schematicInfo:
+ print("=========================================")
+ print(eachline)
words = eachline.split()
if eachline[0] == 'q':
print("Device Model Transistor: ", words[0])
@@ -82,7 +84,7 @@ class DeviceModel(QtGui.QWidget):
try:
for key in json_data["deviceModel"]:
- if key[0] == eachline[0] and key[1] == eachline[1]:
+ if key == words[0]:
# print "DEVICE MODEL MATCHING---",child.tag[0],\
# child.tag[1],eachline[0],eachline[1]
try:
@@ -148,7 +150,7 @@ class DeviceModel(QtGui.QWidget):
# global path_name
try:
for key in json_data["deviceModel"]:
- if key[0] == eachline[0] and key[1] == eachline[1]:
+ if key == words[0]:
# print "DEVICE MODEL MATCHING---",child.tag[0],\
# child.tag[1],eachline[0],eachline[1]
try:
@@ -213,7 +215,7 @@ class DeviceModel(QtGui.QWidget):
# global path_name
try:
for key in json_data["deviceModel"]:
- if key[0] == eachline[0] and key[1] == eachline[1]:
+ if key == words[0]:
# print "DEVICE MODEL MATCHING---",child.tag[0],\
# child.tag[1],eachline[0],eachline[1]
try:
@@ -326,7 +328,7 @@ class DeviceModel(QtGui.QWidget):
# global path_name
try:
for key in json_data["deviceModel"]:
- if key[0] == eachline[0] and key[1] == eachline[1]:
+ if key == words[0]:
# print "DEVICE MODEL MATCHING---",child.tag[0],\
# child.tag[1],eachline[0],eachline[1]
while i <= end:
@@ -337,7 +339,7 @@ class DeviceModel(QtGui.QWidget):
json_data["deviceModel"][key][0]):
path_name = (
json_data["deviceModel"][key][0]
- )
+ )
else:
self.entry_var[i].setText("")
i = i + 1
@@ -408,6 +410,7 @@ class DeviceModel(QtGui.QWidget):
self.widgetObjCount = iter_value
print("self.widgetObjCount-----", self.widgetObjCount)
self.libfile = path_value
+ print("PATH VALUE", path_value)
# print "Selected Library File :",self.libfile
# Setting Library to Text Edit Line
diff --git a/src/kicadtoNgspice/KicadtoNgspice.py b/src/kicadtoNgspice/KicadtoNgspice.py
index 9624fc82..ef9201cb 100644
--- a/src/kicadtoNgspice/KicadtoNgspice.py
+++ b/src/kicadtoNgspice/KicadtoNgspice.py
@@ -41,6 +41,7 @@ class MainWindow(QtGui.QWidget):
- clarg1 is the path to the .cir file
- clarg2 is either None or "sub" depending on the analysis type
"""
+
def __init__(self, clarg1, clarg2=None):
QtGui.QWidget.__init__(self)
print("==================================")
@@ -107,7 +108,7 @@ class MainWindow(QtGui.QWidget):
unknownModelList,
multipleModelList,
plotText
- ) = obj_proc.convertICintoBasicBlocks(
+ ) = obj_proc.convertICintoBasicBlocks(
schematicInfo, outputOption, modelList, plotText
)
print("=======================================")
@@ -483,8 +484,7 @@ class MainWindow(QtGui.QWidget):
for key, value in line[7].items():
if(
hasattr(value, '__iter__') and
- i <= end and type(value) is not
- str
+ i <= end and not isinstance(value, str)
):
for item in value:
fields = {
diff --git a/src/kicadtoNgspice/Model.py b/src/kicadtoNgspice/Model.py
index eb1793f9..a182dd4e 100644
--- a/src/kicadtoNgspice/Model.py
+++ b/src/kicadtoNgspice/Model.py
@@ -62,7 +62,7 @@ class Model(QtGui.QWidget):
# print "Key : ",key
# print "Value : ",value
# Check if value is iterable
- if type(value) is not str and hasattr(value, '__iter__'):
+ if not isinstance(value, str) and hasattr(value, '__iter__'):
# For tag having vector value
temp_tag = []
for item in value:
@@ -115,8 +115,8 @@ class Model(QtGui.QWidget):
self.obj_trac.model_entry_var
[self.nextcount].setText(
str(list(json_data
- ["model"][mod]["values"]
- [i].values())[0]))
+ ["model"][mod]["values"]
+ [i].values())[0]))
)
i = i + 1
except BaseException:
diff --git a/src/kicadtoNgspice/Processing.py b/src/kicadtoNgspice/Processing.py
index ebbd3429..216383e6 100644
--- a/src/kicadtoNgspice/Processing.py
+++ b/src/kicadtoNgspice/Processing.py
@@ -16,6 +16,7 @@ class PrcocessNetlist:
"""
- Read the circuit file and return splitted lines
"""
+
def readNetlist(self, filename):
f = open(filename)
data = f.read()
@@ -31,6 +32,7 @@ class PrcocessNetlist:
- Read Parameter information and store it into dictionary
- kicadNetlis is the .cir file content
"""
+
def readParamInfo(self, kicadNetlis):
param = {}
print("=========================KICADNETLIST========================")
@@ -55,6 +57,7 @@ class PrcocessNetlist:
- Preprocess netlist (replace parameters)
- Separate infoline (first line) from the rest of netlist
"""
+
def preprocessNetlist(self, kicadNetlis, param):
netlist = []
for eachline in kicadNetlis:
@@ -125,6 +128,7 @@ class PrcocessNetlist:
- Then check for type whether ac, dc, sine, etc...
- Handle starting with h and f as well
"""
+
def insertSpecialSourceParam(self, schematicInfo, sourcelist):
schematicInfo1 = []
print("=============================================================")
@@ -462,7 +466,7 @@ class PrcocessNetlist:
"a" + str(k) + " (" + words[1] + " " +
words[2] + ") (interNode_" +
str(interMediateNodeCount) + " " + words[3] + ") "
- )
+ )
modelLine += compName + "_primary"
schematicInfo.append(modelLine)
k = k + 1
diff --git a/src/kicadtoNgspice/SubcircuitTab.py b/src/kicadtoNgspice/SubcircuitTab.py
index 52a7a824..d15407f7 100644
--- a/src/kicadtoNgspice/SubcircuitTab.py
+++ b/src/kicadtoNgspice/SubcircuitTab.py
@@ -73,7 +73,7 @@ class SubcircuitTab(QtGui.QWidget):
global path_name
try:
for key in json_data["subcircuit"]:
- if key[0] == eachline[0] and key[1] == eachline[1]:
+ if key == words[0]:
# print "Subcircuit MATCHING---",child.tag[0], \
# child.tag[1], eachline[0], eachline[1]
try:
@@ -203,4 +203,4 @@ class SubcircuitTab(QtGui.QWidget):
"Please select a valid Subcircuit directory \
(Containing '.sub' file).")
self.msg.setWindowTitle("Error Message")
- self.msg.show() \ No newline at end of file
+ self.msg.show()
generated by cgit (git 2.34.1) at 2024-12-21 15:35:09 +0000