jan/fatamorgana
2
1
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Improve ctrapezoid validity checking

Browse Source 
width/height might be None; check them against each other only if they
aren't. Also, perform checks after dedup/adjust.
This commit is contained in:
Jan Petykiewicz 2020-04-18 15:43:25 -07:00
parent 3af40dd1bc
commit 1a259a1c19
1 changed files with 36 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
fatamorgana/records.py
View File

@ -2157,27 +2157,7 @@ class CTrapezoid(Record):
self.y = y self.y = y
self.repetition = repetition self.repetition = repetition
if ctrapezoid_type in (20, 21) and width is not None: self.check_valid()
raise InvalidDataError('CTrapezoid has spurious width entry: '
'{}'.format(width))
if ctrapezoid_type in (16, 17, 18, 19, 22, 23, 25) and height is not None:
raise InvalidDataError('CTrapezoid has spurious height entry: '
'{}'.format(height))
if ctrapezoid_type in range(0, 4) and width < height:
raise InvalidDataError('CTrapezoid has width < height'
' ({} < {})'.format(width, height))
if ctrapezoid_type in range(4, 8) and width < 2 * height:
raise InvalidDataError('CTrapezoid has width < 2*height'
' ({} < 2 * {})'.format(width, height))
if ctrapezoid_type in range(8, 12) and width > height:
raise InvalidDataError('CTrapezoid has width > height'
' ({} > {})'.format(width, height))
if ctrapezoid_type in range(12, 16) and 2 * width > height:
raise InvalidDataError('CTrapezoid has 2*width > height'
' ({} > 2 * {})'.format(width, height))
if ctrapezoid_type is not None and ctrapezoid_type not in range(0, 26):
raise InvalidDataError('CTrapezoid has invalid type: '
'{}'.format(ctrapezoid_type))
def merge_with_modals(self, modals: Modals): def merge_with_modals(self, modals: Modals):
adjust_coordinates(self, modals, 'geometry_x', 'geometry_y') adjust_coordinates(self, modals, 'geometry_x', 'geometry_y')
@ -2200,6 +2180,8 @@ class CTrapezoid(Record):
else: else:
adjust_field(self, 'height', modals, 'geometry_h') adjust_field(self, 'height', modals, 'geometry_h')
self.check_valid()
def deduplicate_with_modals(self, modals: Modals): def deduplicate_with_modals(self, modals: Modals):
dedup_coordinates(self, modals, 'geometry_x', 'geometry_y') dedup_coordinates(self, modals, 'geometry_x', 'geometry_y')
dedup_repetition(self, modals) dedup_repetition(self, modals)
@ -2223,6 +2205,8 @@ class CTrapezoid(Record):
else: else:
dedup_field(self, 'height', modals, 'geometry_h') dedup_field(self, 'height', modals, 'geometry_h')
self.check_valid()
@staticmethod @staticmethod
def read(stream: io.BufferedIOBase, record_id: int) -> 'CTrapezoid': def read(stream: io.BufferedIOBase, record_id: int) -> 'CTrapezoid':
if record_id != 26: if record_id != 26:
@ -2282,6 +2266,37 @@ class CTrapezoid(Record):
return size return size
def check_valid(self):
ctrapezoid_type = self.ctrapezoid_type
width = self.width
height = self.height
if ctrapezoid_type in (20, 21) and width is not None:
raise InvalidDataError('CTrapezoid has spurious width entry: '
'{}'.format(width))
if ctrapezoid_type in (16, 17, 18, 19, 22, 23, 25) and height is not None:
raise InvalidDataError('CTrapezoid has spurious height entry: '
'{}'.format(height))
if width is not None and height is not None:
if ctrapezoid_type in range(0, 4) and width < height:
raise InvalidDataError('CTrapezoid has width < height'
' ({} < {})'.format(width, height))
if ctrapezoid_type in range(4, 8) and width < 2 * height:
raise InvalidDataError('CTrapezoid has width < 2*height'
' ({} < 2 * {})'.format(width, height))
if ctrapezoid_type in range(8, 12) and width > height:
raise InvalidDataError('CTrapezoid has width > height'
' ({} > {})'.format(width, height))
if ctrapezoid_type in range(12, 16) and 2 * width > height:
raise InvalidDataError('CTrapezoid has 2*width > height'
' ({} > 2 * {})'.format(width, height))
if ctrapezoid_type is not None and ctrapezoid_type not in range(0, 26):
raise InvalidDataError('CTrapezoid has invalid type: '
'{}'.format(ctrapezoid_type))
class Circle(Record): class Circle(Record):
""" """
Circle record (ID 27) Circle record (ID 27)