diff options
| author | fahim-oscad | 2016-04-04 17:14:56 +0530 |
|---|---|---|
| committer | fahim-oscad | 2016-04-04 17:14:56 +0530 |
| commit | ea16f579ebdccacfceed1e39f772503eaedc6141 (patch) | |
| tree | 0f42048a8fa22a882878d3fce5059c12b37769f1 | |
| parent | 705a0be005d9be0a3a81a4f58e4b5c92e586a4c9 (diff) | |
| download | eSim-ea16f579ebdccacfceed1e39f772503eaedc6141.tar.gz eSim-ea16f579ebdccacfceed1e39f772503eaedc6141.tar.bz2 eSim-ea16f579ebdccacfceed1e39f772503eaedc6141.zip | |
Remove merge confilct from modifications to release
| -rw-r--r-- | src/ngspiceSimulation/pythonPlotting.py | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/ngspiceSimulation/pythonPlotting.py b/src/ngspiceSimulation/pythonPlotting.py index 1fbe3575..a3fd09fb 100644 --- a/src/ngspiceSimulation/pythonPlotting.py +++ b/src/ngspiceSimulation/pythonPlotting.py @@ -401,8 +401,7 @@ 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] @@ -429,18 +428,13 @@ 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)) @@ -452,11 +446,8 @@ 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() |