From 42b615d16bed125d1fdafc99c5da216cf36354d3 Mon Sep 17 00:00:00 2001
From: Philip Sargent <philip.sargent@klebos.com>
Date: Wed, 23 Mar 2022 20:05:38 +0000
Subject: [PATCH] survex legs bug fix
---
parsers/logbooks.py | 2 +-
parsers/survex.py | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/parsers/logbooks.py b/parsers/logbooks.py
index c41dd08..ea7c27f 100644
--- a/parsers/logbooks.py
+++ b/parsers/logbooks.py
@@ -708,7 +708,7 @@ def LoadLogbooks():
expd[year] += 1
yt=0
for y in expd:
- print("{} {}".format(y, expd[y]), nlbe[y])
+ # print("{} {}".format(y, expd[y]), nlbe[y])
yt += expd[y]
print("total {} log entries in all expeditions".format(yt))
diff --git a/parsers/survex.py b/parsers/survex.py
index 7ad9790..cce017d 100644
--- a/parsers/survex.py
+++ b/parsers/survex.py
@@ -726,7 +726,7 @@ class LoadingSurvex():
if cave:
newdirectory.cave = cave
newfile.cave = cave
- print("\n"+str(newdirectory.cave),file=sys.stderr)
+ # print(f"\n - New directory {newdirectory} for cave {newdirectory.cave}",file=sys.stderr)
else: # probably a surface survey
self.ReportNonCaveIncludes(headpath, svxid)
@@ -1063,8 +1063,8 @@ class LoadingSurvex():
else: # not a *cmd so we are reading data OR a ";" rx_comment failed. We hope.
self.LoadSurvexLeg(survexblock, sline, comment)
- self.legsnumber = slengthtotal
- self.slength = nlegstotal
+ self.legsnumber = nlegstotal
+ self.slength = slengthtotal
def PushdownStackScan(self, survexblock, path, fin, flinear, fcollate):
"""Follows the *include links in all the survex files from the root file 1623.svx
@@ -1382,6 +1382,7 @@ def FindAndLoadSurvex(survexblockroot):
for d in svx_load.survexdict:
tf += len(svx_load.survexdict[d])
print(" - Number of SurvexFiles: {}".format(tf))
+ print(f" - Number of Survex legs: {legsnumber}")
svx_load = None
return legsnumber
@@ -1421,14 +1422,13 @@ def LoadSurvexBlocks():
print(' - Loading Survex Blocks...')
memstart = get_process_memory()
#----------------------------------------------------------------
- legsnumber = FindAndLoadSurvex(survexblockroot)
+ FindAndLoadSurvex(survexblockroot)
#----------------------------------------------------------------
memend = get_process_memory()
print(" - MEMORY start:{:.3f} MB end:{:.3f} MB increase={:.3f} MB".format(memstart,memend, memend-memstart))
survexblockroot.save()
- print(" - total number of survex legs: {}".format(legsnumber))
print(' - Loaded All Survex Blocks.')
poslineregex = re.compile(r"^\(\s*([+-]?\d*\.\d*),\s*([+-]?\d*\.\d*),\s*([+-]?\d*\.\d*)\s*\)\s*([^\s]+)$")