expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2025-12-19 09:27:08 +00:00
Code Issues 18 Projects 3 Activity

stop verbose warnings, change colour on cave names

Browse Source
This commit is contained in:
Philip Sargent
2025-08-28 23:35:09 +03:00
parent bab1736636
commit 4933515be6
3 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
parsers/survex.py
View File

@@ -1654,15 +1654,14 @@ class LoadingSurvex:
This _should_ also check that the first QM survey point exists in the block in this survex file.
"""
message = f' ! QM "{survexblock.survexfile.path}" line:{comment} {qml=}'
print(message, file=sys.stderr)
qml = self.rx_qm_digit.match(comment) # checks for valid QM digit(s)
if not qml:
message = f' ! QM Unrecognised QM number in "{survexblock.survexfile.path}" line:{comment}'
print(message)
stash_data_issue(
parser="survex", message=message, url=None, sb=(survexblock.survexfile.path)
)
if not comment.startswith("QM doesn't go anywhere"):
message = f' ! QM Unrecognised QM number in "{survexblock.survexfile.path}" line:{comment}'
print(message)
stash_data_issue(
parser="survex", message=message, url=None, sb=(survexblock.survexfile.path)
)
return False
qmline = self.rx_qm.match(comment)
if qmline:

6
templates/cave_red_star.html
View File

@@ -1,7 +1,7 @@
Red star <span style="color: red">*</span> against a name indicates that no survex file is explicitly associated with the cave<br />
Blue star <span style="color: blue">*</span> against a name indicates that no survex file is explicitly associated with the cave but it is marked as 'fully explored'<br />
Red star <span style="color: red">&#10033;</span> against a name indicates that no survex file is explicitly associated with the cave<br />
Blue star <span style="color: blue">&#10033;</span> against a name indicates that no survex file is explicitly associated with the cave but it is marked as 'fully explored'<br />
Blue triangle <span style="color: #43C6DB">&#x25BC;</span> against a name indicates that the cave is 'pending' creation properly.<br />
Orange triangle <span style="color: orange">&#x25B2;</span> against a name indicates that the cave has no Entrance (and is not 'pending').<br />
Black triangle <span style="color: black">&#x25B2;</span> against a name indicates that the cave has an Entrance, but no entrances have valid located survey stations.<br />
Red triangle <span style="color: red">&#x25BC;</span> against a name indicates that the cave has unticked QMs<br />
<span style="color:red">Cavename in red</span> means that the cave is undescended/unexplored.
<span style="color:mediumvioletred">Cavename in this colour</span> means that the cave is undescended/unexplored.

6
templates/cavelist_columns.html
View File

@@ -1,6 +1,6 @@
<a href="/{{ cave.url }}">
{% if cave.unexplored %}
<span style="color:red" title="The cave is marked as unexplored/undescended">
<span style="color:mediumvioletred" title="The cave is marked as unexplored/undescended">
{% else %}
<span>
{% endif %}
@@ -21,9 +21,9 @@
{% endif %}
{% if cave.survex_file %}{% else %}
{% if cave.fully_explored %}
<span title="no survex file is explicitly associated with the cave but it is fully explored" style="color: blue">*</span>
<span title="no survex file is explicitly associated with the cave but it is fully explored" style="color: blue">&#10033;</span>
{% else %}
<span title="no survex file is explicitly associated with the cave" style="color: red">*</span>
<span title="no survex file is explicitly associated with the cave" style="color: red">&#10033;</span>
{% endif %}
{% endif %}
{% if cave.any_qm_open %}<span title="the cave has open QMs" style="color: red">&#x25BC;</span>{% endif %}