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

Merge pull request #712 from campagnola/filterwidget-update

Browse Source 
avoid repeated signal emission in filterwidget
This commit is contained in:
Luke Campagnola 2018-06-19 08:43:51 -07:00 committed by GitHub
commit ca7d12d666
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pyqtgraph/widgets/DataFilterWidget.py
View File

@ -24,16 +24,13 @@ class DataFilterWidget(ptree.ParameterTree):
self.params = DataFilterParameter()
self.setParameters(self.params)
self.params.sigTreeStateChanged.connect(self.filterChanged)
self.params.sigFilterChanged.connect(self.sigFilterChanged)
self.setFields = self.params.setFields
self.generateMask = self.params.generateMask
self.filterData = self.params.filterData
self.describe = self.params.describe
def filterChanged(self):
self.sigFilterChanged.emit(self)
def parameters(self):
return self.params
@ -80,15 +77,17 @@ class DataFilterParameter(ptree.types.GroupParameter):
('field3', {'mode': 'enum', 'values': {'val1':True, 'val2':False, 'val3':True}}),
])
"""
self.fields = OrderedDict(fields)
names = self.fieldNames()
self.setAddList(names)
with fn.SignalBlock(self.sigTreeStateChanged, self.filterChanged):
self.fields = OrderedDict(fields)
names = self.fieldNames()
self.setAddList(names)
# update any existing filters
for ch in self.children():
name = ch.fieldName
if name in fields:
ch.updateFilter(fields[name])
# update any existing filters
for ch in self.children():
name = ch.fieldName
if name in fields:
ch.updateFilter(fields[name])
self.sigFilterChanged.emit(self)
def filterData(self, data):
if len(data) == 0: