Philip Sargent
d27a74c97b
per svxfile debug printing enabled
2020-07-06 21:46:19 +01:00
Philip Sargent
8530b0643d
person attribution of surveyed length working
2020-07-06 01:24:43 +01:00
Philip Sargent
3f9971d2ee
title and wallet folders working in /survexfile/258
2020-07-05 17:22:26 +01:00
Philip Sargent
5be41c8163
splays and alias splays implemented
2020-07-04 13:31:46 +01:00
Philip Sargent
5ed6271c08
rename variables and leglength calc
2020-07-04 01:10:17 +01:00
Philip Sargent
abbe8d467b
refactored LinearLoad(), output unchanged
2020-07-03 18:08:59 +01:00
Philip Sargent
fd6f0b0a35
stack-based state of *data fixed
2020-07-03 17:22:15 +01:00
Philip Sargent
67f66b72e8
State push/pop working
2020-07-03 14:53:36 +01:00
Philip Sargent
9a514e7d3f
rebuild all .3d files and progress on compass/clino/tape
2020-07-02 16:25:51 +01:00
Philip Sargent
df434cd399
SurvexBlocks now importing in deatil
2020-07-01 22:49:38 +01:00
Philip Sargent
8cc768e5b6
fix survexdirectories to ref files properly
2020-07-01 17:41:09 +01:00
Philip Sargent
0a57ac3132
all SurvexDirectory set OK, pending caves made
2020-06-30 15:39:24 +01:00
Philip Sargent
39f042240d
Fix SurvexDirectory import
2020-06-29 21:16:13 +01:00
Philip Sargent
bf1c683fd0
fixing parent blocks & titles
2020-06-28 14:42:26 +01:00
Philip Sargent
122cdd7fc8
replace GetCaveByReference
2020-06-28 01:50:34 +01:00
Philip Sargent
899ba13df4
working and refactored
2020-06-27 19:00:26 +01:00
Philip Sargent
467baec7da
Renaming functions
2020-06-27 18:00:24 +01:00
Philip Sargent
4716eaa4b6
Working. More fault checking.
2020-06-27 17:55:59 +01:00
Philip Sargent
c55716df08
move function (correctly this time)
2020-06-27 12:08:02 +01:00
Philip Sargent
e2713cfe2d
recursive scan *import to make linear filelist
2020-06-27 00:50:40 +01:00
Philip Sargent
030c49ff7c
rewritten QM loading from SVX files
2020-06-25 03:17:56 +01:00
Philip Sargent
d3654266ee
Better error msgs, one bug fix
2020-06-25 02:10:20 +01:00
Philip Sargent
04f14c91f0
rearrange ref and comment detection
2020-06-24 22:46:18 +01:00
Philip Sargent
664c18ebbe
refactor team and ignore sections
2020-06-24 19:07:11 +01:00
Philip Sargent
3645c98685
extract *date function
2020-06-24 17:55:42 +01:00
Philip Sargent
45bbfce4d3
extract *ref, ;ref and ;QMs to functions
2020-06-24 14:49:39 +01:00
Philip Sargent
bb69cc073a
start refactor survex import
2020-06-24 14:10:13 +01:00
Philip Sargent
dc5a53376d
exploring recusrive behaviour
2020-06-24 02:33:43 +01:00
Philip Sargent
6bf762b72f
bin Makesurvexstation, survextitle, survexEquate
2020-06-24 01:57:20 +01:00
Philip Sargent
9cd70b31ac
simple rename survexscansfolder to scansfolder
2020-06-23 23:46:33 +01:00
Philip Sargent
b64c779a58
rename SurvexScansFolders and tidy survex parser
2020-06-23 23:34:08 +01:00
Philip Sargent
674cea629d
clean up import statements: more specific
2020-06-22 00:03:23 +01:00
Philip Sargent
2c469718f6
caves, scans, survex work in databaseRest
2020-06-19 00:26:15 +01:00
Philip Sargent
222d85f052
regex deprecation warning
2020-06-18 10:59:11 +01:00
Philip Sargent
94e5a06a15
clean up survexlegs
2020-06-16 19:27:32 +01:00
Philip Sargent
453af2851b
Stop storing all SurvexStations
2020-06-15 03:28:51 +01:00
Philip Sargent
44fe6a8b89
cleanup and better DatIssue msgs
2020-06-13 01:24:46 +01:00
Philip Sargent
269b8840ad
import fixes & statistics table
2020-06-12 18:10:07 +01:00
Philip Sargent
092c8bb913
stopped storing survex legs
2020-06-12 14:06:03 +01:00
Philip Sargent
fda50ed570
attempt to simplify wnt horribly wrong
2020-06-06 22:51:55 +01:00
Philip Sargent
90dc3dac3b
Change troggle horizontal menu items
2020-06-01 17:41:41 +01:00
Philip Sargent
8c4c2ad1cf
Progress dots on importing data
2020-06-01 00:42:48 +01:00
Philip Sargent
d857cc9084
format tidy & normalise paths in survex *inlcude
2020-05-30 02:35:05 +01:00
Philip Sargent
6a755598b2
Moved classes to models_caves and fixed imports
2020-05-28 04:54:53 +01:00
Philip Sargent
6cc578435c
Refactor to avoid loading unused surveystations
2020-05-28 01:16:45 +01:00
Philip Sargent
c9657aeb8c
preparing to clean up LoadPos
2020-05-26 16:41:11 +01:00
Philip Sargent
50d753a87b
Convert codebase for python3 usage
2020-05-24 20:56:27 +01:00
Philip Sargent
b69bdcd126
tidying and prep for python3
2020-05-24 13:35:47 +01:00
Philip Sargent
15d0d05185
bugfix
2020-05-20 13:40:09 +01:00
Philip Sargent
e017c6effc
Indented msgs for recursive file traversal
2020-05-15 21:45:23 +01:00
Philip Sargent
ccc5813b3f
indent recursion and update comments
2020-05-14 17:21:34 +01:00
Philip Sargent
e4290c4ab0
adding *ref to troggle svx parser
2020-05-13 19:57:07 +01:00
Philip Sargent
39c622d5bf
dbReset now loads into memory first (fast err checking), then into db
2020-04-30 23:15:57 +01:00
Philip Sargent
ecf92e2079
getting the LoadPos to work better
2020-04-28 21:50:53 +01:00
Philip Sargent
b4c0c4d219
Understanding and speeding up LoadPos
2020-04-28 18:26:08 +01:00
Philip Sargent
4be8c81291
reducing clutter in output
2020-04-28 01:18:57 +01:00
b123f6ada7
Dumps loaded data into a .sql file
2020-04-16 20:36:42 +01:00
e5c288c764
get the profile display working & bug fix
2020-04-15 23:29:59 +01:00
d71e31417b
scanned image files importing
2020-04-09 02:40:32 +01:00
Sam Wenham
e77aa9fb84
Changes needed to stop the survex parser having to go through the data twice
...
Taken from the Django 1.10 upgrade branch
2020-02-21 15:57:07 +00:00
Sam Wenham
97426a0ddb
Backed out changeset: 4552f42bdf54
2019-06-26 20:57:24 +01:00
Sam Wenham
8a1be45aac
Remove this stupid hard coded name match
2019-06-26 20:56:08 +01:00
expo on server
02d3cc84d5
Add SURVEX_TOPNAME (top-level survex file) as a setting item in settings.py so it's not hardcoded.
2019-06-26 03:32:18 +01:00
Sam Wenham
9df91b221b
Support html and wiki logbook entrys
...
Move nearest_station to nearest_station_name and make nearest_station a foreign
key to SurvexStation
Lots of tidying
2019-03-31 15:39:53 +01:00
Sam Wenham
4ad5b68433
Make things more compatiable with newer python
...
Fix the expeditions list
Improvements to make it compatiable with django 1.8
Bump the years to add 2018
Update the .hgignore file to ignore junk
2019-02-24 13:03:34 +00:00
Sam Wenham
c939013b14
Add ref as a valid survex command to prevent errors
2018-04-14 16:13:21 +01:00
expo
03cad0a37f
Survex parser fix to avoid allocation on error (by martin).
2015-06-24 04:09:19 +01:00
Sam Wenham
67f94f9436
A little more verbosity
2015-01-19 22:48:50 +00:00
Wookey
f4f1b3ca6d
Allow comma in starcommands (*,fix) (comma is default valid *set blank)
2014-07-01 02:26:26 +01:00
Wookey
4a93790c7e
Fix survex parser to allow whitespace between * and command (as survex
...
does).
2014-07-01 02:12:34 +01:00
expoonserver
b1d6e1c3d5
Replace assert on unrecognised commands with print, so that a minor
...
parsing issue doesn't completely kill a parsing update.
Add parsing for requires and alias commands.
2014-06-26 02:34:19 +01:00
Wookey
3057d2a232
Add checking for compass too
...
Only print filenames on error by default
2013-05-22 02:33:47 +01:00
Wookey
d1ac659d4f
Add error check in place where parser died
2013-05-22 02:10:58 +01:00
Martin Green
79b7d32664
Made a prospecting guide and fixed survex station description. Removed parsing of underground descriptions to wikis.
2012-08-10 19:02:13 +02:00
Martin Green
711fefb0da
Start to change dataformat for caves, along with there editing. Start to change survex reader to cope better with equates/tags.
2012-06-10 14:59:21 +01:00
Martin Green
a128401d49
Added parsing of all.svx, along side parsing individual caves.
...
Added the making and parsing of all.pos to determine the location of stations.
Mare work is required so the caves are parsed and stored only once.
Survex parsing appears to include bugs, that print out errors.
2011-07-11 00:01:12 +01:00
goatchurch
ced45c92f7
tunnelfiles scheme added
2009-09-11 23:56:47 +01:00
goatchurch
f21cddb2d0
modelviz added
2009-09-11 09:04:59 +01:00
goatchurch
735b729a41
survey scans features added
2009-09-10 22:07:31 +01:00
goatchurch
c66b5e2dad
[svn] latest hacking for various statistics
2009-08-05 11:58:36 +01:00
goatchurch
9077462893
[svn] now with ability to make new svx file
2009-08-01 07:31:27 +01:00
goatchurch
7158a79a34
[svn] full checkin. animations disabled, sorry
2009-07-27 13:43:43 +01:00
martin speleo
c132477f80
[svn] Added cavedescription and new subcave.
...
Changed parsers/survex to read *title into subcave
2009-07-04 00:28:28 +01:00
martin speleo
65ef255b99
[svn] Fixed the following of *includes by adding white space to the end of the regex.
2009-07-03 23:56:39 +01:00
substantialnoninfringinguser
ae3fe8cd42
[svn] Renaming troggle.expo to troggle.core. To do this, used:
...
perl -p -i -e "s/expo(?=[\s\.']+)/core/g" `find -name \*.py`
and then manually checked each change (had to remove a couple)
2009-07-02 20:43:18 +01:00
substantialnoninfringinguser
b4d82ddeea
[svn] make work
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8236 by julian @ 1/30/2009 5:40 PM
2009-05-13 05:49:50 +01:00
substantialnoninfringinguser
dcc7825547
[svn] another import statement that caused errors on framos.lawoftheland. does work find on my machine though. Wonder what the difference is.
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8206 by aaron @ 1/19/2009 5:59 PM
2009-05-13 05:41:42 +01:00
substantialnoninfringinguser
b707c31e28
[svn] fixed broken import statement
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8205 by aaron @ 1/19/2009 5:51 PM
2009-05-13 05:41:17 +01:00
substantialnoninfringinguser
0ba4dd4ef4
[svn] survey block object
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8199 by julian @ 1/19/2009 12:22 AM
2009-05-13 05:39:52 +01:00
substantialnoninfringinguser
0f5109cb09
[svn] new person expedition
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8189 by julian @ 1/18/2009 7:50 PM
2009-05-13 05:38:18 +01:00
substantialnoninfringinguser
a366161a24
[svn] Converted screen output display to ASCII, so that I could run the script
...
via SSH on a server
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8171 by julian @ 1/17/2009 8:36 PM
2009-05-13 05:34:14 +01:00
substantialnoninfringinguser
f02b288e4b
[svn] *teams and *date identified and scrapped
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8077 by julian @ 11/8/2008 11:23 PM
2009-05-13 05:21:16 +01:00
substantialnoninfringinguser
a21b61e2b6
[svn] convert unfound files to lower case and try again
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8071 by julian @ 11/7/2008 8:55 AM
2009-05-13 05:20:08 +01:00
substantialnoninfringinguser
936eab2844
[svn] Removed last of the sqlite save hack
...
Started to add reading of dates
Changed character encoding code so it works
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8054 by julian @ 11/2/2008 11:17 PM
2009-05-13 05:17:16 +01:00
substantialnoninfringinguser
a33700ca1e
[svn] we can parse one 2004 logbook in here. corrections made to folk.csv
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8036 by julian @ 10/26/2008 11:27 PM
2009-05-13 05:14:03 +01:00
substantialnoninfringinguser
302f4a1a0f
[svn]
...
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8035 by julian @ 10/26/2008 9:46 PM
2009-05-13 05:13:51 +01:00
substantialnoninfringinguser
b503d3d588
[svn] Initial troggle checkin
...
This is a development site using Django 1.0
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/ , rev. 8034 by julian @ 10/26/2008 9:04 PM
2009-05-13 05:13:38 +01:00
