From d41e4a590793a6fb8fbb1b38a552ec413347aa78 Mon Sep 17 00:00:00 2001
From: athulappadan
Date: Thu, 17 Mar 2016 14:46:35 +0530
Subject: Standard plotting functions labels changed
---
src/frontEnd/Application.py | 2 ++
src/ngspiceSimulation/pythonPlotting.py | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
(limited to 'src')
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
@@ -187,6 +187,8 @@ class Application(QtGui.QMainWindow):
if current_project==None:
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
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("List of Nodes:")
self.listBranch.setText("List of Branches:")
self.funcLabel.setText("Function:")
- self.funcName.setText("Examples:\
+ self.funcName.setText("Standard functions\
Addition:
Subtraction:
Multiplication:
Division:
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)
--
cgit