linse/frappy
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixup: rename *subtype* in client code as well

Browse Source 
Change-Id: I97cc836b2eaa508935113c225de593bbb9ad8821
Reviewed-on: https://forge.frm2.tum.de/review/20245
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
This commit is contained in:
Enrico Faulhaber 2019-03-27 15:28:14 +01:00
parent 3534c57f1c
commit 99f757bf78
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
secop/client/baseclient.py
View File

@ -382,7 +382,7 @@ class Client(object):
if isinstance(datatype, EnumType): if isinstance(datatype, EnumType):
datatype._enum.name = aname datatype._enum.name = aname
if aname == 'status': if aname == 'status':
datatype.subtypes[0]._enum.name = 'Status' datatype.members[0]._enum.name = 'Status'
self.describing_data['modules'][module]['accessibles'] \ self.describing_data['modules'][module]['accessibles'] \
[aname]['datatype'] = datatype [aname]['datatype'] = datatype
except Exception as _exc: except Exception as _exc:

2
secop/gui/nodectrl.py
View File

@ -248,7 +248,7 @@ class ReadableWidget(QWidget):
# XXX: also connect update_status signal to LineEdit ?? # XXX: also connect update_status signal to LineEdit ??
def update_status(self, status, qualifiers=None): def update_status(self, status, qualifiers=None):
display_string = self._status_type.subtypes[0]._enum[status[0]].name display_string = self._status_type.members[0]._enum[status[0]].name
if status[1]: if status[1]:
display_string += ':' + status[1] display_string += ':' + status[1]
self.statusLineEdit.setText(display_string) self.statusLineEdit.setText(display_string)

6
secop/gui/valuewidgets.py
View File

@ -122,7 +122,7 @@ class TupleWidget(QFrame):
def __init__(self, datatype, readonly=False, parent=None): def __init__(self, datatype, readonly=False, parent=None):
super(TupleWidget, self).__init__(parent) super(TupleWidget, self).__init__(parent)
self.datatypes = datatype.subtypes self.datatypes = datatype.members
self.layout = QVBoxLayout() self.layout = QVBoxLayout()
self.subwidgets = [] self.subwidgets = []
@ -151,8 +151,8 @@ class StructWidget(QGroupBox):
self.subwidgets = {} self.subwidgets = {}
self.datatypes = [] self.datatypes = []
self._labels = [] self._labels = []
for idx, name in enumerate(sorted(datatype.named_subtypes)): for idx, name in enumerate(sorted(datatype.members)):
dt = datatype.named_subtypes[name] dt = datatype.members[name]
w = get_widget(dt, readonly=readonly, parent=self) w = get_widget(dt, readonly=readonly, parent=self)
l = QLabel(name) l = QLabel(name)
self.layout.addWidget(l, idx, 0) self.layout.addWidget(l, idx, 0)