# HG changeset patch # User Teemu Piippo # Date 1559947910 -10800 # Node ID 1c0884f5506ebf12f37d7f5fedce40703c2469d8 # Parent 8949af6a42797bf2d9da86ca453709970a192c4b changed severity names to be better understood diff -r 8949af6a4279 -r 1c0884f5506e static/error.svg --- a/static/error.svg Sat Jun 08 01:42:48 2019 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,74 +0,0 @@ - - - diff -r 8949af6a4279 -r 1c0884f5506e static/hold.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/static/hold.svg Sat Jun 08 01:51:50 2019 +0300 @@ -0,0 +1,74 @@ + + + diff -r 8949af6a4279 -r 1c0884f5506e static/notice.svg --- a/static/notice.svg Sat Jun 08 01:42:48 2019 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,58 +0,0 @@ - - - diff -r 8949af6a4279 -r 1c0884f5506e static/style.css --- a/static/style.css Sat Jun 08 01:42:48 2019 +0300 +++ b/static/style.css Sat Jun 08 01:51:50 2019 +0300 @@ -23,7 +23,7 @@ margin-bottom: 3px; } -.problems-list li.problem-error +.problems-list li.problem-hold { background-color: #b44; border-color: red; @@ -32,13 +32,6 @@ .problems-list li.problem-warning { - background-color: #fc6; - border-color: #830; - color: black; -} - -.problems-list li.problem-notice -{ background-color: #def; border-color: #024; color: black; diff -r 8949af6a4279 -r 1c0884f5506e static/warning.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/static/warning.svg Sat Jun 08 01:51:50 2019 +0300 @@ -0,0 +1,58 @@ + + + diff -r 8949af6a4279 -r 1c0884f5506e templates/webfront.html --- a/templates/webfront.html Sat Jun 08 01:42:48 2019 +0300 +++ b/templates/webfront.html Sat Jun 08 01:51:50 2019 +0300 @@ -26,7 +26,9 @@ width="32" height="32" class="problem-icon" /> - Line {{problem.line_number}}: {{problem.message_str}} + {{problem.severity}}: + Line {{problem.line_number}}: + {{problem.message_str}}
{{problem.ldraw_code}} diff -r 8949af6a4279 -r 1c0884f5506e tests/misc.py --- a/tests/misc.py Sat Jun 08 01:42:48 2019 +0300 +++ b/tests/misc.py Sat Jun 08 01:51:50 2019 +0300 @@ -2,7 +2,7 @@ import linetypes @problem_type('bad-colour', - severity = 'error', + severity = 'hold', message = lambda colour_index, count: str.format( 'invalid colour {} used {} time(s)', colour_index, @@ -29,7 +29,7 @@ ] @problem_type('syntax-error', - severity = 'error', + severity = 'hold', message = lambda reason: str.format('syntax error: {}', reason), ) def syntax_errors(model): @@ -43,7 +43,7 @@ ) @problem_type('bad-header', - severity = 'error', + severity = 'hold', message = lambda reason: str.format('bad header: {}', reason), ) def bad_header(model): @@ -56,7 +56,7 @@ ) @problem_type('bfc-nocertify', - severity = 'error', + severity = 'hold', message = 'all new parts must be BFC certified', ) def nocertify_test(model): @@ -68,7 +68,7 @@ ) @problem_type('physical-colour-part', - severity = 'error', + severity = 'hold', message = 'no new physical colour parts are accepted', ) def physical_colours_test(model): @@ -79,7 +79,7 @@ ) @problem_type('official-part', - severity = 'error', + severity = 'hold', message = 'new parts must be unofficial', ) def unofficiality_test(model): @@ -89,7 +89,7 @@ bad_object = model.body[model.header.first_occurrence['part type']]) @problem_type('primitive-ccw', - severity = 'error', + severity = 'hold', message = 'primitives must have CCW winding', ) def primitive_ccw_test(model): diff -r 8949af6a4279 -r 1c0884f5506e tests/quadrilaterals.py --- a/tests/quadrilaterals.py Sat Jun 08 01:42:48 2019 +0300 +++ b/tests/quadrilaterals.py Sat Jun 08 01:51:50 2019 +0300 @@ -6,7 +6,7 @@ # Returns whether all elements in container have the same sign return min(container) * max(container) >= 0 -@problem_type('concave', severity = 'error', message = 'concave quadrilateral') +@problem_type('concave', severity = 'hold', message = 'concave quadrilateral') def concave_test(model): ''' Checks that all quadrilaterals are convex. ''' for quadrilateral in model.quadrilaterals: @@ -23,14 +23,14 @@ yield report_problem('concave', bad_object = quadrilateral) @problem_type('skew-major', - severity = 'error', + severity = 'hold', message = lambda skew_angle: str.format('skew quadrilateral (plane angle {})', degree_rep(skew_angle), ), ) @problem_type('skew-minor', - severity = 'notice', + severity = 'warning', message = lambda skew_angle: str.format('slightly skew quadrilateral (plane angle {})', degree_rep(skew_angle), @@ -59,7 +59,7 @@ break @problem_type('self-intersecting', - severity = 'error', + severity = 'hold', message = 'self-intersecting quadrilateral', ) def bowtie_test(model): @@ -77,7 +77,7 @@ ) break -@problem_type('collinear', severity = 'error', message = 'collinear polygon') +@problem_type('collinear', severity = 'hold', message = 'collinear polygon') def collinear_test(model): for element in model.body: if hasattr(element, 'geometry') and len(element.geometry.vertices) >= 3: @@ -86,7 +86,7 @@ yield report_problem('collinear', bad_object = element) @problem_type('hairline-polygon', - severity = 'notice', + severity = 'warning', message = lambda smallest_angle: str.format( 'hairline polygon (smallest angle {})', degree_rep(smallest_angle), diff -r 8949af6a4279 -r 1c0884f5506e tests/subfiles.py --- a/tests/subfiles.py Sat Jun 08 01:42:48 2019 +0300 +++ b/tests/subfiles.py Sat Jun 08 01:51:50 2019 +0300 @@ -12,7 +12,7 @@ library_standards.read_file(file) @problem_type('zero-determinant', - severity = 'error', + severity = 'hold', message = 'matrix row or column all zero' ) def determinant_test(model): @@ -59,7 +59,7 @@ } @problem_type('illegal-scaling', - severity = 'error', + severity = 'hold', message = lambda primitive, scaling, axes: str.format('scaling of unscalable primitive {} ({})', primitive, @@ -103,28 +103,28 @@ ) @problem_type('cyclical-reference', - severity = 'error', + severity = 'hold', message = lambda chain: str.format('cyclical subfile dependency: {chain}', **locals(), ), ) @problem_type('bad-subfile', - severity = 'error', + severity = 'hold', message = lambda path, problem_text: str.format('cannot process subfile "{path}": {problem_text}', **locals(), ), ) @problem_type('moved-file-used', - severity = 'error', + severity = 'hold', message = lambda moved_file, new_file: str.format('subfile "{moved_file}" has been moved to "{new_file}"', **locals(), ), ) @problem_type('unnecessary-scaling', - severity = 'notice', + severity = 'warning', message = lambda scaled_flat_dimensions, scaling_vector: str.format( 'subfile unnecessarily scaled in the {dims} ({scaling})', diff -r 8949af6a4279 -r 1c0884f5506e testsuite.py --- a/testsuite.py Sat Jun 08 01:42:48 2019 +0300 +++ b/testsuite.py Sat Jun 08 01:51:50 2019 +0300 @@ -1,7 +1,7 @@ from warnings import warn class ProblemType: - severities = ['error', 'notice'] # in descending order + severities = ['hold', 'warning'] # in descending order def __init__(self, name, severity, message): if severity not in ProblemType.severities: raise ValueError(str.format( @@ -117,7 +117,7 @@ problems.append(problem) return { 'passed': not any( - problem.severity == 'error' + problem.severity == 'hold' for problem in problems ), 'problems': sorted(problems, key = problem_key), @@ -150,9 +150,9 @@ colorama.init() messages = [] for problem in report['problems']: - if problem.severity == 'error': + if problem.severity == 'hold': text_colour = colorama.Fore.LIGHTRED_EX - elif problem.severity == 'notice': + elif problem.severity == 'warning': text_colour = colorama.Fore.LIGHTBLUE_EX else: text_colour = ''