mirror/bacpypes
1
0
Fork 0
mirror of https://github.com/JoelBender/bacpypes synced 2025-09-28 22:15:23 +08:00
Code Issues Releases Wiki Activity

extend arrays with default values for the subtype rather than None

Browse Source
This commit is contained in:
Joel Bender 2017-11-19 18:33:15 -05:00
parent d71d76c6de
commit 27b43ec21a
6 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
py25/bacpypes/constructeddata.py
View File

@ -575,7 +575,11 @@ def ArrayOf(klass):
self.value = self.value[0:value + 1]
elif value > self.value[0]:
# extend
self.value.extend( [None] * (value - self.value[0]) )
if issubclass(self.subtype, Atomic):
self.value.extend( [self.subtype().value] * (value - self.value[0]) )
else:
for i in range(value - self.value[0]):
self.value.append(self.subtype())
else:
return
self.value[0] = value

1
py25/bacpypes/object.py
View File

@ -167,6 +167,7 @@ class Property(Logging):
# get the value
value = obj._values[self.identifier]
if _debug: Property._debug(" - value: %r", value)
# access an array
if arrayIndex is not None:

6
py27/bacpypes/constructeddata.py
View File

@ -573,7 +573,11 @@ def ArrayOf(klass):
self.value = self.value[0:value + 1]
elif value > self.value[0]:
# extend
self.value.extend( [None] * (value - self.value[0]) )
if issubclass(self.subtype, Atomic):
self.value.extend( [self.subtype().value] * (value - self.value[0]) )
else:
for i in range(value - self.value[0]):
self.value.append(self.subtype())
else:
return
self.value[0] = value

1
py27/bacpypes/object.py
View File

@ -168,6 +168,7 @@ class Property:
# get the value
value = obj._values[self.identifier]
if _debug: Property._debug(" - value: %r", value)
# access an array
if arrayIndex is not None:

6
py34/bacpypes/constructeddata.py
View File

@ -573,7 +573,11 @@ def ArrayOf(klass):
self.value = self.value[0:value + 1]
elif value > self.value[0]:
# extend
self.value.extend( [None] * (value - self.value[0]) )
if issubclass(self.subtype, Atomic):
self.value.extend( [self.subtype().value] * (value - self.value[0]) )
else:
for i in range(value - self.value[0]):
self.value.append(self.subtype())
else:
return
self.value[0] = value

1
py34/bacpypes/object.py
View File

@ -168,6 +168,7 @@ class Property:
# get the value
value = obj._values[self.identifier]
if _debug: Property._debug(" - value: %r", value)
# access an array
if arrayIndex is not None: