diff options
author | Wookey <wookey@wookware.org> | 2014-09-11 07:40:58 +0100 |
---|---|---|
committer | Wookey <wookey@wookware.org> | 2014-09-11 07:40:58 +0100 |
commit | 086793c34144e50a2ce829e60422d89db5a43aa7 (patch) | |
tree | e5b05c287ecbcffc1275bbbfab287ee565865ffa /parsers/survex.py.setfix.diff | |
parent | 814ecf8425cbb3edc8ec6239ae9aac01910be0b0 (diff) | |
download | troggle-086793c34144e50a2ce829e60422d89db5a43aa7.tar.gz troggle-086793c34144e50a2ce829e60422d89db5a43aa7.tar.bz2 troggle-086793c34144e50a2ce829e60422d89db5a43aa7.zip |
remove internal copies of jquery, jquiery-forms, jquery-ui+themes,
django-feincms and codemirror
Diffstat (limited to 'parsers/survex.py.setfix.diff')
-rw-r--r-- | parsers/survex.py.setfix.diff | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/parsers/survex.py.setfix.diff b/parsers/survex.py.setfix.diff new file mode 100644 index 0000000..daca749 --- /dev/null +++ b/parsers/survex.py.setfix.diff @@ -0,0 +1,30 @@ +diff -r 04cc6773cbb0 parsers/survex.py +--- a/parsers/survex.py Tue Jul 02 18:13:27 2013 +0100 ++++ b/parsers/survex.py Tue Jul 02 20:03:51 2013 +0100 +@@ -83,6 +83,8 @@ + + stardatadefault = { "type":"normal", "t":"leg", "from":0, "to":1, "tape":2, "compass":3, "clino":4 } + stardataparamconvert = { "length":"tape", "bearing":"compass", "gradient":"clino" } ++#default characters for various items ++starsetchars = { "blank":"/t ", "decimal":".", "comment":";", "eol":"/l/n", "keyword":"*", "minus":"-", "names":"_-", "omit":"-", "plus":"+", "root":"/", "separator":"." } + + def RecursiveLoad(survexblock, survexfile, fin, textlines): + iblankbegins = 0 +@@ -200,10 +202,14 @@ + + elif cmd == "fix": + survexblock.MakeSurvexStation(line.split()[0]) ++ elif cmd == "set": ++ ls = line.lower().split() ++ # set item to use chars given ++ starsetchars = { ls[0]:ls[1] } ++ # what unsets this back to defaults at end of block? + else: +- assert cmd in [ "sd", "include", "units", "entrance", "data", "flags", "title", "export", "instrument", "calibrate", "set", "infer"], (cmd, line, survexblock) +- +- ++ assert cmd in [ "sd", "include", "units", "entrance", "data", "flags", "title", "export", "instrument", "calibrate", "infer"], (cmd, line, survexblock) ++ + + def ReloadSurvexCave(survex_cave): + cave = models.Cave.objects.get(kataster_number=survex_cave) |