From 19a9874b1fbf6d4edd1a9c052096187b6068119c Mon Sep 17 00:00:00 2001
From: fahim
Date: Fri, 17 Apr 2015 16:57:49 +0530
Subject: Subject : Modified in Analysis Inserter function

Description: Modified Analysis Inserter function
---
 src/kicadtoNgspice/Analysis.py        |  14 +++++++-------
 src/kicadtoNgspice/Analysis.pyc       | Bin 11829 -> 11829 bytes
 src/kicadtoNgspice/Convert.py         |   9 ++++-----
 src/kicadtoNgspice/KicadtoNgspice.pyc | Bin 5130 -> 5130 bytes
 4 files changed, 11 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/kicadtoNgspice/Analysis.py b/src/kicadtoNgspice/Analysis.py
index 1ad045dd..2dcb43c3 100644
--- a/src/kicadtoNgspice/Analysis.py
+++ b/src/kicadtoNgspice/Analysis.py
@@ -133,15 +133,15 @@ class Analysis(QtGui.QWidget):
         self.acgrid.addWidget(self.no_of_points,4,0)
         
         self.count=0
-        self.ac_entry_var[self.count] = QtGui.QLineEdit()
+        self.ac_entry_var[self.count] = QtGui.QLineEdit()#start
         self.acgrid.addWidget(self.ac_entry_var[self.count],2,1)
         self.ac_entry_var[self.count].setMaximumWidth(150)
         self.count= self.count+1
-        self.ac_entry_var[self.count] = QtGui.QLineEdit()
+        self.ac_entry_var[self.count] = QtGui.QLineEdit()#stop
         self.acgrid.addWidget(self.ac_entry_var[self.count],3,1)
         self.ac_entry_var[self.count].setMaximumWidth(150)
         self.count= self.count+1
-        self.ac_entry_var[self.count] = QtGui.QLineEdit()
+        self.ac_entry_var[self.count] = QtGui.QLineEdit()#no of pts
         self.acgrid.addWidget(self.ac_entry_var[self.count],4,1)
         self.ac_entry_var[self.count].setMaximumWidth(150)
         
@@ -221,19 +221,19 @@ class Analysis(QtGui.QWidget):
         self.dcgrid.addWidget(self.stop,4,0)        
         
         self.count=0
-        self.dc_entry_var[self.count] = QtGui.QLineEdit()
+        self.dc_entry_var[self.count] = QtGui.QLineEdit()#source
         self.dcgrid.addWidget(self.dc_entry_var[self.count],1,1)
         self.dc_entry_var[self.count].setMaximumWidth(150)
         self.count= self.count+1
-        self.dc_entry_var[self.count] = QtGui.QLineEdit()
+        self.dc_entry_var[self.count] = QtGui.QLineEdit()#start
         self.dcgrid.addWidget(self.dc_entry_var[self.count],2,1)
         self.dc_entry_var[self.count].setMaximumWidth(150)
         self.count= self.count+1
-        self.dc_entry_var[self.count] = QtGui.QLineEdit()
+        self.dc_entry_var[self.count] = QtGui.QLineEdit()#increment
         self.dcgrid.addWidget(self.dc_entry_var[self.count],3,1)
         self.dc_entry_var[self.count].setMaximumWidth(150)
         self.count= self.count+1
-        self.dc_entry_var[self.count] = QtGui.QLineEdit()
+        self.dc_entry_var[self.count] = QtGui.QLineEdit()#stop
         self.dcgrid.addWidget(self.dc_entry_var[self.count],4,1)
         self.dc_entry_var[self.count].setMaximumWidth(150)
 
diff --git a/src/kicadtoNgspice/Analysis.pyc b/src/kicadtoNgspice/Analysis.pyc
index ccd3af5f..b33c052a 100644
Binary files a/src/kicadtoNgspice/Analysis.pyc and b/src/kicadtoNgspice/Analysis.pyc differ
diff --git a/src/kicadtoNgspice/Convert.py b/src/kicadtoNgspice/Convert.py
index 18006e76..1e293996 100644
--- a/src/kicadtoNgspice/Convert.py
+++ b/src/kicadtoNgspice/Convert.py
@@ -130,16 +130,15 @@ class Convert:
        
         if self.variable== 'AC':
             self.no=0
-            self.writefile.write(".ac " + self.ac_type + ' ' + str(self.ac_entry_var[self.no].text()) + ' ' + self.ac_parameter[self.no]+ ' ' + str(self.ac_entry_var[self.no+1].text()) + ' '+ self.ac_parameter[self.no+1] + ' ' + str(self.ac_entry_var[self.no+2].text()))        
+            self.writefile.write(".ac"+' ' + self.ac_type + ' '+str(self.ac_entry_var[self.no+2].text())+' ' + str(self.ac_entry_var[self.no].text()) + self.ac_parameter[self.no]+ ' ' + str(self.ac_entry_var[self.no+1].text()) + self.ac_parameter[self.no+1] )        
 
         elif self.variable=='DC':
-            self.no=0 
-            self.writefile.write(".dc " + str(self.dc_entry_var[self.no+1].text())+ ' ' + self.converttosciform(self.dc_parameter[self.no]) + ' '+ str(self.dc_entry_var[self.no+2].text())+ ' ' + self.converttosciform(self.dc_parameter[self.no+1]) + ' '+ str(self.dc_entry_var[self.no+3].text())+ ' ' + self.converttosciform(self.dc_parameter[self.no+2]))
+            self.no=0
+            self.writefile.write(".dc" +' '+ str(self.dc_entry_var[self.no].text())+ ' '+ str(self.dc_entry_var[self.no+1].text()) + self.converttosciform(self.dc_parameter[self.no]) + ' '+ str(self.dc_entry_var[self.no+3].text())+ self.converttosciform(self.dc_parameter[self.no+2]) + ' '+ str(self.dc_entry_var[self.no+2].text()) + self.converttosciform(self.dc_parameter[self.no+1]))
 
         elif self.variable == 'TRAN':
             self.no= 0
-            self.writefile.write(".tran " + str(self.tran_entry_var[self.no].text())+ ' ' + self.converttosciform(self.trans_parameter[self.no]) + ' ' + str(self.tran_entry_var[self.no+1].text()) + ' ' + self.converttosciform(self.trans_parameter[self.no+1]) + ' ' + str(self.tran_entry_var[self.no+2].text()) + ' '+ self.converttosciform(self.trans_parameter[self.no+2]))
-
+            self.writefile.write(".tran" + ' '+ str(self.tran_entry_var[self.no+1].text()) + self.converttosciform(self.trans_parameter[self.no+1]) + ' ' + str(self.tran_entry_var[self.no+2].text()) + self.converttosciform(self.trans_parameter[self.no+2])+' '+ str(self.tran_entry_var[self.no].text())+ self.converttosciform(self.trans_parameter[self.no]))
         else:
             pass
         self.writefile.close()
diff --git a/src/kicadtoNgspice/KicadtoNgspice.pyc b/src/kicadtoNgspice/KicadtoNgspice.pyc
index b61ed5b2..55c51801 100644
Binary files a/src/kicadtoNgspice/KicadtoNgspice.pyc and b/src/kicadtoNgspice/KicadtoNgspice.pyc differ
-- 
cgit