expo/expoweb
1
0
Fork 0
mirror of https://expo.survex.com/repositories/expoweb/.git/ synced 2024-11-25 08:41:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge changes

Browse Source
This commit is contained in:
Wookey 2014-08-13 14:52:26 +01:00
commit bf4c76f0c8
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
noinfo/entrance_data/1623-204f.html
View File

@ -16,7 +16,7 @@
<approach></approach>
<underground_description></underground_description>
<photo><div class="centre"><a href="/expoimages/photos/2013/JuliaDay/entrance204f.JPG">
<img alt="204f tag location" src="entrance204f-small.jpg"></a>
<img alt="204f tag location" src="i/entrance204f-small.jpg"></a>
<p>204f tag position</p></div></photo>
<!-- marking options: P = Paint,
P? = Paint (?),

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:
match = re.match(r'''
^ #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.]+) #Y-co-ord
\s+(-?[0-9.]+) #altitude
@ -386,10 +386,10 @@ for fnm in ("../all.3d", "../alltracks.3d"):
else:
draw.line([lastx, lasty, x, y], fill="#800080")
lastx,lasty = x,y
if not file3d.close():
# FIXME: If dump3d can't gives an error and exits with non-zero status, this
#if not file3d.close():
# FIXME: If dump3d can't give an error and exits with non-zero status, this
# 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"
repath = re.compile(r'^')
print "Done"