summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorathulappadan2016-03-17 14:46:35 +0530
committerathulappadan2016-03-17 14:46:35 +0530
commitd41e4a590793a6fb8fbb1b38a552ec413347aa78 (patch)
tree6fa2c63b06d9e98c2718917dea96c05c15183e0e /src
parenteba6e6ed7860256287a7490b90d2e00fa903cd41 (diff)
downloadeSim-d41e4a590793a6fb8fbb1b38a552ec413347aa78.tar.gz
eSim-d41e4a590793a6fb8fbb1b38a552ec413347aa78.tar.bz2
eSim-d41e4a590793a6fb8fbb1b38a552ec413347aa78.zip
Standard plotting functions labels changed
Diffstat (limited to 'src')
-rwxr-xr-xsrc/frontEnd/Application.py2
-rw-r--r--src/ngspiceSimulation/pythonPlotting.py4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/frontEnd/Application.py b/src/frontEnd/Application.py
index 37fc6942..a4d93127 100755
--- a/src/frontEnd/Application.py
+++ b/src/frontEnd/Application.py
@@ -188,6 +188,8 @@ class Application(QtGui.QMainWindow):
pass
else:
for pid in self.obj_appconfig.proc_dict[self.obj_appconfig.current_project['ProjectName']]:
+ print pid
+ for pid in self.obj_appconfig.proc_dict[self.obj_appconfig.current_project['ProjectName']]:
os.kill(pid, 9)
self.obj_appconfig.current_project['ProjectName'] = None
self.systemTrayIcon.showMessage('Close', 'Current project '+os.path.basename(current_project)+' is Closed.')
diff --git a/src/ngspiceSimulation/pythonPlotting.py b/src/ngspiceSimulation/pythonPlotting.py
index b7899fe7..77171b0f 100644
--- a/src/ngspiceSimulation/pythonPlotting.py
+++ b/src/ngspiceSimulation/pythonPlotting.py
@@ -155,9 +155,9 @@ class plotWindow(QtGui.QMainWindow):
self.listNode.setText("<font color='indigo'>List of Nodes:</font>")
self.listBranch.setText("<font color='indigo'>List of Branches:</font>")
self.funcLabel.setText("<font color='indigo'>Function:</font>")
- self.funcName.setText("<font color='indigo'>Examples:</font>\
+ self.funcName.setText("<font color='indigo'>Standard functions</font>\
<br><br>Addition:<br>Subtraction:<br>Multiplication:<br>Division:<br>Comparison:")
- self.funcExample.setText("\n\nV(1) + V(2)\nV(1) - V(2)\nV(1) * V(2)\nV(1) / V(2)\nV(1) vs V(2)")
+ self.funcExample.setText("\n\nNode1 + Node2\nNode1 - Node2\nNode1 * Node2\nNode1 / Node2\nNode1 vs Node2")
#Connecting to plot and clear function
self.connect(self.clear,QtCore.SIGNAL('clicked()'),self.pushedClear)