expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2025-04-03 09:21:48 +01:00
Code Issues 18 Projects 3 Activity

update svx template & fix CRLF

Browse Source
This commit is contained in:
Philip Sargent 2020-06-02 21:38:29 +01:00
parent 4dd0a5ddf2
commit 973c6f4ef8
1 changed files with 73 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
core/views_survex.py
View File

@ -18,46 +18,74 @@ from troggle.parsers.people import GetPersonExpeditionNameLookup
survextemplatefile = """; Locn: Totes Gebirge, Austria - Loser/Augst-Eck Plateau (kataster group 1623) survextemplatefile = """; *** DO NOT SAVE THIS FILE WITHOUT RENAMING IT !! ***
; Cave: ;[Stuff in square brackets is example text to be replaced with real data,
; removing the square brackets]
*begin [surveyname] *begin [surveyname]
*export [connecting stations] ; stations linked into other surveys (or likely to)
*export [1 8 12 34]
*title "area title" ; Cave:
*date 2099.99.99 ; Area in cave/QM:
*team Insts [Caver] *title ""
*team Insts [Caver] *date [2040.07.04]
*team Notes [Caver] *team Insts [Fred Foo]
*instrument [set number] *team Notes [Brenda Bar]
*team Pics [Brenda Bar]
*team Tape [Albert Anyone]
*instrument [SAP #+Laser Tape/DistoX/Compass # ; Clino #]
; Calibration: [Where, readings]
*ref 2040#00
; the #number is on the clear pocket containing the original notes
*ref: 2099#NN ; if using a tape:
*calibrate tape +0.0 ; +ve if tape was too short, -ve if too long
*calibrate tape +0.0 ; +ve if tape was too short, -ve if too long ; Centreline data
*data normal from to length bearing gradient ignoreall
[ 1 2 5.57 034.5 -12.8 ]
*data normal from to tape compass clino ;-----------
1 2 3.90 298 -20 ;recorded station details (leave commented out)
;(NP=Nail Polish, LHW/RHW=Left/Right Hand Wall)
;Station Left Right Up Down Description
;[Red] nail varnish markings
[;1 0.8 0 5.3 1.6 ; NP on boulder. pt 23 on foo survey ]
[;2 0.3 1.2 6 1.2 ; NP '2' LHW ]
[;3 1.3 0 3.4 0.2 ; Rock on floor - not refindable ]
*data passage station left right up down ignoreall
1 [L] [R] [U] [D] comment
*end [surveyname]""" ;LRUDs arranged into passage tubes
;new *data command for each 'passage',
;repeat stations and adjust numbers as needed
*data passage station left right up down
;[ 1 0.8 0 5.3 1.6 ]
;[ 2 0.3 1.2 6 1.2 ]
*data passage station left right up down
;[ 1 1.3 1.5 5.3 1.6 ]
;[ 3 2.4 0 3.4 0.2 ]
def ReplaceTabs(stext):
res = [ ] ;-----------
nsl = 0 ;Question Mark List ;(leave commented-out)
for s in re.split("(\t|\n)", stext): ; The nearest-station is the name of the survey and station which are nearest to
if s == "\t": ; the QM. The resolution-station is either '-' to indicate that the QM hasn't
res.append(" " * (4 - (nsl % 4))) ; been checked; or the name of the survey and station which push that QM. If a
nsl = 0 ; QM doesn't go anywhere, set the resolution-station to be the same as the
continue ; nearest-station. Include any relevant details of how to find or push the QM in
if s == "\n": ; the textual description.
nsl = 0 ;Serial number grade(A/B/C/X) nearest-station resolution-station description
else: ;[ QM1 A surveyname.3 - description of QM ]
nsl += len(s) ;[ QM2 B surveyname.5 - description of QM ]
res.append(s)
return "".join(res) ;------------
;Cave description ;(leave commented-out)
;freeform text describing this section of the cave
*end [surveyname]
"""
class SvxForm(forms.Form): class SvxForm(forms.Form):
@ -71,9 +99,8 @@ class SvxForm(forms.Form):
fname = settings.SURVEX_DATA + self.data['filename'] + ".svx" fname = settings.SURVEX_DATA + self.data['filename'] + ".svx"
if not os.path.isfile(fname): if not os.path.isfile(fname):
return survextemplatefile return survextemplatefile
fin = open(fname, "rb") fin = open(fname, "rt",encoding='utf8',newline='')
svxtext = fin.read().decode("latin1") # unicode(a, "latin1") svxtext = fin.read()
svxtext = ReplaceTabs(svxtext).strip()
fin.close() fin.close()
return svxtext return svxtext
@ -86,19 +113,19 @@ class SvxForm(forms.Form):
def SaveCode(self, rcode): def SaveCode(self, rcode):
fname = settings.SURVEX_DATA + self.data['filename'] + ".svx" fname = settings.SURVEX_DATA + self.data['filename'] + ".svx"
if not os.path.isfile(fname): if not os.path.isfile(fname):
# only save if appears valid
if re.search(r"\[|\]", rcode): if re.search(r"\[|\]", rcode):
return "Error: clean up all []s from the text" return "Error: remove all []s from the text. They are only template guidance."
mbeginend = re.search(r"(?s)\*begin\s+(\w+).*?\*end\s+(\w+)", rcode) mbeginend = re.search(r"(?s)\*begin\s+(\w+).*?\*end\s+(\w+)", rcode)
if not mbeginend: if not mbeginend:
return "Error: no begin/end block here" return "Error: no begin/end block here"
if mbeginend.group(1) != mbeginend.group(2): if mbeginend.group(1) != mbeginend.group(2):
return "Error: mismatching beginend" return "Error: mismatching begin/end labels"
fout = open(fname, "wb") fout = open(fname, "wt", encoding='utf8',newline='\n')
res = fout.write(rcode.encode("latin1")) # javascript seems to insert CRLF on WSL1.
res = fout.write(rcode.replace("\r",""))
fout.close() fout.close()
return "SAVED" return "SAVED ."
def Process(self): def Process(self):
print("....\n\n\n....Processing\n\n\n") print("....\n\n\n....Processing\n\n\n")
@ -106,10 +133,10 @@ class SvxForm(forms.Form):
os.chdir(os.path.split(settings.SURVEX_DATA + self.data['filename'])[0]) os.chdir(os.path.split(settings.SURVEX_DATA + self.data['filename'])[0])
os.system(settings.CAVERN + " --log " + settings.SURVEX_DATA + self.data['filename'] + ".svx") os.system(settings.CAVERN + " --log " + settings.SURVEX_DATA + self.data['filename'] + ".svx")
os.chdir(cwd) os.chdir(cwd)
fin = open(settings.SURVEX_DATA + self.data['filename'] + ".log", "rb") fin = open(settings.SURVEX_DATA + self.data['filename'] + ".log", "rt",encoding='utf8')
log = fin.read() log = fin.read()
fin.close() fin.close()
log = re.sub(b"(?s).*?(Survey contains)", "\\1", log) log = re.sub("(?s).*?(Survey contains)", "\\1", log)
return log return log
@ -181,7 +208,7 @@ def svx(request, survex_file):
return render_to_response('svxfile.html', vmap) return render_to_response('svxfile.html', vmap)
def svxraw(request, survex_file): def svxraw(request, survex_file):
svx = open(os.path.join(settings.SURVEX_DATA, survex_file+".svx"), "rb") svx = open(os.path.join(settings.SURVEX_DATA, survex_file+".svx"), "rt",encoding='utf8')
return HttpResponse(svx, content_type="text") return HttpResponse(svx, content_type="text")
@ -196,20 +223,20 @@ def process(survex_file):
def threed(request, survex_file): def threed(request, survex_file):
process(survex_file) process(survex_file)
try: try:
threed = open(settings.SURVEX_DATA + survex_file + ".3d", "rb") threed = open(settings.SURVEX_DATA + survex_file + ".3d", "rt",encoding='utf8')
return HttpResponse(threed, content_type="model/3d") return HttpResponse(threed, content_type="model/3d")
except: except:
log = open(settings.SURVEX_DATA + survex_file + ".log", "rb") log = open(settings.SURVEX_DATA + survex_file + ".log", "rt",encoding='utf8')
return HttpResponse(log, content_type="text") return HttpResponse(log, content_type="text")
def log(request, survex_file): def log(request, survex_file):
process(survex_file) process(survex_file)
log = open(settings.SURVEX_DATA + survex_file + ".log", "rb") log = open(settings.SURVEX_DATA + survex_file + ".log", "rt",encoding='utf8')
return HttpResponse(log, content_type="text") return HttpResponse(log, content_type="text")
def err(request, survex_file): def err(request, survex_file):
process(survex_file) process(survex_file)
err = open(settings.SURVEX_DATA + survex_file + ".err", "rb") err = open(settings.SURVEX_DATA + survex_file + ".err", "rt",encoding='utf8')
return HttpResponse(err, content_type="text") return HttpResponse(err, content_type="text")