From 1d4ee6b6c1254657c497673838922e746f339eca Mon Sep 17 00:00:00 2001
From: nilshah98
Date: Thu, 13 Jun 2019 18:52:12 +0530
Subject: model matching redundancy reduced

---
 src/kicadtoNgspice/DeviceModel.py   | 8 ++++----
 src/kicadtoNgspice/SubcircuitTab.py | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/kicadtoNgspice')

diff --git a/src/kicadtoNgspice/DeviceModel.py b/src/kicadtoNgspice/DeviceModel.py
index 6a9ad9d9..e1367181 100644
--- a/src/kicadtoNgspice/DeviceModel.py
+++ b/src/kicadtoNgspice/DeviceModel.py
@@ -84,7 +84,7 @@ class DeviceModel(QtGui.QWidget):
 
                 try:
                     for key in json_data["deviceModel"]:
-                        if key[0] == words[0][0] and key[1:] == words[0][1:]:
+                        if key == words[0]:
                             # print "DEVICE MODEL MATCHING---",child.tag[0],\
                             # child.tag[1],eachline[0],eachline[1]
                             try:
@@ -150,7 +150,7 @@ class DeviceModel(QtGui.QWidget):
                 # global path_name
                 try:
                     for key in json_data["deviceModel"]:
-                        if key[0] == words[0][0] and key[1:] == words[0][1:]:
+                        if key == words[0]:
                             # print "DEVICE MODEL MATCHING---",child.tag[0],\
                             # child.tag[1],eachline[0],eachline[1]
                             try:
@@ -215,7 +215,7 @@ class DeviceModel(QtGui.QWidget):
                 # global path_name
                 try:
                     for key in json_data["deviceModel"]:
-                        if key[0] == words[0][0] and key[1:] == words[0][1:]:
+                        if key == words[0]:
                             # print "DEVICE MODEL MATCHING---",child.tag[0],\
                             # child.tag[1],eachline[0],eachline[1]
                             try:
@@ -328,7 +328,7 @@ class DeviceModel(QtGui.QWidget):
                 # global path_name
                 try:
                     for key in json_data["deviceModel"]:
-                        if key[0] == words[0][0] and key[1:] == words[0][1:]:
+                        if key == words[0]:
                             # print "DEVICE MODEL MATCHING---",child.tag[0],\
                             # child.tag[1],eachline[0],eachline[1]
                             while i <= end:
diff --git a/src/kicadtoNgspice/SubcircuitTab.py b/src/kicadtoNgspice/SubcircuitTab.py
index 53a8eac9..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] == words[0][0] and key[1:] == words[0][1:]:
+                        if key == words[0]:
                             # print "Subcircuit MATCHING---",child.tag[0], \
                             # child.tag[1], eachline[0], eachline[1]
                             try:
-- 
cgit