diff options
| author | fahim-oscad | 2016-04-04 16:59:25 +0530 |
|---|---|---|
| committer | fahim-oscad | 2016-04-04 16:59:25 +0530 |
| commit | 705a0be005d9be0a3a81a4f58e4b5c92e586a4c9 (patch) | |
| tree | b94d6ecdbf95262b8da335aa7c650e3e2fc8607b /src/ngspiceSimulation | |
| parent | 92860fe3ba762ff0a690f887319a7d95018b49c9 (diff) | |
| parent | 66770d5e2c94cc299424daa67b8bfafcb4d9b8c1 (diff) | |
| download | eSim-705a0be005d9be0a3a81a4f58e4b5c92e586a4c9.tar.gz eSim-705a0be005d9be0a3a81a4f58e4b5c92e586a4c9.tar.bz2 eSim-705a0be005d9be0a3a81a4f58e4b5c92e586a4c9.zip | |
Merged modification branch into release
Diffstat (limited to 'src/ngspiceSimulation')
| -rw-r--r-- | src/ngspiceSimulation/NgspiceWidget.py | 1 | ||||
| -rw-r--r-- | src/ngspiceSimulation/pythonPlotting.py | 15 |
2 files changed, 13 insertions, 3 deletions
diff --git a/src/ngspiceSimulation/NgspiceWidget.py b/src/ngspiceSimulation/NgspiceWidget.py index ee4dafe7..310cbe3c 100644 --- a/src/ngspiceSimulation/NgspiceWidget.py +++ b/src/ngspiceSimulation/NgspiceWidget.py @@ -24,6 +24,7 @@ class NgspiceWidget(QtGui.QWidget): self.args = ['-hold','-e', self.command] self.process.start('xterm', self.args) self.obj_appconfig.process_obj.append(self.process) + self.obj_appconfig.proc_dict[self.obj_appconfig.current_project['ProjectName']].append(self.process.pid()) elif platform.system() == 'Windows': tempdir= os.getcwd() diff --git a/src/ngspiceSimulation/pythonPlotting.py b/src/ngspiceSimulation/pythonPlotting.py index deb66c8a..1fbe3575 100644 --- a/src/ngspiceSimulation/pythonPlotting.py +++ b/src/ngspiceSimulation/pythonPlotting.py @@ -110,7 +110,7 @@ class plotWindow(QtGui.QMainWindow): self.plotbtn = QtGui.QPushButton("Plot") self.plotbtn.setToolTip('<b>Press</b> to Plot' ) self.multimeterbtn = QtGui.QPushButton("Multimeter") - self.multimeterbtn.setToolTip('<b>Press</b> to get Multimeter' ) + self.multimeterbtn.setToolTip('<b>RMS</b> value of the current and voltage is displayed' ) self.text = QtGui.QLineEdit() self.funcLabel = QtGui.QLabel() self.palette1 = QtGui.QPalette() @@ -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) @@ -429,12 +429,17 @@ class MultimeterWidgetClass(QtGui.QWidget): QtGui.QWidget.__init__(self) self.multimeter = QtGui.QWidget(self) +<<<<<<< HEAD if voltFlag: self.node_branchLabel = QtGui.QLabel("Node") self.rmsValue = QtGui.QLabel(str(rmsValue)+" Volts") else: self.node_branchLabel = QtGui.QLabel("Branch") self.rmsValue = QtGui.QLabel(str(rmsValue)+" Amp") +======= + self.node_branchLabel = QtGui.QLabel("Node/Branch") + self.rmsLabel = QtGui.QLabel("RMS Value (Volts/Amperes)") +>>>>>>> modification self.rmsLabel = QtGui.QLabel("RMS Value") self.nodeBranchValue = QtGui.QLabel(str(node_branch)) @@ -447,7 +452,11 @@ class MultimeterWidgetClass(QtGui.QWidget): self.layout.addWidget(self.rmsValue,1,1) self.multimeter.setLayout(self.layout) +<<<<<<< HEAD self.setGeometry(loc_x,loc_y,200,100) +======= + self.setGeometry(loc_x,loc_y,300,100) +>>>>>>> modification self.setWindowTitle("MultiMeter") self.setWindowFlags(QtCore.Qt.WindowStaysOnTopHint) self.show() |