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

Make parameter name,value inint args go through setValue and setName

Browse Source
This commit is contained in:
Luke Campagnola 2017-09-29 08:54:33 -07:00
parent 3609f9df3e
commit 0f910c45d1
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pyqtgraph/parametertree/Parameter.py
View File

@ -162,7 +162,11 @@ class Parameter(QtCore.QObject):
'title': None, 'title': None,
#'limits': None, ## This is a bad plan--each parameter type may have a different data type for limits. #'limits': None, ## This is a bad plan--each parameter type may have a different data type for limits.
} }
value = opts.get('value', None)
name = opts.get('name', None)
self.opts.update(opts) self.opts.update(opts)
self.opts['value'] = None # will be set later.
self.opts['name'] = None
self.childs = [] self.childs = []
self.names = {} ## map name:child self.names = {} ## map name:child
@ -172,17 +176,19 @@ class Parameter(QtCore.QObject):
self.blockTreeChangeEmit = 0 self.blockTreeChangeEmit = 0
#self.monitoringChildren = False ## prevent calling monitorChildren more than once #self.monitoringChildren = False ## prevent calling monitorChildren more than once
if 'value' not in self.opts: if not isinstance(name, basestring):
self.opts['value'] = None
if 'name' not in self.opts or not isinstance(self.opts['name'], basestring):
raise Exception("Parameter must have a string name specified in opts.") raise Exception("Parameter must have a string name specified in opts.")
self.setName(opts['name']) self.setName(name)
self.addChildren(self.opts.get('children', [])) self.addChildren(self.opts.get('children', []))
if 'value' in self.opts and 'default' not in self.opts: self.opts['value'] = None
self.opts['default'] = self.opts['value'] if value is not None:
self.setValue(value)
if 'default' not in self.opts:
self.opts['default'] = None
self.setDefault(self.opts['value'])
## Connect all state changed signals to the general sigStateChanged ## Connect all state changed signals to the general sigStateChanged
self.sigValueChanged.connect(lambda param, data: self.emitStateChanged('value', data)) self.sigValueChanged.connect(lambda param, data: self.emitStateChanged('value', data))