expo/expoweb
1
0
Fork 0
mirror of https://expo.survex.com/repositories/expoweb/.git/ synced 2025-12-08 23:04:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix up dump3d output parsing in prospecting-guide script to recognise new 3d types in survex >= 1.2.7

Browse Source
This commit is contained in:
expoonserver
2014-08-05 13:08:03 +01:00
parent c98ed6a3c1
commit 9446c5600c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
noinfo/prospecting_guide_scripts/make-prospectingguide-new.py
View File

@@ -343,7 +343,7 @@ for fnm in ("../all.3d", "../alltracks.3d"):
for l in file3d: for l in file3d:
match = re.match(r''' match = re.match(r'''
^ #start ^ #start
(MOVE|LINE|NODE) #one of three command types (MOVE|LINE|NODE|XSECT|XSECT_END|STOP) #one of six data types
\s+(-?[0-9.]+) #X-co-ord \s+(-?[0-9.]+) #X-co-ord
\s+(-?[0-9.]+) #Y-co-ord \s+(-?[0-9.]+) #Y-co-ord
\s+(-?[0-9.]+) #altitude \s+(-?[0-9.]+) #altitude
@@ -386,10 +386,10 @@ for fnm in ("../all.3d", "../alltracks.3d"):
else: else:
draw.line([lastx, lasty, x, y], fill="#800080") draw.line([lastx, lasty, x, y], fill="#800080")
lastx,lasty = x,y lastx,lasty = x,y
if not file3d.close(): #if not file3d.close():
# FIXME: If dump3d can't gives an error and exits with non-zero status, this # FIXME: If dump3d can't give an error and exits with non-zero status, this
# doesn't get triggered... # doesn't get triggered...
print "Running command: %s %s failed: %s" % (dump3d_binary, fnm, file3d) #print "Running command: %s %s failed: %s" % (dump3d_binary, fnm, file3d)
surfacecolour = "#008000" surfacecolour = "#008000"
repath = re.compile(r'^') repath = re.compile(r'^')
print "Done" print "Done"