diff options
| author | Philip Sargent <philip.sargent@klebos.com> | 2020-05-26 16:41:11 +0100 |
|---|---|---|
| committer | Philip Sargent <philip.sargent@klebos.com> | 2020-05-26 16:41:11 +0100 |
| commit | c9657aeb8c6aed01db7a844883a37dce4afae861 (patch) | |
| tree | 2af2d71be3a9dd898be814b142b6681ed5b5fda4 /core/views_caves.py | |
| parent | dfb7cc88cde4a2ceb64555f1ea79800fee8e0b14 (diff) | |
| download | troggle-c9657aeb8c6aed01db7a844883a37dce4afae861.tar.gz troggle-c9657aeb8c6aed01db7a844883a37dce4afae861.tar.bz2 troggle-c9657aeb8c6aed01db7a844883a37dce4afae861.zip | |
preparing to clean up LoadPos
Diffstat (limited to 'core/views_caves.py')
| -rw-r--r-- | core/views_caves.py | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/core/views_caves.py b/core/views_caves.py index b409831..41831bd 100644 --- a/core/views_caves.py +++ b/core/views_caves.py @@ -505,16 +505,18 @@ def prospecting_image(request, name): img.save(response, "PNG") return response -STATIONS = {} -poslineregex = re.compile("^\(\s*([+-]?\d*\.\d*),\s*([+-]?\d*\.\d*),\s*([+-]?\d*\.\d*)\s*\)\s*([^\s]+)$") -def LoadPos(): - 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) - posfile = open("%sall.pos" % settings.SURVEX_DATA) - posfile.readline()#Drop header - for line in posfile.readlines(): - r = poslineregex.match(line) - if r: - x, y, z, name = r.groups() - STATIONS[name] = (x, y, z) +# Not used. +# All imported using parsers.survex.LoadPos() now +# STATIONS = {} +# poslineregex = re.compile("^\(\s*([+-]?\d*\.\d*),\s*([+-]?\d*\.\d*),\s*([+-]?\d*\.\d*)\s*\)\s*([^\s]+)$") +# def LoadPos(): +# 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) +# posfile = open("%sall.pos" % settings.SURVEX_DATA) +# posfile.readline()#Drop header +# for line in posfile.readlines(): +# r = poslineregex.match(line) +# if r: +# x, y, z, name = r.groups() +# STATIONS[name] = (x, y, z) |