From b5da612fb7e17ce4039b54aee49664cd9af822b1 Mon Sep 17 00:00:00 2001 From: komalsheth236 Date: Mon, 20 Apr 2015 18:12:25 +0530 Subject: Changes in Convert.py --- src/configuration/Appconfig.pyc | Bin 1331 -> 1334 bytes src/configuration/__init__.pyc | Bin 144 -> 144 bytes src/frontEnd/ViewManagement.pyc | Bin 3274 -> 3280 bytes src/frontEnd/Workspace.pyc | Bin 3497 -> 3504 bytes src/kicadtoNgspice/Analysis.pyc | Bin 11829 -> 11847 bytes src/kicadtoNgspice/Convert.py | 18 ++++++++++++++---- src/kicadtoNgspice/KicadtoNgspice.pyc | Bin 5130 -> 5090 bytes src/kicadtoNgspice/__init__.pyc | Bin 144 -> 145 bytes src/projManagement/Kicad.pyc | Bin 4108 -> 4115 bytes src/projManagement/Validation.pyc | Bin 1988 -> 1995 bytes src/projManagement/Worker.pyc | Bin 1441 -> 1447 bytes src/projManagement/__init__.pyc | Bin 145 -> 145 bytes src/projManagement/newProject.pyc | Bin 3816 -> 3822 bytes src/projManagement/openProject.pyc | Bin 1835 -> 1839 bytes 14 files changed, 14 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/configuration/Appconfig.pyc b/src/configuration/Appconfig.pyc index 7ba34c34..3d2c022d 100644 Binary files a/src/configuration/Appconfig.pyc and b/src/configuration/Appconfig.pyc differ diff --git a/src/configuration/__init__.pyc b/src/configuration/__init__.pyc index e99acbcf..7a78727c 100644 Binary files a/src/configuration/__init__.pyc and b/src/configuration/__init__.pyc differ diff --git a/src/frontEnd/ViewManagement.pyc b/src/frontEnd/ViewManagement.pyc index 53ca0251..f4a3ed36 100644 Binary files a/src/frontEnd/ViewManagement.pyc and b/src/frontEnd/ViewManagement.pyc differ diff --git a/src/frontEnd/Workspace.pyc b/src/frontEnd/Workspace.pyc index 2d2829a6..57c10756 100644 Binary files a/src/frontEnd/Workspace.pyc and b/src/frontEnd/Workspace.pyc differ diff --git a/src/kicadtoNgspice/Analysis.pyc b/src/kicadtoNgspice/Analysis.pyc index b33c052a..61b12fe2 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 1e293996..c0d98548 100644 --- a/src/kicadtoNgspice/Convert.py +++ b/src/kicadtoNgspice/Convert.py @@ -130,15 +130,16 @@ class Convert: if self.variable== 'AC': self.no=0 - 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] ) + self.writefile.write(".ac"+' ' + self.ac_type + ' '+ str(self.defaultvalue(self.ac_entry_var[self.no+2].text()))+' ' + str(self.defaultvalue(self.ac_entry_var[self.no].text())) + self.ac_parameter[self.no]+ ' ' + str(self.defaultvalue(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].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])) + self.no=0 + self.writefile.write(".dc" +' '+ str(self.dc_entry_var[self.no].text())+ ' '+ str(self.defaultvalue(self.dc_entry_var[self.no+1].text())) + self.converttosciform(self.dc_parameter[self.no]) + ' '+ str(self.defaultvalue(self.dc_entry_var[self.no+3].text()))+ self.converttosciform(self.dc_parameter[self.no+2]) + ' '+ str(self.defaultvalue(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+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])) + self.writefile.write(".tran" + ' '+ str(self.defaultvalue(self.tran_entry_var[self.no+1].text())) + self.converttosciform(self.trans_parameter[self.no+1]) + ' ' + str(self.defaultvalue(self.tran_entry_var[self.no+2].text())) + self.converttosciform(self.trans_parameter[self.no+2])+' '+ str(self.defaultvalue(self.tran_entry_var[self.no].text()))+ self.converttosciform(self.trans_parameter[self.no])) + else: pass self.writefile.close() @@ -155,6 +156,13 @@ class Convert: return "e-12" else: return "e-00" + + def defaultvalue(self, value): + self.value= value + if self.value == '': + return 0 + else: + pass def addModelParameter(self,schematicInfo): @@ -250,4 +258,6 @@ class Convert: return schematicInfo + + \ No newline at end of file diff --git a/src/kicadtoNgspice/KicadtoNgspice.pyc b/src/kicadtoNgspice/KicadtoNgspice.pyc index 55c51801..0176963b 100644 Binary files a/src/kicadtoNgspice/KicadtoNgspice.pyc and b/src/kicadtoNgspice/KicadtoNgspice.pyc differ diff --git a/src/kicadtoNgspice/__init__.pyc b/src/kicadtoNgspice/__init__.pyc index ce5d7c9f..3d94ee17 100644 Binary files a/src/kicadtoNgspice/__init__.pyc and b/src/kicadtoNgspice/__init__.pyc differ diff --git a/src/projManagement/Kicad.pyc b/src/projManagement/Kicad.pyc index 4011f875..086edc10 100644 Binary files a/src/projManagement/Kicad.pyc and b/src/projManagement/Kicad.pyc differ diff --git a/src/projManagement/Validation.pyc b/src/projManagement/Validation.pyc index 34e4aca0..701fd65b 100644 Binary files a/src/projManagement/Validation.pyc and b/src/projManagement/Validation.pyc differ diff --git a/src/projManagement/Worker.pyc b/src/projManagement/Worker.pyc index 1144e9ed..74cd7681 100644 Binary files a/src/projManagement/Worker.pyc and b/src/projManagement/Worker.pyc differ diff --git a/src/projManagement/__init__.pyc b/src/projManagement/__init__.pyc index f50153e3..c9d8227c 100644 Binary files a/src/projManagement/__init__.pyc and b/src/projManagement/__init__.pyc differ diff --git a/src/projManagement/newProject.pyc b/src/projManagement/newProject.pyc index 2754be24..a73cc667 100644 Binary files a/src/projManagement/newProject.pyc and b/src/projManagement/newProject.pyc differ diff --git a/src/projManagement/openProject.pyc b/src/projManagement/openProject.pyc index 441e488f..26147b44 100644 Binary files a/src/projManagement/openProject.pyc and b/src/projManagement/openProject.pyc differ -- cgit