Skip to content

Commit c9477c7

Browse files
ckometterckometter
committed
setTextColor deprecated. Switch to setForeground
1 parent 71fa1f9 commit c9477c7

1 file changed

Lines changed: 23 additions & 23 deletions

File tree

‎dataVaultLivePlotter.py‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -433,11 +433,11 @@ def setupTable(self):
433433
headers = [min, max, pts]
434434

435435
min.setText('Minimum Value')
436-
min.setTextColor(QtGui.QColor(131,131,131))
436+
min.setForeground(QBrush(QColor(131,131,131)))
437437
max.setText('Maximum Value')
438-
max.setTextColor(QtGui.QColor(131,131,131))
438+
max.setForeground(QBrush(QColor(131,131,131)))
439439
pts.setText('Number of Points')
440-
pts.setTextColor(QtGui.QColor(131,131,131))
440+
pts.setForeground(QBrush(QColor(131,131,131)))
441441

442442
for ii in range(0, 3):
443443
self.extTable.setItem(0, ii+1, headers[ii])
@@ -1547,7 +1547,7 @@ def openNotepad(self):
15471547
if self.noteEdits.accepted:
15481548
self.notes = self.noteEdits.textEditor.toPlainText()
15491549

1550-
class plotSaved2DWindow(QtGui.QWidget):
1550+
class plotSaved2DWindow(QtWidgets.QWidget):
15511551
def __init__(self, reactor, fileDV, dir, plotInfo, yMovePos ):
15521552
super(plotSaved2DWindow, self).__init__()
15531553

@@ -2368,26 +2368,26 @@ def setupTables(self):
23682368
headers = [lbl1, x1, y1, lbl2, x2, y2, z2]
23692369

23702370
num1.setText('Plot')
2371-
num1.setTextColor(QtGui.QColor(131,131,131))
2371+
num1.setForeground(QBrush(QColor(131,131,131)))
23722372
num2.setText('Plot')
2373-
num2.setTextColor(QtGui.QColor(131,131,131))
2373+
num2.setForeground(QBrush(QColor(131,131,131)))
23742374

23752375
lbl1.setText('Plot Title')
2376-
lbl1.setTextColor(QtGui.QColor(131,131,131))
2376+
lbl1.setForeground(QBrush(QColor(131,131,131)))
23772377
lbl2.setText('Plot Title')
2378-
lbl2.setTextColor(QtGui.QColor(131,131,131))
2378+
lbl2.setForeground(QBrush(QColor(131,131,131)))
23792379

23802380
x1.setText('X Axis')
2381-
x1.setTextColor(QtGui.QColor(131,131,131))
2381+
x1.setForeground(QBrush(QColor(131,131,131)))
23822382
y1.setText('Y Axis')
2383-
y1.setTextColor(QtGui.QColor(131,131,131))
2383+
y1.setForeground(QBrush(QColor(131,131,131)))
23842384

23852385
x2.setText('X Axis')
2386-
x2.setTextColor(QtGui.QColor(131,131,131))
2386+
x2.setForeground(QBrush(QColor(131,131,131)))
23872387
y2.setText('Y Axis')
2388-
y2.setTextColor(QtGui.QColor(131,131,131))
2388+
y2.setForeground(QBrush(QColor(131,131,131)))
23892389
z2.setText('Z Axis')
2390-
z2.setTextColor(QtGui.QColor(131,131,131))
2390+
z2.setForeground(QBrush(QColor(131,131,131)))
23912391

23922392
for ii in range(0, 3):
23932393
self.onePlots.setItem(0, ii, headers[ii])
@@ -2414,31 +2414,31 @@ def formatTable(self, num = None):
24142414
for r in range(0, self.onePlots.rowCount()):
24152415
if self.onePlots.item(r, c) != None:
24162416
self.onePlots.item(r, c).setBackground(QtGui.QColor(0,0,0))
2417-
self.onePlots.item(r, c).setTextColor(QtGui.QColor(131,131,131))
2417+
self.onePlots.item(r, c).setForeground(QBrush(QColor(131,131,131)))
24182418
if c != 0:
24192419
self.onePlots.item(r, c).setFlags(QtCore.Qt.NoItemFlags)
24202420
elif c == 0 and r != 0:
24212421

24222422
item = self.onePlots.item(r, c)
24232423
if item.text() == '':
24242424
item.setText(self.backtext1)
2425-
item.setBackgroundColor(QtGui.QColor(100,100,150))
2426-
item.setTextColor(QtGui.QColor(0,0,0))
2425+
item.setBackground(QBrush(QColor(100,100,150)))
2426+
item.setForeground(QBrush(QColor(0,0,0)))
24272427
elif num ==2:
24282428
for c in range(0, 4):
24292429
for r in range(0, self.twoPlots.rowCount()):
24302430
if self.twoPlots.item(r, c) != None:
24312431
self.twoPlots.item(r, c).setBackground(QtGui.QColor(0,0,0))
2432-
self.twoPlots.item(r, c).setTextColor(QtGui.QColor(131,131,131))
2432+
self.twoPlots.item(r, c).setForeground(QBrush(QColor(131,131,131)))
24332433
if c != 0:
24342434
self.twoPlots.item(r, c).setFlags(QtCore.Qt.NoItemFlags)
24352435
elif c == 0 and r != 0:
24362436

24372437
item = self.twoPlots.item(r, c)
24382438
if item.text() == '':
24392439
item.setText(self.backtext2)
2440-
item.setBackgroundColor(QtGui.QColor(100,100,150))
2441-
item.setTextColor(QtGui.QColor(0,0,0))
2440+
item.setBackground(QBrush(QColor(100,100,150)))
2441+
item.setForeground(QBrush(QColor(0,0,0)))
24422442
else:
24432443
pass
24442444
self.formFlag = True
@@ -2720,10 +2720,10 @@ def popDirs(self, c = None):
27202720
l = yield self.dv.dir()
27212721
for i in l[0]:
27222722
self.dirList.addItem(i)
2723-
self.dirList.item(self.dirList.count() - 1).setTextColor(QtGui.QColor(131,131,131))
2723+
self.dirList.item(self.dirList.count() - 1).setForeground(QBrush(QColor(131,131,131)))
27242724
for i in l[1]:
27252725
self.fileList.addItem(i)
2726-
self.fileList.item(self.fileList.count() - 1).setTextColor(QtGui.QColor(131,131,131))
2726+
self.fileList.item(self.fileList.count() - 1).setForeground(QBrush(QColor(131,131,131)))
27272727
if self.currentDir[-1] == '':
27282728

27292729
self.dirName.setText('Root')
@@ -2853,10 +2853,10 @@ def popDirs(self, initDir = None, c = None):
28532853
l = yield self.dv.dir()
28542854
for i in l[0]:
28552855
self.dirList.addItem(i)
2856-
self.dirList.item(self.dirList.count() - 1).setTextColor(QtGui.QColor(131,131,131))
2856+
self.dirList.item(self.dirList.count() - 1).setForeground(QBrush(QColor(131,131,131)))
28572857
for i in l[1]:
28582858
self.fileList.addItem(i)
2859-
self.fileList.item(self.fileList.count() - 1).setTextColor(QtGui.QColor(131,131,131))
2859+
self.fileList.item(self.fileList.count() - 1).setForeground(QBrush(QColor(131,131,131)))
28602860
if self.currentDir[-1] == '':
28612861

28622862
self.dirName.setText('Root')

0 commit comments

Comments
 (0)