Merge branch 'master' of https://github.com/FOSSEE/eSim

Conflicts:
	src/kicadtoNgspice/KicadtoNgspice.pyc

13 files changed, 14 insertions, 4 deletions

diff --git a/src/configuration/Appconfig.pyc b/src/configuration/Appconfig.pyc
index 7ba34c34..3d2c022d 100644
--- a/src/configuration/Appconfig.pyc
+++ b/src/configuration/Appconfig.pyc
diff --git a/src/configuration/__init__.pyc b/src/configuration/__init__.pyc
index e99acbcf..7a78727c 100644
--- a/src/configuration/__init__.pyc
+++ b/src/configuration/__init__.pyc
diff --git a/src/frontEnd/ViewManagement.pyc b/src/frontEnd/ViewManagement.pyc
index 53ca0251..f4a3ed36 100644
--- a/src/frontEnd/ViewManagement.pyc
+++ b/src/frontEnd/ViewManagement.pyc
diff --git a/src/frontEnd/Workspace.pyc b/src/frontEnd/Workspace.pyc
index 2d2829a6..57c10756 100644
--- a/src/frontEnd/Workspace.pyc
+++ b/src/frontEnd/Workspace.pyc
diff --git a/src/kicadtoNgspice/Analysis.pyc b/src/kicadtoNgspice/Analysis.pyc
index b33c052a..61b12fe2 100644
--- a/src/kicadtoNgspice/Analysis.pyc
+++ b/src/kicadtoNgspice/Analysis.pyc
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/__init__.pyc b/src/kicadtoNgspice/__init__.pyc
index ce5d7c9f..3d94ee17 100644
--- a/src/kicadtoNgspice/__init__.pyc
+++ b/src/kicadtoNgspice/__init__.pyc
diff --git a/src/projManagement/Kicad.pyc b/src/projManagement/Kicad.pyc
index 4011f875..086edc10 100644
--- a/src/projManagement/Kicad.pyc
+++ b/src/projManagement/Kicad.pyc
diff --git a/src/projManagement/Validation.pyc b/src/projManagement/Validation.pyc
index 34e4aca0..701fd65b 100644
--- a/src/projManagement/Validation.pyc
+++ b/src/projManagement/Validation.pyc
diff --git a/src/projManagement/Worker.pyc b/src/projManagement/Worker.pyc
index 1144e9ed..74cd7681 100644
--- a/src/projManagement/Worker.pyc
+++ b/src/projManagement/Worker.pyc
diff --git a/src/projManagement/__init__.pyc b/src/projManagement/__init__.pyc
index f50153e3..c9d8227c 100644
--- a/src/projManagement/__init__.pyc
+++ b/src/projManagement/__init__.pyc
diff --git a/src/projManagement/newProject.pyc b/src/projManagement/newProject.pyc
index 2754be24..a73cc667 100644
--- a/src/projManagement/newProject.pyc
+++ b/src/projManagement/newProject.pyc
diff --git a/src/projManagement/openProject.pyc b/src/projManagement/openProject.pyc
index 441e488f..26147b44 100644
--- a/src/projManagement/openProject.pyc
+++ b/src/projManagement/openProject.pyc