From 92860fe3ba762ff0a690f887319a7d95018b49c9 Mon Sep 17 00:00:00 2001
From: fahim-oscad
Date: Mon, 4 Apr 2016 14:06:56 +0530
Subject: separate widget for node and branch in python plotting
---
src/ngspiceSimulation/pythonPlotting.py | 23 +++++++++++++++++------
1 file changed, 17 insertions(+), 6 deletions(-)
(limited to 'src/ngspiceSimulation')
diff --git a/src/ngspiceSimulation/pythonPlotting.py b/src/ngspiceSimulation/pythonPlotting.py
index dd0ca532..deb66c8a 100644
--- a/src/ngspiceSimulation/pythonPlotting.py
+++ b/src/ngspiceSimulation/pythonPlotting.py
@@ -401,12 +401,18 @@ class plotWindow(QtGui.QMainWindow):
boxCheck = 0
loc_x = 300
loc_y = 300
+ print "My NBList---->",self.obj_dataext.NBList
+ print "My NBIList------->",self.obj_dataext.NBIList
for i,j in zip(self.chkbox,range(len(self.chkbox))):
if i.isChecked():
print "Check box",self.obj_dataext.NBList[j]
boxCheck += 1
+ if self.obj_dataext.NBList[j] in self.obj_dataext.NBIList:
+ voltFlag = False
+ else:
+ voltFlag = True
#Initializing Multimeter
- self.obj[j] = MultimeterWidgetClass(self.obj_dataext.NBList[j],self.getRMSValue(self.obj_dataext.y[j]),loc_x,loc_y)
+ self.obj[j] = MultimeterWidgetClass(self.obj_dataext.NBList[j],self.getRMSValue(self.obj_dataext.y[j]),loc_x,loc_y,voltFlag)
loc_x += 50
loc_y += 50
@@ -419,15 +425,20 @@ class plotWindow(QtGui.QMainWindow):
return np.sqrt(np.mean(np.square(dataPoints)))
class MultimeterWidgetClass(QtGui.QWidget):
- def __init__(self,node_branch,rmsValue,loc_x,loc_y):
+ def __init__(self,node_branch,rmsValue,loc_x,loc_y,voltFlag):
QtGui.QWidget.__init__(self)
self.multimeter = QtGui.QWidget(self)
- self.node_branchLabel = QtGui.QLabel("Node/Branch")
- self.rmsLabel = QtGui.QLabel("RMS Value")
+ 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.rmsLabel = QtGui.QLabel("RMS Value")
self.nodeBranchValue = QtGui.QLabel(str(node_branch))
- self.rmsValue = QtGui.QLabel(str(rmsValue))
+
self.layout = QtGui.QGridLayout(self)
self.layout.addWidget(self.node_branchLabel,0,0)
@@ -436,7 +447,7 @@ class MultimeterWidgetClass(QtGui.QWidget):
self.layout.addWidget(self.rmsValue,1,1)
self.multimeter.setLayout(self.layout)
- self.setGeometry(loc_x,loc_y,180,100)
+ self.setGeometry(loc_x,loc_y,200,100)
self.setWindowTitle("MultiMeter")
self.setWindowFlags(QtCore.Qt.WindowStaysOnTopHint)
self.show()
--
cgit