ASCEE/pyqtgraph
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Pylint cleanups - remove commented out code, fix formatting etc

Browse Source
This commit is contained in:
Brianna Laugher 2013-03-05 13:58:42 +11:00
parent bc7e927ba7
commit 5254d29b6a
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pyqtgraph/widgets/TableWidget.py
View File

@ -6,7 +6,7 @@ import numpy as np
try: try:
import metaarray import metaarray
HAVE_METAARRAY = True HAVE_METAARRAY = True
except: except ImportError:
HAVE_METAARRAY = False HAVE_METAARRAY = False
__all__ = ['TableWidget'] __all__ = ['TableWidget']
@ -60,26 +60,19 @@ class TableWidget(QtGui.QTableWidget):
first = next(it0) first = next(it0)
except StopIteration: except StopIteration:
return return
#if type(first) == type(np.float64(1)):
# return
fn1, header1 = self.iteratorFn(first) fn1, header1 = self.iteratorFn(first)
if fn1 is None: if fn1 is None:
self.clear() self.clear()
return return
#print fn0, header0
#print fn1, header1
firstVals = [x for x in fn1(first)] firstVals = [x for x in fn1(first)]
self.setColumnCount(len(firstVals)) self.setColumnCount(len(firstVals))
#print header0, header1
if not self.verticalHeadersSet and header0 is not None: if not self.verticalHeadersSet and header0 is not None:
#print "set header 0:", header0
self.setRowCount(len(header0)) self.setRowCount(len(header0))
self.setVerticalHeaderLabels(header0) self.setVerticalHeaderLabels(header0)
self.verticalHeadersSet = True self.verticalHeadersSet = True
if not self.horizontalHeadersSet and header1 is not None: if not self.horizontalHeadersSet and header1 is not None:
#print "set header 1:", header1
self.setHorizontalHeaderLabels(header1) self.setHorizontalHeaderLabels(header1)
self.horizontalHeadersSet = True self.horizontalHeadersSet = True
@ -110,13 +103,16 @@ class TableWidget(QtGui.QTableWidget):
elif data is None: elif data is None:
return (None,None) return (None,None)
else: else:
raise Exception("Don't know how to iterate over data type: %s" % str(type(data))) msg = "Don't know how to iterate over data type: {!s}".format(type(data))
raise TypeError(msg)
def iterFirstAxis(self, data): def iterFirstAxis(self, data):
for i in range(data.shape[0]): for i in range(data.shape[0]):
yield data[i] yield data[i]
def iterate(self, data): ## for numpy.void, which can be iterated but mysteriously has no __iter__ (??) def iterate(self, data):
# for numpy.void, which can be iterated but mysteriously
# has no __iter__ (??)
for x in data: for x in data:
yield x yield x
@ -124,14 +120,13 @@ class TableWidget(QtGui.QTableWidget):
self.appendData([data]) self.appendData([data])
def addRow(self, vals): def addRow(self, vals):
#print "add row:", vals
row = self.rowCount() row = self.rowCount()
self.setRowCount(row+1) self.setRowCount(row + 1)
self.setRow(row, vals) self.setRow(row, vals)
def setRow(self, row, vals): def setRow(self, row, vals):
if row > self.rowCount()-1: if row > self.rowCount() - 1:
self.setRowCount(row+1) self.setRowCount(row + 1)
for col in range(self.columnCount()): for col in range(self.columnCount()):
val = vals[col] val = vals[col]
if isinstance(val, float) or isinstance(val, np.floating): if isinstance(val, float) or isinstance(val, np.floating):
@ -140,7 +135,6 @@ class TableWidget(QtGui.QTableWidget):
s = str(val) s = str(val)
item = QtGui.QTableWidgetItem(s) item = QtGui.QTableWidgetItem(s)
item.value = val item.value = val
#print "add item to row %d:"%row, item, item.value
self.items.append(item) self.items.append(item)
self.setItem(row, col, item) self.setItem(row, col, item)
@ -148,8 +142,10 @@ class TableWidget(QtGui.QTableWidget):
"""Convert entire table (or just selected area) into tab-separated text values""" """Convert entire table (or just selected area) into tab-separated text values"""
if useSelection: if useSelection:
selection = self.selectedRanges()[0] selection = self.selectedRanges()[0]
rows = list(range(selection.topRow(), selection.bottomRow()+1)) rows = list(range(selection.topRow(),
columns = list(range(selection.leftColumn(), selection.rightColumn()+1)) selection.bottomRow() + 1))
columns = list(range(selection.leftColumn(),
selection.rightColumn() + 1))
else: else:
rows = list(range(self.rowCount())) rows = list(range(self.rowCount()))
columns = list(range(self.columnCount())) columns = list(range(self.columnCount()))