summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfahim2015-04-13 14:57:07 +0530
committerfahim2015-04-13 14:57:07 +0530
commit3e626db04e3d2fadebb649cd55e1035e7eeca395 (patch)
tree07ae3eb0f02977e7a1bf5599b9c37cff4bdd076e
parentdfbf63e972cf9da81ab1cd254007d1c274df5e8b (diff)
downloadeSim-3e626db04e3d2fadebb649cd55e1035e7eeca395.tar.gz
eSim-3e626db04e3d2fadebb649cd55e1035e7eeca395.tar.bz2
eSim-3e626db04e3d2fadebb649cd55e1035e7eeca395.zip
Subject: Added summer.xml for testing purpose. Corrected code for
closing all application if Application window closed. Description: Addes summer.xml for testing purpose.Corrected code for closing application
-rw-r--r--src/configuration/Appconfig.py2
-rw-r--r--src/configuration/Appconfig.pycbin1303 -> 1331 bytes
-rwxr-xr-xsrc/frontEnd/Application.py13
-rw-r--r--src/kicadtoNgspice/Analysis.pycbin11712 -> 11829 bytes
-rw-r--r--src/kicadtoNgspice/KicadtoNgspice.pycbin4646 -> 4646 bytes
-rw-r--r--src/modelParamXML/Analog/summer.xml13
-rw-r--r--src/projManagement/Worker.py2
-rw-r--r--src/projManagement/Worker.pycbin1173 -> 1425 bytes
-rw-r--r--src/projManagement/newProject.pycbin3816 -> 3816 bytes
9 files changed, 21 insertions, 9 deletions
diff --git a/src/configuration/Appconfig.py b/src/configuration/Appconfig.py
index a5dfa546..10bf5ffd 100644
--- a/src/configuration/Appconfig.py
+++ b/src/configuration/Appconfig.py
@@ -20,8 +20,6 @@
from PyQt4 import QtGui
import os
-global procThread_list # keeps tracking all the processes called
-procThread_list = []
class Appconfig(QtGui.QWidget):
"""
diff --git a/src/configuration/Appconfig.pyc b/src/configuration/Appconfig.pyc
index a9348ab9..7ba34c34 100644
--- a/src/configuration/Appconfig.pyc
+++ b/src/configuration/Appconfig.pyc
Binary files differ
diff --git a/src/frontEnd/Application.py b/src/frontEnd/Application.py
index 2863ed6c..4c876474 100755
--- a/src/frontEnd/Application.py
+++ b/src/frontEnd/Application.py
@@ -58,20 +58,21 @@ class Application(QtGui.QMainWindow):
def initActions(self):
-
- self.newproj = QtGui.QAction(QtGui.QIcon('../images/newProject.svg'),'<b>New Project</b>',self)
+
+ self.newproj = QtGui.QAction(QtGui.QIcon('../images/newProject.png'),'<b>New Project</b>',self)
self.newproj.setShortcut('Ctrl+N')
self.newproj.triggered.connect(self.new_project)
- self.openproj = QtGui.QAction(QtGui.QIcon('../images/openProject.svg'),'<b>Open Project</b>',self)
+
+ self.openproj = QtGui.QAction(QtGui.QIcon('../images/openProject.png'),'<b>Open Project</b>',self)
self.openproj.setShortcut('Ctrl+O')
self.openproj.triggered.connect(self.open_project)
- self.exitproj = QtGui.QAction(QtGui.QIcon('../images/closeProject.svg'),'<b>Exit</b>',self)
+ self.exitproj = QtGui.QAction(QtGui.QIcon('../images/closeProject.png'),'<b>Exit</b>',self)
self.exitproj.setShortcut('Ctrl+X')
self.exitproj.triggered.connect(self.exit_project)
- self.helpfile = QtGui.QAction(QtGui.QIcon('../images/default.png'),'<b>Help</b>',self)
+ self.helpfile = QtGui.QAction(QtGui.QIcon('../images/helpProject.png'),'<b>Help</b>',self)
self.helpfile.setShortcut('Ctrl+H')
self.helpfile.triggered.connect(self.help_project)
@@ -131,7 +132,7 @@ def main(args):
It is main function of the module.It starts the application
"""
print "Hello Main"
- app = QtGui.QApplication(sys.argv)
+ app = QtGui.QApplication(args)
"""
splash_pix = QtGui.QPixmap('../images/FreeEDAlogo.jpg')
diff --git a/src/kicadtoNgspice/Analysis.pyc b/src/kicadtoNgspice/Analysis.pyc
index e1a12cda..ccd3af5f 100644
--- a/src/kicadtoNgspice/Analysis.pyc
+++ b/src/kicadtoNgspice/Analysis.pyc
Binary files differ
diff --git a/src/kicadtoNgspice/KicadtoNgspice.pyc b/src/kicadtoNgspice/KicadtoNgspice.pyc
index 7fc34021..7370bd4a 100644
--- a/src/kicadtoNgspice/KicadtoNgspice.pyc
+++ b/src/kicadtoNgspice/KicadtoNgspice.pyc
Binary files differ
diff --git a/src/modelParamXML/Analog/summer.xml b/src/modelParamXML/Analog/summer.xml
new file mode 100644
index 00000000..94c356b1
--- /dev/null
+++ b/src/modelParamXML/Analog/summer.xml
@@ -0,0 +1,13 @@
+<model>
+<name>summer</name>
+<type>Analog</type>
+<node_number>3</node_number>
+<title>Add parameters for Summer </title>
+<split>2-V:1-NV</split>
+<param>
+ <in_offset vector="2">Enter offset for input (default=0.0):</in_offset>
+ <in_gain vector="2">Enter gain for input 1 (default=1.0):</in_gain>
+ <out_gain>Enter gain for output (default=1.0):</out_gain>
+ <out_offset>Enter offset for output (default=0.0):</out_offset>
+</param>
+</model>
diff --git a/src/projManagement/Worker.py b/src/projManagement/Worker.py
index d31ba7c3..96f0d57b 100644
--- a/src/projManagement/Worker.py
+++ b/src/projManagement/Worker.py
@@ -28,7 +28,7 @@ class WorkerThread(QtCore.QThread):
def __del__(self):
self.wait()
- '''
+
def run(self):
print "Calling :",self.args
self.call_system(self.args)
diff --git a/src/projManagement/Worker.pyc b/src/projManagement/Worker.pyc
index 237fe279..b3aadc37 100644
--- a/src/projManagement/Worker.pyc
+++ b/src/projManagement/Worker.pyc
Binary files differ
diff --git a/src/projManagement/newProject.pyc b/src/projManagement/newProject.pyc
index b97b85c2..2754be24 100644
--- a/src/projManagement/newProject.pyc
+++ b/src/projManagement/newProject.pyc
Binary files differ