expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-21 23:01:52 +00:00
Code Issues 19 Projects 3 Activity

scanned image files importing

Browse Source
This commit is contained in:
Philip Sargent 2020-04-09 02:40:32 +01:00
parent fbe6c0c859
commit d71e31417b
5 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
databaseReset.py
View File

@ -182,10 +182,10 @@ def usage():
people - read in the people from folk.csv
QMs - read in the QM files
resetend
scans - read in the scanned surveynotes
scans - NOT the scanned surveynotes ?!
survex - read in the survex files
survexpos
surveys
surveys - read in the scanned surveynotes
tunnel - read in the Tunnel files
""")

1
parsers/survex.py
View File

@ -149,6 +149,7 @@ def RecursiveLoad(survexblock, survexfile, fin, textlines):
survexblock.survexscansfolder = survexscansfolders[0]
#survexblock.refscandir = "%s/%s%%23%s" % (mref.group(1), mref.group(1), mref.group(2))
survexblock.save()
print('Wallet *ref - %s' % refscan)
continue
# This whole section should be moved if we can have *QM become a proper survex command

19
parsers/surveys.py
View File

@ -99,19 +99,30 @@ def parseSurveyScans(expedition, logfile=None):
#scanList = listdir(expedition.year, surveyFolder)
scanList=os.listdir(os.path.join(yearPath,surveyFolder))
except AttributeError:
print("Folder: " + surveyFolder + " ignored\r")
print("Ignoring file in year folder: " + surveyFolder + "\r")
continue
for scan in scanList:
# Why does this insist on renaming all the scanned image files?
# It produces duplicates names and all images have type .jpg in the scanObj.
# It seems to rely on end users being particularly diligent in filenames which is NGtH
try:
scanChopped=re.match(r'(?i).*(notes|elev|plan|elevation|extend)(\d*)\.(png|jpg|jpeg)',scan).groups()
#scanChopped=re.match(r'(?i).*(notes|elev|plan|extend|elevation)-?(\d*)\.(png|jpg|jpeg|pdf)',scan).groups()
scanChopped=re.match(r'(?i)([a-z_-]*\d?[a-z_-]*)(\d*)\.(png|jpg|jpeg|pdf|top|dxf|svg|tdr|th2|xml|txt)',scan).groups()
scanType,scanNumber,scanFormat=scanChopped
except AttributeError:
print("File: " + scan + " ignored\r")
print("Ignored (bad name format): " + surveyFolder + '/' + scan + "\r")
continue
if scanType == 'elev' or scanType == 'extend':
scanTest = scanType
scanType = 'notes'
match = re.search(r'(?i)(elev|extend)',scanTest)
if match:
scanType = 'elevation'
match = re.search(r'(?i)(plan)',scanTest)
if match:
scanType = 'plan'
if scanNumber=='':
scanNumber=1

6
templates/survexscansfolder.html
View File

@ -2,11 +2,11 @@
{% load wiki_markup %}
{% load survex_markup %}
{% block title %}Survex Scans Folder{% endblock %}
{% block title %}Survey Scans Folder{% endblock %}
{% block content %}
<h3>Survex Scans in: {{survexscansfolder.walletname}}</h3>
<h3>Survey Scans in: {{survexscansfolder.walletname}}</h3>
<table>
{% for survexscansingle in survexscansfolder.survexscansingle_set.all %}
<tr>
@ -20,7 +20,7 @@
{% endfor %}
</table>
<h3>Surveys referring to this wallet</h3>
<h3>Survex surveys referring to this wallet</h3>
<table>
{% for survexblock in survexscansfolder.survexblock_set.all %}

4
templates/survexscansfolders.html
View File

@ -2,11 +2,11 @@
{% load wiki_markup %}
{% load survex_markup %}
{% block title %}All Survex scans folders{% endblock %}
{% block title %}All Survey scans folders{% endblock %}
{% block content %}
<h3>All Survex scans folders</h3>
<h3>All Survey scans folders</h3>
<table>
<tr><th>Scans folder</th><th>Files</th><th>Survex blocks</th></tr>
{% for survexscansfolder in survexscansfolders %}