diff options
| -rw-r--r-- | Examples/BJT_CB_config/plot_data_i.txt | 2 | ||||
| -rw-r--r-- | Examples/BJT_CB_config/plot_data_v.txt | 4 | ||||
| -rw-r--r-- | Examples/BJT_amplifier/plot_data_i.txt | 2 | ||||
| -rw-r--r-- | Examples/BJT_amplifier/plot_data_v.txt | 6 | ||||
| -rwxr-xr-x | src/frontEnd/Application.py | 2 | ||||
| -rw-r--r-- | src/ngspiceSimulation/pythonPlotting.py | 4 |
6 files changed, 11 insertions, 9 deletions
diff --git a/Examples/BJT_CB_config/plot_data_i.txt b/Examples/BJT_CB_config/plot_data_i.txt index 267823ff..4f33de1a 100644 --- a/Examples/BJT_CB_config/plot_data_i.txt +++ b/Examples/BJT_CB_config/plot_data_i.txt @@ -1,5 +1,5 @@ * /home/fossee/updatedexamples/bjt_cb_config/bjt_cb_config.cir - DC transfer characteristic Thu Mar 3 18:30:45 2016 + DC transfer characteristic Thu Mar 17 11:54:06 2016 -------------------------------------------------------------------------------- Index i-sweep v1#branch v_u_ic1#branch -------------------------------------------------------------------------------- diff --git a/Examples/BJT_CB_config/plot_data_v.txt b/Examples/BJT_CB_config/plot_data_v.txt index 0a211bb1..3004d117 100644 --- a/Examples/BJT_CB_config/plot_data_v.txt +++ b/Examples/BJT_CB_config/plot_data_v.txt @@ -1,5 +1,5 @@ * /home/fossee/updatedexamples/bjt_cb_config/bjt_cb_config.cir - DC transfer characteristic Thu Mar 3 18:30:45 2016 + DC transfer characteristic Thu Mar 17 11:54:06 2016 -------------------------------------------------------------------------------- Index i-sweep ie net-_q1-pad1_ net-_q1-pad3_ -------------------------------------------------------------------------------- @@ -2220,7 +2220,7 @@ Index i-sweep ie net-_q1-pad1_ net-_q1-pad3_ 2106 5.000000e+00 -5.68795e+00 2.247493e-02 -6.87953e-01 * /home/fossee/updatedexamples/bjt_cb_config/bjt_cb_config.cir - DC transfer characteristic Thu Mar 3 18:30:45 2016 + DC transfer characteristic Thu Mar 17 11:54:06 2016 -------------------------------------------------------------------------------- Index i-sweep net-_r1-pad1_ vcb -------------------------------------------------------------------------------- diff --git a/Examples/BJT_amplifier/plot_data_i.txt b/Examples/BJT_amplifier/plot_data_i.txt index 629ffccf..c09397f0 100644 --- a/Examples/BJT_amplifier/plot_data_i.txt +++ b/Examples/BJT_amplifier/plot_data_i.txt @@ -1,5 +1,5 @@ * /home/fossee/esim-workspace/bjt_amplifier/bjt_amplifier.cir - Transient Analysis Thu Mar 17 11:22:37 2016 + Transient Analysis Thu Mar 17 14:44:22 2016 -------------------------------------------------------------------------------- Index time v1#branch v2#branch -------------------------------------------------------------------------------- diff --git a/Examples/BJT_amplifier/plot_data_v.txt b/Examples/BJT_amplifier/plot_data_v.txt index 6f2807cd..ea36ae47 100644 --- a/Examples/BJT_amplifier/plot_data_v.txt +++ b/Examples/BJT_amplifier/plot_data_v.txt @@ -1,5 +1,5 @@ * /home/fossee/esim-workspace/bjt_amplifier/bjt_amplifier.cir - Transient Analysis Thu Mar 17 11:22:37 2016 + Transient Analysis Thu Mar 17 14:44:22 2016 -------------------------------------------------------------------------------- Index time in net-_c1-pad1_ net-_c1-pad2_ -------------------------------------------------------------------------------- @@ -1064,7 +1064,7 @@ Index time in net-_c1-pad1_ net-_c1-pad2_ 1007 1.000000e-02 -2.44929e-17 2.336157e-06 1.837271e+00 * /home/fossee/esim-workspace/bjt_amplifier/bjt_amplifier.cir - Transient Analysis Thu Mar 17 11:22:37 2016 + Transient Analysis Thu Mar 17 14:44:22 2016 -------------------------------------------------------------------------------- Index time net-_c2-pad2_ net-_c3-pad2_ net-_r2-pad1_ -------------------------------------------------------------------------------- @@ -2129,7 +2129,7 @@ Index time net-_c2-pad2_ net-_c3-pad2_ net-_r2-pad1_ 1007 1.000000e-02 1.199900e+00 8.416406e+00 1.000000e+01 * /home/fossee/esim-workspace/bjt_amplifier/bjt_amplifier.cir - Transient Analysis Thu Mar 17 11:22:37 2016 + Transient Analysis Thu Mar 17 14:44:22 2016 -------------------------------------------------------------------------------- Index time out -------------------------------------------------------------------------------- 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) |