diff --git a/src/configuration/Appconfig.pyc b/src/configuration/Appconfig.pyc index 7ba34c348..3d2c022d4 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 e99acbcfc..7a78727c9 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 53ca02510..f4a3ed365 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 2d2829a67..57c10756a 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 b33c052a7..61b12fe23 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 1e2939960..c0d985488 100644 --- a/src/kicadtoNgspice/Convert.py +++ b/src/kicadtoNgspice/Convert.py @@ -130,15 +130,16 @@ def analysisInsertor(self,ac_entry_var,dc_entry_var, tran_entry_var,set_checkbox 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 @@ def converttosciform(self, string_obj): 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 @@ def addModelParameter(self,schematicInfo): return schematicInfo + + \ No newline at end of file diff --git a/src/kicadtoNgspice/KicadtoNgspice.pyc b/src/kicadtoNgspice/KicadtoNgspice.pyc index 55c518010..0176963bc 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 ce5d7c9f5..3d94ee17a 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 4011f8758..086edc100 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 34e4aca00..701fd65b3 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 1144e9ed5..74cd7681e 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 f50153e3f..c9d8227ce 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 2754be241..a73cc6670 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 441e488fa..26147b447 100644 Binary files a/src/projManagement/openProject.pyc and b/src/projManagement/openProject.pyc differ