Merge branch 'FOSSEE:master' into master

1 files changed, 132 insertions, 4 deletions

diff --git a/src/kicadtoNgspice/DeviceModel.py b/src/kicadtoNgspice/DeviceModel.py
index c52ea2d0..d2cd0e73 100644
--- a/src/kicadtoNgspice/DeviceModel.py
+++ b/src/kicadtoNgspice/DeviceModel.py
@@ -15,6 +15,8 @@ class DeviceModel(QtWidgets.QWidget):
         - d   DIODE
         - j   JFET
         - m   MOSFET
+        - s   SWITCH
+        - tx  single lossy transmission line
     - Other 2 functions same as the ones in subCircuit
         - trackLibrary
         - trackLibraryWithoutButton
@@ -257,6 +259,131 @@ class DeviceModel(QtWidgets.QWidget):
                 self.grid.addWidget(jfetbox)
 
                 # Adding Device Details #
+                # Increment row and widget count
+                self.row = self.row + 1
+                self.devicemodel_dict_end[words[0]] = self.count
+                self.count = self.count + 1
+
+            elif eachline[0] == 's':
+                # print("Device Model Switch:", words[0])
+                self.devicemodel_dict_beg[words[0]] = self.count
+                switchbox = QtWidgets.QGroupBox()
+                switchgrid = QtWidgets.QGridLayout()
+                switchbox.setTitle(
+                    "Add library for Switch " +
+                    words[0] +
+                    " : " +
+                    words[5])
+                self.entry_var[self.count] = QtWidgets.QLineEdit()
+                self.entry_var[self.count].setText("")
+                # global path_name
+                try:
+                    for child in root:
+                        if child.tag == words[0]:
+                            # print("DEVICE MODEL MATCHING---", \
+                            #       child.tag, words[0])
+                            try:
+                                if child[0].text \
+                                   and os.path.exists(child[0].text):
+                                    path_name = child[0].text
+                                    self.entry_var[self.count] \
+                                        .setText(child[0].text)
+                                else:
+                                    self.entry_var[self.count].setText("")
+                            except BaseException as e:
+                                print("Error when set text of device " +
+                                      "model switch :", str(e))
+                except BaseException:
+                    pass
+
+                switchgrid.addWidget(self.entry_var[self.count], self.row, 1)
+                self.addbtn = QtWidgets.QPushButton("Add")
+                self.addbtn.setObjectName("%d" % self.count)
+                self.addbtn.clicked.connect(self.trackLibrary)
+                self.deviceDetail[self.count] = words[0]
+
+                if self.entry_var[self.count].text() == "":
+                    pass
+                else:
+                    self.trackLibraryWithoutButton(self.count, path_name)
+
+                switchgrid.addWidget(self.addbtn, self.row, 2)
+                switchbox.setLayout(switchgrid)
+
+                # CSS
+                switchbox.setStyleSheet(" \
+                QGroupBox { border: 1px solid gray; border-radius: \
+                9px; margin-top: 0.5em; } \
+                QGroupBox::title { subcontrol-origin: margin; left:\
+                 10px; padding: 0 3px 0 3px; } \
+                ")
+
+                self.grid.addWidget(switchbox)
+
+                # Adding Device Details #
+
+                # Increment row and widget count
+                self.row = self.row + 1
+                self.devicemodel_dict_end[words[0]] = self.count
+                self.count = self.count + 1
+
+            elif eachline[0] == 'ytxl':
+                # print("Device Model ymod:", words[0])
+                self.devicemodel_dict_beg[words[0]] = self.count
+                ymodbox = QtWidgets.QGroupBox()
+                ymodgrid = QtWidgets.QGridLayout()
+                ymodbox.setTitle(
+                    "Add library for ymod " +
+                    words[0] +
+                    " : " +
+                    words[4])
+                self.entry_var[self.count] = QtWidgets.QLineEdit()
+                self.entry_var[self.count].setText("")
+                # global path_name
+                try:
+                    for child in root:
+                        if child.tag == words[0]:
+                            # print("DEVICE MODEL MATCHING---", \
+                            #       child.tag, words[0])
+                            try:
+                                if child[0].text \
+                                   and os.path.exists(child[0].text):
+                                    path_name = child[0].text
+                                    self.entry_var[self.count] \
+                                        .setText(child[0].text)
+                                else:
+                                    self.entry_var[self.count].setText("")
+                            except BaseException as e:
+                                print("Error when set text of device " +
+                                      "model ymod :", str(e))
+                except BaseException:
+                    pass
+
+                ymodgrid.addWidget(self.entry_var[self.count], self.row, 1)
+                self.addbtn = QtWidgets.QPushButton("Add")
+                self.addbtn.setObjectName("%d" % self.count)
+                self.addbtn.clicked.connect(self.trackLibrary)
+                self.deviceDetail[self.count] = words[0]
+
+                if self.entry_var[self.count].text() == "":
+                    pass
+                else:
+                    self.trackLibraryWithoutButton(self.count, path_name)
+
+                ymodgrid.addWidget(self.addbtn, self.row, 2)
+                ymodbox.setLayout(ymodgrid)
+
+                # CSS
+                ymodbox.setStyleSheet(" \
+                QGroupBox { border: 1px solid gray; border-radius: \
+                9px; margin-top: 0.5em; } \
+                QGroupBox::title { subcontrol-origin: margin; left:\
+                 10px; padding: 0 3px 0 3px; } \
+                ")
+
+                self.grid.addWidget(ymodbox)
+
+                # Adding Device Details #
 
                 # Increment row and widget count
                 self.row = self.row + 1
@@ -264,6 +391,7 @@ class DeviceModel(QtWidgets.QWidget):
                 self.count = self.count + 1
 
             elif eachline[0] == 'm':
+
                 self.devicemodel_dict_beg[words[0]] = self.count
                 mosfetbox = QtWidgets.QGroupBox()
                 mosfetgrid = QtWidgets.QGridLayout()
@@ -273,7 +401,7 @@ class DeviceModel(QtWidgets.QWidget):
                     "Add library for MOSFET " +
                     words[0] +
                     " : " +
-                    words[5])
+                    words[4])
                 self.entry_var[self.count] = QtWidgets.QLineEdit()
                 self.entry_var[self.count].setText("")
                 self.entry_var[self.count].setReadOnly(True)
@@ -333,12 +461,12 @@ class DeviceModel(QtWidgets.QWidget):
                             # print("DEVICE MODEL MATCHING---", \
                             #       child.tag, words[0])
                             while i <= end:
-                                self.entry_var[i].setText(child[i-beg].text)
+                                self.entry_var[i].setText(child[i - beg].text)
                                 if (i - beg) == 0:
                                     if os.path.exists(child[0].text):
                                         self.entry_var[i] \
-                                            .setText(child[i-beg].text)
-                                        path_name = child[i-beg].text
+                                            .setText(child[i - beg].text)
+                                        path_name = child[i - beg].text
                                     else:
                                         self.entry_var[i].setText("")
                                 i = i + 1