jan/klamath
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix reading some elements

Browse Source
This commit is contained in:
jan 2021-04-12 13:58:52 -07:00
parent 4022622de5
commit 6b0d1cd842
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
klamath/elements.py
View File

@ -338,8 +338,8 @@ class Box(Element):
@classmethod @classmethod
def read(cls: Type[X], stream: BinaryIO) -> X: def read(cls: Type[X], stream: BinaryIO) -> X:
layer = LAYER.skip_and_read(stream) layer = LAYER.skip_and_read(stream)[0]
dtype = BOXTYPE.read(stream) dtype = BOXTYPE.read(stream)[0]
xy = XY.read(stream).reshape(-1, 2) xy = XY.read(stream).reshape(-1, 2)
properties = read_properties(stream) properties = read_properties(stream)
return cls(layer=(layer, dtype), xy=xy, properties=properties) return cls(layer=(layer, dtype), xy=xy, properties=properties)
@ -372,8 +372,8 @@ class Node(Element):
@classmethod @classmethod
def read(cls: Type[N], stream: BinaryIO) -> N: def read(cls: Type[N], stream: BinaryIO) -> N:
layer = LAYER.skip_and_read(stream) layer = LAYER.skip_and_read(stream)[0]
dtype = NODETYPE.read(stream) dtype = NODETYPE.read(stream)[0]
xy = XY.read(stream).reshape(-1, 2) xy = XY.read(stream).reshape(-1, 2)
properties = read_properties(stream) properties = read_properties(stream)
return cls(layer=(layer, dtype), xy=xy, properties=properties) return cls(layer=(layer, dtype), xy=xy, properties=properties)
@ -438,8 +438,8 @@ class Text(Element):
width = 0 width = 0
mag = 1 mag = 1
angle_deg = 0 angle_deg = 0
layer = LAYER.skip_and_read(stream) layer = LAYER.skip_and_read(stream)[0]
dtype = TEXTTYPE.read(stream) dtype = TEXTTYPE.read(stream)[0]
size, tag = Record.read_header(stream) size, tag = Record.read_header(stream)
while tag != XY.tag: while tag != XY.tag: