xle/troggle-unchained
2
0
Fork 0
forked from expo/troggle
Code Issues 4 Pull Requests Projects 1 Wiki Activity

A little more verbosity

Browse Source
This commit is contained in:
Sam Wenham 2015-01-19 22:48:50 +00:00
parent 0ab32ef60a
commit 3bdd1ad737
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
parsers/survex.py
View File

@ -231,6 +231,9 @@ def ReloadSurvexCave(survex_cave):
def LoadAllSurvexBlocks(): def LoadAllSurvexBlocks():
print 'Loading All Survex Blocks...'
models.SurvexBlock.objects.all().delete() models.SurvexBlock.objects.all().delete()
models.SurvexFile.objects.all().delete() models.SurvexFile.objects.all().delete()
models.SurvexDirectory.objects.all().delete() models.SurvexDirectory.objects.all().delete()
@ -265,6 +268,9 @@ def LoadAllSurvexBlocks():
poslineregex = re.compile("^\(\s*([+-]?\d*\.\d*),\s*([+-]?\d*\.\d*),\s*([+-]?\d*\.\d*)\s*\)\s*([^\s]+)$") poslineregex = re.compile("^\(\s*([+-]?\d*\.\d*),\s*([+-]?\d*\.\d*),\s*([+-]?\d*\.\d*)\s*\)\s*([^\s]+)$")
def LoadPos(): def LoadPos():
print 'Loading Pos....'
call([settings.CAVERN, "--output=%s/all.3d" % settings.SURVEX_DATA, "%s/all.svx" % settings.SURVEX_DATA]) call([settings.CAVERN, "--output=%s/all.3d" % settings.SURVEX_DATA, "%s/all.svx" % settings.SURVEX_DATA])
call([settings.THREEDTOPOS, '%sall.3d' % settings.SURVEX_DATA], cwd = settings.SURVEX_DATA) call([settings.THREEDTOPOS, '%sall.3d' % settings.SURVEX_DATA], cwd = settings.SURVEX_DATA)
posfile = open("%sall.pos" % settings.SURVEX_DATA) posfile = open("%sall.pos" % settings.SURVEX_DATA)

2
parsers/surveys.py
View File

@ -190,7 +190,7 @@ def LoadListScansFile(survexscansfolder):
# and builds up the models we can access later # and builds up the models we can access later
def LoadListScans(): def LoadListScans():
print '\tLoading Survey Scans...' print 'Loading Survey Scans...'
SurvexScanSingle.objects.all().delete() SurvexScanSingle.objects.all().delete()
SurvexScansFolder.objects.all().delete() SurvexScansFolder.objects.all().delete()