From 4e8b86db56c56050752ac3445676ecd7f4103972 Mon Sep 17 00:00:00 2001 From: Alex38Lyon <55714436+Alex38Lyon@users.noreply.github.com> Date: Wed, 27 Aug 2025 19:11:11 +0200 Subject: [PATCH] Debug --- .../general_fonctions.cpython-313.pyc | Bin 19912 -> 19912 bytes Scripts/pyCreateTh/Lib/general_fonctions.py | 2 +- Scripts/pyCreateTh/Lib/global_data.py | 2 +- .../pyCreateTh/Lib/pytro2th/buildthconfig.py | 4 +- .../Lib/pytro2th/datathwritetools.py | 6 +- Scripts/pyCreateTh/Lib/pytro2th/tests/Test.py | 2 +- Scripts/pyCreateTh/Lib/pytro2th/tro2th.py | 4 +- Scripts/pyCreateTh/Lib/pytro2th/vtopotools.py | 8 +- Scripts/pyCreateTh/Template/config.thc | 1345 ++++++++++++----- Scripts/pyCreateTh/Template/template.thconfig | 71 +- Scripts/pyCreateTh/config.ini | 2 +- Scripts/pyCreateTh/pyCreateTh.py | 12 +- 12 files changed, 1028 insertions(+), 430 deletions(-) diff --git a/Scripts/pyCreateTh/Lib/__pycache__/general_fonctions.cpython-313.pyc b/Scripts/pyCreateTh/Lib/__pycache__/general_fonctions.cpython-313.pyc index 843528cd1eedac03778911bcfce7d81093f48dea..e78704624b593890d8770ac359cd44723dba8f68 100644 GIT binary patch delta 24 ecmX>xoAJbKM&8f7yj%=GFze*H44sXxoAJbKM&8f7yj%=GkfgOdLt`WFZeIXl*9Ue0 diff --git a/Scripts/pyCreateTh/Lib/general_fonctions.py b/Scripts/pyCreateTh/Lib/general_fonctions.py index 486ec4c..ca41800 100644 --- a/Scripts/pyCreateTh/Lib/general_fonctions.py +++ b/Scripts/pyCreateTh/Lib/general_fonctions.py @@ -311,7 +311,7 @@ def setup_logger(logfile="app.log", debug_log=False): file_formatter = FileFormatter("%(asctime)s - %(levelname)s - %(message)s") # <-- Ta classe personnalisée file_handler.setFormatter(file_formatter) logger.addHandler(file_handler) - + return logger diff --git a/Scripts/pyCreateTh/Lib/global_data.py b/Scripts/pyCreateTh/Lib/global_data.py index 18cbcd3..25cad5e 100644 --- a/Scripts/pyCreateTh/Lib/global_data.py +++ b/Scripts/pyCreateTh/Lib/global_data.py @@ -12,7 +12,7 @@ error_count = 0 # Compteur d'erreurs ## [Survey_Data] default values Author = "Created by pyCreateTh.py" Copyright = "# Copyright(C) pyCreateTh.py" -CopyrightShort = "Licence(C) pyCreateTh.py" +CopyrightShort = "License(C) pyCreateTh.py" mapComment = "Created by pyCreateTh.py" cs = "UTM30" club = "Therion" diff --git a/Scripts/pyCreateTh/Lib/pytro2th/buildthconfig.py b/Scripts/pyCreateTh/Lib/pytro2th/buildthconfig.py index 7a17c0a..657b357 100644 --- a/Scripts/pyCreateTh/Lib/pytro2th/buildthconfig.py +++ b/Scripts/pyCreateTh/Lib/pytro2th/buildthconfig.py @@ -131,7 +131,7 @@ def writethconfig(pdata, icomments, icoupe, thlang, dictcave, f2w.write(u'encoding utf-8 \n\n') f2w.write(u'# File written by pytro2th (Xavier Robert) \n') f2w.write(u'# Copyright (C) %s Xavier Robert \n' %(str(datetime.datetime.now().year))) - f2w.write(u'# This work is under the licence Creatice Commonc CC-by-nc-sa v.4 \n\n') + f2w.write(u'# This work is under the License Creatice Commonc CC-by-nc-sa v.4 \n\n') if icomments: @@ -561,7 +561,7 @@ def writethc(pdata, cavename = None, istructure = True): Author: Xavier Robert, Lima 2016/06/27 - Licence: CCby-nc + License: CCby-nc """ # Open the file diff --git a/Scripts/pyCreateTh/Lib/pytro2th/datathwritetools.py b/Scripts/pyCreateTh/Lib/pytro2th/datathwritetools.py index d1f43ad..4a84a73 100644 --- a/Scripts/pyCreateTh/Lib/pytro2th/datathwritetools.py +++ b/Scripts/pyCreateTh/Lib/pytro2th/datathwritetools.py @@ -331,7 +331,7 @@ def write_thtot(file, cavename = u'cave', icomments = True, thlang = 'en'): if icomments: if thlang == u'fr': file.write(u'# Copyright (C) %s Xavier Robert \n' %(str(datetime.datetime.now().year))) - file.write(u'# Ce travaille est sous la licence Creative Commons Attribution-ShareAlike-NonCommecial :\n') + file.write(u'# Ce travaille est sous la License Creative Commons Attribution-ShareAlike-NonCommecial :\n') file.write(u'# \n\n') elif thlang == u'en': file.write(u'# Copyright (C) %s Xavier Robert \n' %(str(datetime.datetime.now().year))) @@ -429,7 +429,7 @@ def write_thmaps(file, cavename = u'cave', icomments = True, thlang = 'en'): if icomments: if thlang == u'fr': file.write(u'# Copyright (C) %s Xavier Robert \n' %(str(datetime.datetime.now().year))) - file.write(u'# Ce travail est sous la licence Creative Commons Attribution-ShareAlike-NonCommecial :\n') + file.write(u'# Ce travail est sous la License Creative Commons Attribution-ShareAlike-NonCommecial :\n') file.write(u'# \n\n') elif thlang == u'en': file.write(u'# Copyright (C) %s Xavier Robert \n' %(str(datetime.datetime.now().year))) @@ -498,7 +498,7 @@ def write_thcoords(file, cavename = u'cave', coordinates = None, coordsyst = Non if icomments: if thlang == u'fr': file.write(u'# Copyright (C) %s Xavier Robert \n' %(str(datetime.datetime.now().year))) - file.write(u'# Ce travail est sous la licence Creative Commons Attribution-ShareAlike-NonCommecial :\n') + file.write(u'# Ce travail est sous la License Creative Commons Attribution-ShareAlike-NonCommecial :\n') file.write(u'# \n\n') elif thlang == u'en': file.write(u'# Copyright (C) %s Xavier Robert \n' %(str(datetime.datetime.now().year))) diff --git a/Scripts/pyCreateTh/Lib/pytro2th/tests/Test.py b/Scripts/pyCreateTh/Lib/pytro2th/tests/Test.py index 8e94c73..b15a82b 100644 --- a/Scripts/pyCreateTh/Lib/pytro2th/tests/Test.py +++ b/Scripts/pyCreateTh/Lib/pytro2th/tests/Test.py @@ -16,7 +16,7 @@ The different arguments are described. xavier.robert@ujf-grenoble.fr -(c) licence CCby-nc : http://creativecommons.org/licenses/by-nc/3.0/ 2015 +(c) License CCby-nc : http://creativecommons.org/licenses/by-nc/3.0/ 2015 """ diff --git a/Scripts/pyCreateTh/Lib/pytro2th/tro2th.py b/Scripts/pyCreateTh/Lib/pytro2th/tro2th.py index 75dbd47..6b14aca 100644 --- a/Scripts/pyCreateTh/Lib/pytro2th/tro2th.py +++ b/Scripts/pyCreateTh/Lib/pytro2th/tro2th.py @@ -152,7 +152,7 @@ def tro2th(fle_tro_fnme = None, fle_th_fnme = None, Author: Xavier Robert, Lima 2016/06/27 - Licence: CCby-nc + License: CCby-nc """ if thlang in [u'fr', u'FR', u'Fr', u'fR']: thlang = u'fr' @@ -388,7 +388,7 @@ def convert_tro(fle_tro_fnme, fle_tro_encoding=None, fle_th_fnme = None, cavenam Author: Xavier Robert, Lima 2016/06/27 - Licence: CCby-nc + License: CCby-nc """ #from codecs import open diff --git a/Scripts/pyCreateTh/Lib/pytro2th/vtopotools.py b/Scripts/pyCreateTh/Lib/pytro2th/vtopotools.py index af70239..e8bc064 100644 --- a/Scripts/pyCreateTh/Lib/pytro2th/vtopotools.py +++ b/Scripts/pyCreateTh/Lib/pytro2th/vtopotools.py @@ -53,7 +53,7 @@ def read_vtopo_header(lines): Author: Xavier Robert, Lima 2016/06/27 - Licence: CCby-nc + License: CCby-nc """ # coord_dict: French Lambert system. To find number of your system, see extern/proj4/nad/epsg @@ -122,7 +122,7 @@ def read_settings(line): Author: Xavier Robert, Lima 2016/06/27 - Licence: CCby-nc + License: CCby-nc """ # Question: Do we have to update the code in function of the vtopo version number? param = line[6:].rstrip(u'\n\r').split(u' ') @@ -173,7 +173,7 @@ def read_data(lines, settings, j, iline): Author: Xavier Robert, Lima 2016/06/27 - Licence: CCby-nc + License: CCby-nc """ data = [] @@ -216,7 +216,7 @@ def convert_text(lines): Author: Xavier Robert, Lima 2016/06/27 - Licence: CCby-nc + License: CCby-nc """ dictcaract ={'\xe8' : u'è', '\xe0' : u'à', diff --git a/Scripts/pyCreateTh/Template/config.thc b/Scripts/pyCreateTh/Template/config.thc index c4f504f..afe0e18 100644 --- a/Scripts/pyCreateTh/Template/config.thc +++ b/Scripts/pyCreateTh/Template/config.thc @@ -1,20 +1,22 @@ encoding utf-8 ###################################################################################################################################### -# Version pyCreateTh.py By Alex MàJ 2025 01 02 +# Version ARSIP By Alex 2025 08 26 ###################################################################################################################################### + ###################################################################################################################################### -# Licence +# License ###################################################################################################################################### # # Released under a Creative Commons Attribution-ShareAlike-NonCommercial License: -# Publié sous la licence Creative Commons Attribution-ShareAlike-NonCommercial: +# Publié sous la License Creative Commons Attribution-ShareAlike-NonCommercial: # # # Written by: / Écrit par : Xavier Robert +# Modified by: / Modifié par : Alexandre Pont # - +###################################################################################################################################### # File to set up specific settings for Therion drawing outputs # In your *.thconfig file, you need to call this file with: # Fichier pour définir une configuration pour les dessins de issus de Therion @@ -30,50 +32,13 @@ encoding utf-8 # https://therion.speleo.sk/wiki/tbe:wiki6 # https://therion.speleo.sk/wiki/metapost # https://thomas-holder.de/projects/therion/ - - -# Existing user points / nouvelles définitions de points : -# - nid/nest (u:nest) -# - gradient --> geologic dip -# - danger (u:danger) -# - chauves-souris/bats (u:bats) -# - stalactite boss (u:boss) -# - Shell/coquille fossile (u:shell) -# - Masonry/maçonnerie (u:masonry) -# - Ex voto/Signature (u:ex_voto) -# - Human bones/Ossements humains (u:human_bones) -# - Walking Caver/Spéléo qui marche (u:man_w) -# - Climbing caver/Spéléo qui grimpe (u:man_c) -# - Plan view symbol/symbole de vue en plan (u:symbol_plan) -# - extended view symbol/symbole de vue en coupe développée (u:symbol_extend) -# - entrance -# - block point -# - block user (u:block) - -# Existing user lines: -# - strate/strata (u:strata; option -clip off) -# - coupole (u:coupole; option -clip off) -# - faille/fault (u:fault; option -clip off) -# - doline (u:doline; option -clip off) -# - chauves-souris/bats (u:bats) -# - rail (u:rail) -# - plan walk/ (u:planwalk) -# - handrail/rambarde (u:handrail) -# - Surface (u:surf) -# - Dive line/fil d'Ariane (u:ariane) -# - Deviation (u:deviation) -# - rock border -# - Shot_Survey line (u:Shot_Survey) - -# Existing user areas: -# - boue/mud (u:boue) -# - guano (u:guano) -# - chauves-souris/bats (u:bats) -# - tronc/tree-trunk (u:tronc) -# - feuilles/tree-leaves (u:feuilles) -# - Tunnel initiation/Départ de galerie (u:galerie) - -# layout definition: +# +# +############## +# - Translation English, French and Spanish : en, fr, es +# +# +############## layout definition: # - layout langue-fr # - layout langue-es # - layout langue-en @@ -82,6 +47,8 @@ encoding utf-8 # - layout scalebar_vert-Halama # - layout scalebar_vert # - layout headerl +# - layout headerl_LT +# - layout headerl_XXLT # Layout to change the header (plan projection with minimun info) # - layout header_coupe_vert-to-place # - layout header_coupe_vert-auto # - layout header_coupe @@ -101,6 +68,65 @@ encoding utf-8 # - layout fonts_500 # - layout Survey_No_Scrap +############## Point, line and area in layout drawingconfig + +############## Existing user points / nouvelles définitions de points : +# - nid/nest (u:nest) +# - gradient --> geologic dip +# - danger (u:danger) +# - chauves-souris/bats (u:bats) +# - stalactite boss (u:boss) +# - Shell/coquille fossile (u:shell) +# - Walking Caver/Spéléo qui marche (u:man_w) +# - Climbing caver/Spéléo qui grimpe (u:man_c) +# - Plan view symbol/symbole de vue en plan (u:symbol_plan) +# - extended view symbol/symbole de vue en coupe développée (u:symbol_extend) +# - entrance +# - blocks +# - block user (u:block) +# - altitude +# - label +# - anchor artificial +# - anchor natural + + +############## Existing user lines: +# - strate/strata (u:strata; option -clip off) +# - coupole (u:coupole; option -clip off) +# - faille/fault (u:fault; option -clip off) +# - doline (u:doline; option -clip off) +# - chauves-souris/bats (u:bats) +# - rail (u:rail) +# - plan walk/ (u:planwalk) +# - Surface (u:surf -clip off) +# - Dive line/fil d'Ariane (u:ariane) +# - Deviation (u:deviation) +# - rock border +# - Shot_Survey line (u:Shot_Survey) +# - treetrunk line (u -subtype treetrunk -clip off) +# - bush line (u -subtype bush -attr bulgesize 1 -attr bulges 20 -clip off) +# - chimeney +# - slope +# - flowstone +# - wall unsurveyed +# - wall debris (u:wall_debris) +# - wall presumed +# - survey cave + +############## Existing user areas: +# - boue/mud (u:boue) +# - guano (u:guano) +# - chauves-souris/bats (u:bats) +# - tronc/tree-trunk (u:tronc) +# - feuilles/tree-leaves (u:feuilles) +# - Tunnel initiation/Départ de galerie (u:galerie) +# - blocks +# - sands +# - pebbles +# - sump +# - water + + ###################################################################################################################################### # change the names for the legend # change les descriptions des symboles pour la légende @@ -185,6 +211,10 @@ text en "point u:shell" "shell" text fr "point u:shell" "fossile" text es "point u:shell" "fosíl" +text en "line u:Shot_Survey" "Shot" +text fr "line u:Shot_Survey" "Visée" +text es "line u:Shot_Survey" "Referido" + # Correction texte espagnol text es "point air-draught" "corriente de aire" text es "line rock-border" "contorno de bloque" @@ -196,10 +226,8 @@ text es "line water-flow:permanent" "riachuelo" text es "point water-flow:intermittent" "riachuelo intermitente" text es "line water-flow:intermittent" "riachuelo intermitente" text es "line water-flow:conjectural" "riachuelo supuesto" - text es "line rock-edge" "arista de bloque" text es "point cave-pearl" "perlas de cavernas" - text es "point rimstone-dam" "travertino" text es "point rimstone-pool" "travertino" text es "point stalactite" "estalactita" @@ -235,6 +263,14 @@ text en "point wall-altitude" "altitude (m)" text fr "point wall-altitude" "altitude (m)" text es "point wall-altitude" "altura (m)" +text en "line u:treetrunk" "tree" +text fr "line u:treetrunk" "arbre" +text es "line u:treetrunk" "árbol" + +text en "line u:bush" "bush" +text fr "line u:bush" "buisson" +text es "line u:bush" "arbusto" + ###################################################################################################################################### @@ -268,22 +304,23 @@ layout langue-fr language fr code tex-map - % Definition of variables for the tuned headers : + #% Definition of variables for the tuned headers : \newtoks\thversiontitleB \thversiontitleB={Therion } - \newtoks\thversiontitleA \thversiontitleA={Compilation } + \newtoks\thversiontitleA \thversiontitleA={Compilation} \newtoks\datetitle \datetitle={le } - \newtoks\thproj \thproj={Projection } - \newtoks\thclub \thclub={Club(s) } - \newtoks\thsynth \thsynth={Synthèse } - \newtoks\thwpage \thwpage={Page internet } - \newtoks\thexpe \thexpe={Expedition } - \newtoks\thguide \thguide={Guide(s) } - \newtoks\thdatat \thdatat={Données topographiques } - \newtoks\depthrangetitle \depthrangetitle={Depth range from } - \newtoks\ththanksto \ththanksto{Remerciements } + \newtoks\thproj \thproj={Projection} + \newtoks\thclub \thclub={Réalisation} + \newtoks\thsynth \thsynth={Synthèse} + \newtoks\thwpage \thwpage={Web} + \newtoks\thexpe \thexpe={Expedition} + \newtoks\thguide \thguide={Guide(s)} + \newtoks\thdatat \thdatat={Données} + \newtoks\thdatabase \thdatabase={Base de données} + \newtoks\depthrangetitle \depthrangetitle={Profondeurs depuis} + \newtoks\ththanksto \ththanksto{Remerciements} \newtoks\thcoords \thcoords{Coordonnées} - \newtoks\explolengthtitle \explolengthtitle{Longueur explorée } + \newtoks\explolengthtitle \explolengthtitle{Longueur explorée} \newtoks\explodepthtitle \explodepthtitle{\thinspace{}---\thinspace{}\thinspace{}\thinspace{}\thinspace{}Profondeur explorée } # Initiate variables @@ -293,6 +330,7 @@ layout langue-fr \newtoks\expe \expe={} \newtoks\guide \guide={} \newtoks\datat \datat={} + \newtoks\database \database={} \newtoks\thanksto \thanksto={} \newtoks\ECoordinates \ECoordinates={} @@ -305,19 +343,20 @@ layout langue-es language es code tex-map - % Definition of variables for the tuned headers : + #% Definition of variables for the tuned headers : \newtoks\thversiontitleB \thversiontitleB={Therion } \newtoks\thversiontitleA \thversiontitleA={Compilación} \newtoks\datetitle \datetitle={el } \newtoks\thproj \thproj={Proyección} - \newtoks\thclub \thclub={Club(es)} + \newtoks\thclub \thclub={Realización} \newtoks\thsynth \thsynth={Síntesis} - \newtoks\thwpage \thwpage={Página web} + \newtoks\thwpage \thwpage={Web} \newtoks\thexpe \thexpe={Expedición} \newtoks\depthrangetitle \depthrangetitle={Depth range from } \newtoks\thguide \thguide={Guia(s)} \newtoks\thdatat \thdatat={Datos topograficas} + \newtoks\thdatabase \thdatabase={Dase de datos} \newtoks\ththanksto \ththanksto{Nuestros agradecimientos } \newtoks\thcoords \thcoords{Coordinadas GPS (WGS84) } \newtoks\explolengthtitle \explolengthtitle{Longitud explorada} @@ -332,6 +371,7 @@ layout langue-es \newtoks\expe \expe={} \newtoks\guide \guide={} \newtoks\datat \datat={} + \newtoks\database \database={} \newtoks\thanksto \thanksto={} \newtoks\ECoordinates \ECoordinates={} @@ -345,20 +385,21 @@ layout langue-en language en code tex-map - % Definition of variables for the tuned headers : + #% Definition of variables for the tuned headers : \newtoks\thversiontitleB \thversiontitleB={Therion } \newtoks\thversiontitleA \thversiontitleA={Compiled} \newtoks\datetitle \datetitle={on } \newtoks\thproj \thproj={Projection} - \newtoks\thclub \thclub={Club(s)} + \newtoks\thclub \thclub={Realisation} \newtoks\thsynth \thsynth={Synthesys} \newtoks\thwpage \thwpage={Web page} \newtoks\thexpe \thexpe={Expedition} \newtoks\depthrangetitle \depthrangetitle={Depth range from } \newtoks\thguide \thguide={Guide(s)} \newtoks\thdatat \thdatat={Survey's data} - \newtoks\ththanksto \ththanksto{Acknowledgments } + \newtoks\thdatabase \thdatabase={Data base} + \newtoks\ththanksto \ththanksto{Acknowledgments} \newtoks\thcoords \thcoords{GPS coordinates (WGS84) } \newtoks\explolengthtitle \explolengthtitle{Explored length} \newtoks\explodepthtitle \explodepthtitle{\thinspace{}---\thinspace{}\thinspace{}\thinspace{}\thinspace{}Explored depth} @@ -370,6 +411,7 @@ layout langue-en \newtoks\expe \expe={} \newtoks\guide \guide={} \newtoks\datat \datat={} + \newtoks\database \database={} \newtoks\thanksto \thanksto={} \newtoks\ECoordinates \ECoordinates={} @@ -384,6 +426,7 @@ endlayout ###################################################################################################################################### ###################################################################################################################################### layout drawingconfig + # Layout to draw the map and extended view. # Layout pour dessiner les plans et les coupes développées. @@ -394,59 +437,58 @@ layout drawingconfig # Set the symology you want to use: UIS, ASF (Australie) CCNP (Etats Units), SKB (tchecoslovakia) # Définit la banque de symboles que nous voulons utiliser : # UIS, ASF (Australie) CCNP (Etats Units) ou SKB (tchecoslovakia) - #symbol-set UIS + # symbol-set UIS # Change the type or colors of specific symbols: # Changer le type ou la couleur de symboles spécifiques: - symbol-assign area sand AUT + symbol-assign area clay AUT + symbol-assign point camp UIS symbol-assign point pillar AUT symbol-assign point station:temporary SKBB symbol-assign point entrance MY - #symbol-assign point entrance UIS - - + symbol-color area clay [52 33 6] # Color to verify symbol-color area flowstone [100 60 20] symbol-color area ice [0 0 100] - symbol-color area moonmilk [100 60 20] # Change the color ? - symbol-color area mudcrack [52 33 6] # Color to verify ; Maybe to darken + symbol-color area moonmilk [100 60 20] # Change the color ? + symbol-color area mudcrack [52 33 6] # Color to verify ; Maybe to darken symbol-color area pillar [100 60 20] symbol-color area pillar-with-curtains [100 60 20] - symbol-color area sand [67 49 1] # Color to verify + symbol-color area sand [67 49 1] # Color to verify symbol-color area snow [0 0 100] symbol-color area stalactite [100 60 20] symbol-color area stalactite-stalagmite [100 60 20] symbol-color area stalagmite [100 60 20] - symbol-color line contour [34 21 3] # Marron : (87, 56, 8) - symbol-color line ceiling-meander [34 21 3] # Marron : (87, 56, 8) + symbol-color line contour [34 21 3] # Marron : (87, 56, 8) + symbol-color line ceiling-meander [34 21 3] # Marron : (87, 56, 8) symbol-color line flowstone [100 60 20] - symbol-color line floor-meander [34 21 3] # Marron : (87, 56, 8) - symbol-color line floor-step [34 21 3] # Marron : (87, 56, 8) - symbol-color line map-connection [69 69 69] # Gris acier (175, 175, 175) + symbol-color line floor-meander [34 21 3] # Marron : (87, 56, 8) + symbol-color line floor-step [34 21 3] # Marron : (87, 56, 8) + #symbol-color line map-connection [69 69 69] # Gris acier (175, 175, 175) symbol-color line rimstone-dam [100 60 20] symbol-color line rimstone-pool [100 60 20] - symbol-color line rock-border [34 21 3] # Marron : (87, 56, 8) - symbol-color line rock-edge [34 21 3] # Marron : (87, 56, 8) - symbol-color line slope [34 21 3] # Marron : (87, 56, 8) + symbol-color line rock-border [34 21 3] # Marron : (87, 56, 8) + symbol-color line rock-edge [34 21 3] # Marron : (87, 56, 8) + symbol-color line slope [34 21 3] # Marron : (87, 56, 8) symbol-color line rope [58 44 25] - symbol-color line survey [46 46 46] # Gris foncé (117, 117, 117) / acier (175, 175, 175) - symbol-color line wall:clay [52 33 6] # Color to verify - symbol-color line wall:flowstone [100 60 20] + symbol-color line survey [46 46 46] # Gris foncé (117, 117, 117) / acier (175, 175, 175) + symbol-color line wall:clay [52 33 6] # Color to verify + symbol-color line wall:flowstone [0 0 0] symbol-color line wall:ice [0 0 100] - symbol-color line wall:moonmilk [100 60 20] # Change the color ? + #symbol-color line wall:moonmilk [100 60 20] # Change the color ? symbol-color line water-flow [17 46 100] symbol-color line water-flow:conjectural [17 46 100] symbol-color line water-flow:intermittent [17 46 100] - + symbol-color point altitude [100 50 0] symbol-color point aragonite [100 60 20] - symbol-color point blocks [34 21 3] # Marron : (87, 56, 8) - symbol-color point breakdown-choke [34 21 3] # Marron : (87, 56, 8) + symbol-color point blocks [34 21 3] # Marron : (87, 56, 8) + symbol-color point breakdown-choke [34 21 3] # Marron : (87, 56, 8) symbol-color point cave-pearl [100 60 20] - symbol-color point clay [52 33 6] # Color to verify - symbol-color point clay-choke [52 33 6] # Color to verify + symbol-color point clay [52 33 6] # Color to verify + symbol-color point clay-choke [52 33 6] # Color to verify symbol-color point curtain [100 60 20] symbol-color point curtains [100 60 20] symbol-color point disc-pillar [100 60 20] @@ -464,17 +506,17 @@ layout drawingconfig symbol-color point ice-pillar [0 0 100] symbol-color point ice-stalactite [0 0 100] symbol-color point ice-stalagmite [0 0 100] - symbol-color point moonmilk [100 60 20] # Change the color ? - symbol-color point mud [52 33 6] # Color to verify - symbol-color point mudcrack [52 33 6] # Color to verify + symbol-color point moonmilk [100 60 20] # Change the color ? + symbol-color point mud [52 33 6] # Color to verify + symbol-color point mudcrack [52 33 6] # Color to verify symbol-color point pillar [100 60 20] symbol-color point pillar-with-curtains [100 60 20] symbol-color point pillars [100 60 20] symbol-color point pillars-with-curtains [100 60 20] symbol-color point popcorn [100 60 20] symbol-color point rimstone-dam [100 60 20] + symbol-color point rimstone-pool [100 60 20] symbol-color point root [52 33 6] - symbol-color point seed-germination [13 47 6] symbol-color point snow [0 0 100] symbol-color point soda-straw [100 60 20] @@ -488,9 +530,9 @@ layout drawingconfig symbol-color point stalagmite [100 60 20] symbol-color point stalagmites [100 60 20] symbol-color point station [54 7 60] - symbol-color point station-name [80 80 80] # light grey + symbol-color point station-name [80 80 80] # light grey symbol-color point vegetable-debris [13 47 6] - symbol-color point volcano [52 33 6] # Color to verify + symbol-color point volcano [52 33 6] # Color to verify symbol-color point wall-altitude [100 50 0] symbol-color point wall-calcite [100 60 20] symbol-color point water [17 46 100] @@ -499,9 +541,10 @@ layout drawingconfig symbol-color point water-flow:intermittent [17 46 100] symbol-color point water-flow:paleo [17 46 100] + ####### Metapost-changes ############ code metapost - + #fonts_setup( 12, 16, 32, 64, 96 ); # Modify length/depth statistics to print @@ -512,8 +555,188 @@ layout drawingconfig # \cavedepth{243\thinspace{}m} #endcode + + ######################################################## + # Change the ligne wall:debris (from l_wall_debris_AUT) + # Changer le symbole ligne wall:debris (d'après l_wall_debris_AUT) + ######################################################## + + def l_wall_debris (expr P) = + T := identity; + pickup PenC; + laenge := arclength P; + path block; + path old_block; + + cur := 0; + t := arctime cur of P; + + % === Première brique fixe === + old_block := ((-.0u,-.0u)--(.25u,-.15u)--(.45u,0.01u)--(.2u,.25u)--(.05u,.15u)--cycle); + block_width := (xpart urcorner old_block - xpart ulcorner old_block); + old_block := old_block rotated angle(thdir(P,0)) shifted point t of P; + thclean old_block; + + % --- Couleur aléatoire --- + AlphaFactor1 := 0.5 + uniformdeviate 0.4; + + fill old_block withcolor (0.341117, 0.219607, 0.031372) withalpha AlphaFactor1; + draw old_block withpen PenC; % contour noir + + cur := cur + 0.9 * block_width; + t := arctime cur of P; + + % === Boucle de blocs aléatoires === + forever: + block := punked (((-.25u,-.25u)--(0.25u,-.25u)--(0.50u,0.01u)--(0.25u,.25u)--(-.25u,.25u)--cycle) + randomized (u/4)) + scaled (uniformdeviate(0.3)+.4) + rotated uniformdeviate(360); + block_width := (xpart urcorner block - xpart ulcorner block); + exitif cur > (laenge - 2.5*block_width/2); + + forever: + exitif xpart ( (block rotated angle(-direction t of P) shifted point t of P) intersectiontimes old_block) < 0; + cur := cur + 0.01u; + t := arctime cur of P; + exitif cur > (laenge - 2.5*block_width/2); + endfor; + + exitif cur > (laenge - 2.5*block_width/2); + + old_block := block rotated angle(-direction t of P) shifted point t of P; + thclean old_block; + + % --- Couleur aléatoire --- + AlphaFactor1 := 0.5 + uniformdeviate 0.4; + fill old_block withcolor (0.341117, 0.219607, 0.031372) withalpha AlphaFactor1; + draw old_block withpen PenC; + + cur := cur + block_width/2; + t := arctime cur of P; + endfor; + + % === Dernier bloc ajusté === + t := arctime laenge - eps of P; + block := ((-.0u,-.0u)--(.25u,-.15u)--(.45u,0.01u)--(.2u,.25u)--(.1u,.15u)--cycle); + block_width := (xpart urcorner block - xpart ulcorner block); + scale_factor := 1.5*(laenge - cur)/block_width; + + forever: + exitif scale_factor < 0; + exitif xpart ((block rotated angle(-direction t of P) scaled scale_factor shifted point t of P) intersectiontimes old_block) < 0; + scale_factor := scale_factor - 0.01; + endfor; + + if scale_factor > 0: + path last_block; + last_block := block rotated angle(-direction t of P) scaled scale_factor shifted point t of P; + thclean last_block; + + % --- Couleur aléatoire --- + AlphaFactor1 := 0.5 + uniformdeviate 0.4; + fill last_block withcolor (0.341117, 0.219607, 0.031372) withalpha AlphaFactor1; + draw last_block withpen PenC; + fi; + enddef; + + + ######################################################## + # the tree/trunk and bush symbole from Tarquin 2019 + # Symbole d'arbre d'arès Tarkin 2019 + ######################################################## + def l_u_treetrunk(expr P)= + T:=identity; + pickup PenC; + draw P withcolor (0.31, 0.15, 0); + enddef; + + initsymbol("l_u_treetrunk"); + + def l_u_treetrunk_legend = + l_u_treetrunk(((.4,.9) .. controls (.5,.8) and (.44,.2) .. (.3,0)) inscale); + l_u_treetrunk(((.6,0) .. controls (.55,.2) and (.5,.7) .. (.7,.9)) inscale); + l_u_treetrunk(((.65,.95) .. controls (.6,.8) and (.5,.7) .. (.45,.95)) inscale); + enddef; + + def l_u_bush (expr P)= + begingroup; + save pathlength, bulges, bulgesper, bulgesize, newpoint, newdirection, bulgedpath, steps, pathfactor, slopefactor, extradirection, curincrement, samplepoint, sinefactor; + T:=identity; + pathlength:=arclength P; + if known ATTR_bulges: + bulges:=max(ceiling(scantokens(ATTR_bulges)),1); + else: + bulges:=10; + fi; + if known ATTR_bulgesper: + if ATTR_bulgesper = "tenu": + bulges:=ceiling(bulges*(pathlength/10u)); + fi; + fi; + if known ATTR_bulgesize: + bulgesize:=scantokens(ATTR_bulgesize) * u; + else: + bulgesize:=u; + fi; + pair newpoint; + pair newdirection; + path bulgedpath; + steps:=3; % number of samples per bulge + % precompute various numbers to avoid arithmetic overflows with large numbers of bulges + pathfactor:=pathlength/(steps*bulges); + slopefactor:=pathlength/(bulges*3.14159); + extradirection:=angle(slopefactor,-bulgesize*cosd(180)); + curincrement:=0; + forever: + samplepoint:=arctime (curincrement*pathfactor) of P; + sinefactor:=180 * (curincrement mod steps) / steps; + newpoint:=((point samplepoint of P) shifted (bulgesize * sind(sinefactor) * unitvector(thdir(P,samplepoint) rotated -90))); + newdirection:=thdir(P,samplepoint) rotated angle(slopefactor,-bulgesize*cosd(sinefactor)); + % enable for debugging + %thdraw (point samplepoint of P) withcolor (100,0,0) withpen PenC; + %thdraw newpoint--(newpoint shifted (bulgesize*unitvector(newdirection))) withcolor (0,0,100) withpen PenC; + if known bulgedpath: + if ((curincrement mod steps) = 0): + % this is a corner where one bulge ends and another starts, two points are needed so that the direction vectors can control curves + %thdraw newpoint--(newpoint shifted (bulgesize*unitvector(thdir(P,samplepoint) rotated extradirection))) withcolor (0,0,100) withpen PenC; + bulgedpath:=bulgedpath .. newpoint{thdir(P,samplepoint) rotated extradirection}; + if curincrement <> steps * bulges: + % don't add one in the final increment, since --cycle then has two identical point vectors + bulgedpath:=bulgedpath -- newpoint{newdirection}; + fi; + else: + bulgedpath:=bulgedpath .. newpoint{newdirection}; + fi; + else: + % first point in the path + bulgedpath:=newpoint{newdirection}; + fi; + exitif curincrement = steps * bulges; + curincrement:=curincrement + 1; + endfor; + if cycle P: + bulgedpath:=bulgedpath -- cycle; + fi; + thdraw bulgedpath withcolor green withpen PenC; + endgroup; + enddef; + + initsymbol("l_u_bush"); + + def l_u_bush_legend = + begingroup; + save ATTR_bulgesize; + string ATTR_bulgesize; + ATTR_bulgesize:=".2"; + l_u_bush(((.6,.1)..controls (.8,.3) and (.9,.7)..(.5,.9)..controls (.1,.7) and (.2,.3)..(.4,.1)) inscale); + endgroup; + enddef; + + ######################################################## # Change the entrance symbole # Changer le symbole d'entrée + ######################################################## def p_entrance_MY (expr pos,theta,sc,al)= U:=(0.0u,0.0u); T:=identity aligned al rotated 0.0 scaled sc shifted pos; @@ -525,50 +748,54 @@ layout drawingconfig initsymbol("p_entrance_MY"); + ######################################################## # Define Shot_Survey (u:Shot_Survey) in thin red # Définition de la ligne file d'Shot_Survey en rouge fin + ######################################################## def l_u_Shot_Survey (expr Path) = T:=identity; pickup PenA; draw Path withcolor black; enddef; - + ######################################################## # Change the block symbole # Changer le symbole de block + ######################################################## def p_blocks (expr pos,theta,sc,al)= base_symbolsize :=0.30u; %Factor*u; Factor=size of the blocks size_factor := 0.5 + uniformdeviate 0.5; % Pour le polygone principal symbolsize := base_symbolsize * size_factor; - U:=(.5u,.5u); + U :=(.5u,.5u); random_theta := uniformdeviate 360; + AlphaFactor1 := 0.5 + uniformdeviate 0.4; + AlphaFactor2 := 0.5 + uniformdeviate 0.4; + AlphaFactor3 := 0.5 + uniformdeviate 0.4; T:=identity aligned al rotated random_theta scaled sc shifted pos; pickup PenC; - thfill (.0symbolsize,.0symbolsize)--(1.0symbolsize,-.5symbolsize)--(0.0symbolsize,-1.5symbolsize)--(-1.0symbolsize,-1.0symbolsize)--cycle withcolor (0.341117, 0.219607, 0.031372) withalpha 0.6; + thfill (.0symbolsize,.0symbolsize)--(1.0symbolsize,-.5symbolsize)--(0.0symbolsize,-1.5symbolsize)--(-1.0symbolsize,-1.0symbolsize)--cycle withcolor (0.341117, 0.219607, 0.031372) withalpha AlphaFactor1; thdraw (.0symbolsize,.0symbolsize)--(1.0symbolsize,-.5symbolsize)--(0.0symbolsize,-1.5symbolsize)--(-1.0symbolsize,-1.0symbolsize)--cycle withcolor (0.341117, 0.219607, 0.031372); - thfill (.5symbolsize,-.25symbolsize)--(1.0symbolsize,.5symbolsize)--(0.0symbolsize,1.5symbolsize)--(-0.5symbolsize,.5symbolsize)--cycle withcolor (0.341117, 0.219607, 0.031372) withalpha 0.4; + thfill (.5symbolsize,-.25symbolsize)--(1.0symbolsize,.5symbolsize)--(0.0symbolsize,1.5symbolsize)--(-0.5symbolsize,.5symbolsize)--cycle withcolor (0.341117, 0.219607, 0.031372) withalpha AlphaFactor2; thdraw (.5symbolsize,-.25symbolsize)--(1.0symbolsize,.5symbolsize)--(0.0symbolsize,1.5symbolsize)--(-0.5symbolsize,.5symbolsize)--cycle withcolor (0.341117, 0.219607, 0.031372); - thfill (.0symbolsize,.0symbolsize)--(.0symbolsize,.5symbolsize)--(-1.5symbolsize,.5symbolsize)--(-1.5symbolsize,-0.5symbolsize)--(-0.5symbolsize,-0.5symbolsize)--cycle withcolor (0.341117, 0.219607, 0.031372) withalpha 0.5; + thfill (.0symbolsize,.0symbolsize)--(.0symbolsize,.5symbolsize)--(-1.5symbolsize,.5symbolsize)--(-1.5symbolsize,-0.5symbolsize)--(-0.5symbolsize,-0.5symbolsize)--cycle withcolor (0.341117, 0.219607, 0.031372) withalpha AlphaFactor3; thdraw (.0symbolsize,.0symbolsize)--(.0symbolsize,.5symbolsize)--(-1.5symbolsize,.5symbolsize)--(-1.5symbolsize,-0.5symbolsize)--(-0.5symbolsize,-0.5symbolsize)--cycle withcolor (0.341117, 0.219607, 0.031372); enddef; + ######################################################## # Change the rock bordersymbole # Changer le symbole des ligne rock border + ######################################################## def l_rockborder (expr p) = - % Vérifie si le chemin est fermé - %if p[0] = point infinity of p: - % Remplit la zone avec une couleur si le chemin est fermé - %fill p withcolor (0.34, 0.21, 0.3); - - %draw p withcolor 0.5green; - %fi; - thfill p --cycle withcolor (0.341117, 0.219607, 0.031372) withalpha 0.5; - thdraw p --cycle withcolor (0.341117, 0.219607, 0.031372); - % Dessine la bordure de la ligne (même si elle n'est pas fermée) - %draw p withcolor (0.34, 0.21, 0.3); + pickup PenC; + AlphaFactor := 0.3 + uniformdeviate 0.4; + fill p --cycle withcolor (0.341117, 0.219607, 0.031372) withalpha AlphaFactor; + draw p --cycle withcolor (0.341117, 0.219607, 0.031372); enddef; - + ######################################################## + # u:block definition + #définition du bloc u:block + ######################################################## def p_u_block(expr pos,theta,sc,al) = T:=identity aligned al rotated theta scaled sc shifted pos; path p q; @@ -581,23 +808,31 @@ layout drawingconfig thdraw q; thfill q withcolor(0.6,0.6,0.6); pickup PenD; - path p; - p := (-2u,-0.65u)--(-1.9u,-1u); - thdraw p; - path p; - p := (0.6u,-0.7u)--(0.5u,-1.3u); - thdraw p; - path p; - p := (2.1u,-0.15u)--(2.3u,-0.4u); - thdraw p; + path p; p := (-2u,-0.65u)--(-1.9u,-1u); thdraw p; + path p; p := (0.6u,-0.7u)--(0.5u,-1.3u); thdraw p; + path p; p := (2.1u,-0.15u)--(2.3u,-0.4u); thdraw p; enddef; initsymbol("p_u_block"); + ######################################################## + # Change the dashed line for the line map_connection + # Changer la ligne pointillée du symbole map_connection + ######################################################## + + #def l_mapconnection (expr P) = + #T:=identity; + #pickup PenB; + # Old definition + #thdraw P dashed evenly scaled (2*optical_zoom); + # New definition + #thdraw P dashed evenly scaled (.1u); + #enddef; - + ######################################################## # Change the dashed line for the line wall:presumed # Changer la ligne pointillée du symbole line wall:presumed + ######################################################## def l_wall_presumed (expr P) = T:=identity; pickup PenA; @@ -607,8 +842,10 @@ layout drawingconfig thdraw P dashed evenly scaled (.1u); enddef; + ######################################################## # Change the dashed line for the line chimney # Changer la ligne pointillée du symbole line chemney (cheminée) + ######################################################## def l_chimney (expr P) = T:=identity; pickup PenC; @@ -616,8 +853,10 @@ layout drawingconfig thdraw P dashed evenly scaled (.05u); enddef; + ######################################################## # To change blocs size in the area blocks # Pour modifier la taille des blocs dans l'aire blocks + ######################################################## def a_blocks (expr p) = T:=identity; pickup PenC; @@ -625,25 +864,29 @@ layout drawingconfig picture tmp_pic; uu := max(u, (xpart urcorner q - xpart llcorner q)/100, (ypart urcorner q - ypart llcorner q)/100); tmp_pic := image( - for i = xpart llcorner q step 1.0uu until xpart urcorner q: - for j = ypart llcorner q step 1.0uu until ypart urcorner q: - qq := punked (((-.3uu,-.3uu)--(.3uu,-.3uu)--(.3uu,.3uu)--(-.3uu,.3uu)--cycle) - randomized (uu/2)) - rotated uniformdeviate(360) - shifted ((i,j) randomized 1.0uu); - if xpart (p intersectiontimes qq) < 0: - thclean qq; - thdraw qq; - fi; - endfor; - endfor; + for i = xpart llcorner q step 1.0uu until xpart urcorner q: + for j = ypart llcorner q step 1.0uu until ypart urcorner q: + qq := punked (((-.3uu,-.3uu)--(.3uu,-.3uu)--(.3uu,.3uu)--(-.3uu,.3uu)--cycle) + randomized (uu/2)) + rotated uniformdeviate(360) + shifted ((i,j) randomized 1.0uu); + if xpart (p intersectiontimes qq) < 0: + thclean qq; + AlphaFactor := 0.5 + uniformdeviate 0.4; + thdraw qq --cycle withcolor (0.341117, 0.219607, 0.031372); + thfill qq --cycle withcolor (0.341117, 0.219607, 0.031372) withalpha AlphaFactor; + fi; + endfor; + endfor; ); clip tmp_pic to p; draw tmp_pic; enddef; + ######################################################## # To change sand aspects # Pour modifier les aspects du sable dans l'aire associée + ######################################################## def a_sands (expr p) = T:=identity; pickup PenC; @@ -660,8 +903,10 @@ layout drawingconfig draw tmp_pic; enddef; + ######################################################## # To change pebbles aspects # Pour modifier l'aspects de l'aire pebbles (galets) + ######################################################## def a_pebbles_SKBB (expr p) = T:=identity; pickup PenC; @@ -684,8 +929,10 @@ layout drawingconfig draw tmp_pic; enddef; + ######################################################## # To change slopes aspects # Pour modifier la ligne aspects + ######################################################## def l_slope (expr P,S)(text Q) = %show Q; T:=identity; @@ -801,8 +1048,10 @@ layout drawingconfig %for i=0 upto li: draw point i of P; endfor; enddef; + ######################################################## # To change color of Mud area # Pour modifier la couleur de l'aire Boue + ######################################################## def a_u_boue (expr p) = T:=identity; #thfill p withcolor (0.22, 0.22, 0.95); @@ -810,49 +1059,62 @@ layout drawingconfig thfill p withcolor (0.49, 0.20, 0.00); enddef; + ######################################################## # To change color of Sump # Pour modifier la couleur de l'aire siphon + ######################################################## def a_sump (expr p) = T:=identity; #thfill p withcolor (0.22, 0.22, 0.95); thfill p withcolor (0.06, 0.20, 0.65); enddef; + ######################################################## # To change color of guano # Pour modifier la couleur de l'aire guano + ######################################################## def a_u_guano (expr p) = T:=identity; thfill p withcolor (0.53, 0.26, 0.11); enddef; + ######################################################## # To change color of a tree-trunk # I advise to use a line "border" to delimit the area # If used with tree-leaves, add the option -place top # Pour modifier la couleur de l'aire tronc # Je suggère d'utiliser une ligne "border/bord" pour délimiter l'aire # Si utilisé conjointement avec l'aire feuilles d'arbres, utiliser l'option -place top + ######################################################## def a_u_tronc (expr p) = T:=identity; thfill p withcolor (0.62, 0.24, 0.05); enddef; + ######################################################## # To change color of a tree-leaves # Pour modifier la couleur de l'aire feuilles d'arbre/feuillage + ######################################################## def a_u_feuilles (expr p) = T:=identity; thfill p withcolor (0.0, 1.0, 0.0); enddef; + ######################################################## # To change color of Water area # Pour modifier la couleur de l'aire eau + ######################################################## def a_water (expr p) = T:=identity; #thfill p withcolor (0.60, 0.8, 1); thfill p withcolor (0.17, 0.46, 1); enddef; + ######################################################## # Northarrow more funnier ! # Pour définir une nouvelle flèche du nord + ######################################################## + # def s_northarrow (expr rot) = # begingroup # interim defaultscale:=0.7; % scale your north arrow here @@ -897,8 +1159,11 @@ layout drawingconfig endgroup; enddef; + ######################################################## # # Change Scale bar type # # Pour modifier la barre d'échelle + ######################################################## + # def s_scalebar (expr l, units, txt) = # begingroup # interim warningcheck:=0; @@ -925,9 +1190,11 @@ layout drawingconfig # endgroup; # enddef; - + ######################################################## # # Write the point depth (not functionning...) # # Définir un point qui écrit la côte/profondeur (Ne fonctionne pas actuellement...) + ######################################################## + # def p_u_prof (expr pos) = # T:=identity shifted pos; # pickup PenD; @@ -982,7 +1249,7 @@ layout drawingconfig # enddef; - + ######################################################## # Change the altitude definition # This label requires to specify the position of text relative to point with # help of -align in the options box. @@ -990,6 +1257,7 @@ layout drawingconfig # Ce label nécessite la position spécifique de l'étiquette de texte de façon relative # au point avec l'aide de l'option -align. #ex: -align bottom-right/top-left/top-right/bottom-left/top/bottom/left/right... + ######################################################## def p_altitude (expr pos) = T:=identity shifted pos; @@ -1000,47 +1268,49 @@ layout drawingconfig thclean p; thdraw p; enddef; - vardef p_label@#(expr txt,pos,rot,mode) = - if mode=1: - thdrawoptions(withcolor .8red + .4blue); - p_altitude(pos); - % append "m" to label - picture txtm; - txtm:=image( - draw txt; - interim labeloffset:=0; - label.urt(btex \thaltitude { m} etex, lrcorner txt); - #label.urt(btex \thheight m etex, lrcorner txt); - ); - % give extra offset in case of l/r/t/b alignment - pair ctmp; - ctmp:=center thelabel@#("x", (0,0)); - if (xpart ctmp * ypart ctmp)=0: - interim labeloffset:=(.4u); - else: % diagonal alignment - interim labeloffset:=(.2u); + vardef p_label@#(expr txt,pos,rot,mode) = + if mode=1: + thdrawoptions(withcolor .8red + .4blue); + p_altitude(pos); + % append "m" to label + picture txtm; + txtm:=image( + draw txt; + interim labeloffset:=0; + label.urt(btex \thaltitude { m} etex, lrcorner txt); + #label.urt(btex \thheight m etex, lrcorner txt); + ); + % give extra offset in case of l/r/t/b alignment + pair ctmp; + ctmp:=center thelabel@#("x", (0,0)); + if (xpart ctmp * ypart ctmp)=0: + interim labeloffset:=(.4u); + else: % diagonal alignment + interim labeloffset:=(.2u); + fi; + % draw label + lab:=thelabel@#(txtm, pos); + draw lab _thop_; % use color + thdrawoptions(); + bboxmargin:=0.8bp; + write_circ_bbox((bbox lab) smoothed 2); + else: + if mode=7: interim labeloffset:=(u/8) fi; + lab:=thelabel@#(txt, pos); + if mode>1: pickup PenD fi; + if mode=2: process_uplabel; + elseif mode=3: process_downlabel; + elseif mode=4: process_updownlabel; + elseif mode=5: process_circledlabel; + elseif mode=6: process_boxedlabel; + elseif mode=7: process_label(pos,rot); % station name + elseif mode=8: process_filledlabel(pos, rot); + else: process_label(pos,rot); + fi; fi; - % draw label - lab:=thelabel@#(txtm, pos); - draw lab _thop_; % use color - thdrawoptions(); - bboxmargin:=0.8bp; - write_circ_bbox((bbox lab) smoothed 2); - else: - if mode=7: interim labeloffset:=(u/8) fi; - lab:=thelabel@#(txt, pos); - if mode>1: pickup PenD fi; - if mode=2: process_uplabel; - elseif mode=3: process_downlabel; - elseif mode=4: process_updownlabel; - elseif mode=5: process_circledlabel; - elseif mode=6: process_boxedlabel; - elseif mode=7: process_label(pos,rot); % station name - elseif mode=8: process_filledlabel(pos, rot); - else: process_label(pos,rot); fi; - fi; - enddef; + enddef; + ######################################################## # For point height with P or C prefixe # use “point 0 0 height -value [+10 m]” # or “point 0 0 height -value [-85 m]” @@ -1049,9 +1319,10 @@ layout drawingconfig # utiliser “point 0 0 height -value [+10 m]” # ou “point 0 0 height -value [-85 m]” # dans les données vous donner E10 ou P85 respectivement + ######################################################## verbatimtex \def\thheightpos{E}\def\thheightneg{P} etex - + ######################################################## # Change the altitude definition for the wall-line label (add units) # To modify the color, you need to modify the triplets after the 3 withcolor command. # BE CAREFUL ! Sometimes, it generates mpost errors when using point wall:altitude. @@ -1060,6 +1331,7 @@ layout drawingconfig # Pour modifier la couleur, modifier le triplet (RGB) après les 3 commandes withcolor. # ATTENTION ! Parfois, cette redéfinition génère des erreurs métapost. # Si c'est le cas, commenter toute la redéfinition du point p_wallaltitude. + ######################################################## #def p_wallaltitude (expr pprev,pos,pnext,txt) = # rot:=angle(unitvector(pnext-pos)+unitvector(pos-pprev)) - 90; @@ -1105,16 +1377,16 @@ layout drawingconfig #enddef; - + ######################################################## # Definition of new lines symbols # Définition de nouveau symboles de lignes - # Line symbol for strata for cross sections (u:strata). It works exactly as line section # symbol but you should use -clip off option: # Symbole de ligne pour dessiner des strates (u:strata). # Cela fonctionne exactement comme les autres sections de ligne # mais vous devrez rajouter l'option -clip off: + ######################################################## def l_u_strata (expr P) = T:=identity; path Q; Q = punked P; @@ -1147,10 +1419,11 @@ layout drawingconfig endfor; enddef; - + ######################################################## # Line symbol for Coupoles (u:coupole). It works exactly as line section # Symbole de ligne pour dessiner des coupoles de plafond. # Fonctionne comme les autres lignes + ######################################################## def l_u_coupole (expr P) = T:=identity; cas := 0; % cursor to step along path @@ -1169,12 +1442,13 @@ layout drawingconfig thdraw P; %continuous line enddef; - + ######################################################## # Line symbol for fault. # It works exactly as line section symbol but you should use -clip off option: # Symbole de ligne pour dessiner des failles (u:fault). # Cela fonctionne exactement comme les autres sections de ligne # mais vous devrez rajouter l'option -clip off: + ######################################################## def l_u_fault (expr P) = T:=identity; path Q; Q = punked P; @@ -1198,12 +1472,13 @@ layout drawingconfig endfor; enddef; - + ######################################################## # Line symbol for the surface. # It works exactly as line section symbol but you should use -clip off option: # Symbole de ligne pour dessiner la surface (u:surf). # Cela fonctionne exactement comme les autres sections de ligne # mais vous devrez rajouter l'option -clip off: + ######################################################## def l_u_surf (expr P) = T:=identity; path Q; Q = punked P; @@ -1211,11 +1486,12 @@ layout drawingconfig draw Q dashed evenly withcolor (0.5, 0, 0); enddef; - + ######################################################## # To add a doline line (u:doline); Do not forget the option -clip off ! # Symbole de ligne pour dessiner une ligne doline (u:doline). # Cela fonctionne exactement comme les autres sections de ligne # mais vous devrez rajouter l'option -clip off: + ######################################################## def l_u_doline (expr P) = T:=identity; laenge:= arclength P; @@ -1238,7 +1514,7 @@ layout drawingconfig endfor; enddef; - + ######################################################## # Modify length/depth statistics to print # Modifier l'aspect et les données des statistiques de longueur affichées si besoin #code tex-map @@ -1246,9 +1522,9 @@ layout drawingconfig # + 150\thinspace{}m estimes} # \cavedepth{243\thinspace{}m} - # Defines the gradient as geologic dip # Définit le gradient comme pendage géologique + ######################################################## def p_gradient_XA (expr P,R,S,A) = U:=(.15u, .4u); T:=identity aligned A rotated R scaled S shifted P; @@ -1259,9 +1535,10 @@ layout drawingconfig initsymbol ("p_gradient_XA"); symbol-assign point gradient XA - + ######################################################## # Section to define the bat symbol (point, line, area) # Section pour définir le symbole Chauve souris utilisé en point, ligne ou aire + ######################################################## path bat_path_x; bat_path_x := (160.43589,619.76148) .. controls (200.83034,598.56215) and (225.01974,599.82632) .. (242.33709,601.15842) @@ -1303,15 +1580,19 @@ layout drawingconfig path bat_path; bat_path = bat_path_x shifted (-(llcorner bat_path_bb) - (urcorner bat_path_bb - llcorner bat_path_bb) / 2.0) scaled (1u / ((xpart urcorner bat_path_bb) - (xpart llcorner bat_path_bb))) rotated 210; + ######################################################## # Section of your layout define point u:bats symbol like this # Pour définir le point chauve souris : u:bats + ######################################################## def p_u_bats(expr pos, theta, sc, al) = T := identity shifted pos; thfill (bat_path scaled 1.5) withcolor black; enddef; + ######################################################## # similarly the line u:bat symbol # Idem pour la ligne + ######################################################## def l_u_bats(expr P) = T:=identity; cas := 0; @@ -1326,8 +1607,10 @@ layout drawingconfig endfor; enddef; + ######################################################## # and finally the area u:bat symbol (pattern in this case) # Et pour l'aire + ######################################################## % bat pattern beginpattern(pattern_bat); fill bat_path withcolor black; @@ -1340,6 +1623,7 @@ layout drawingconfig thfill Path withpattern pattern_bat; enddef; + ######################################################## # These symbols will be included also in the legend. To # change the way how they are drawn there just define appropriate # macro. Its name should be symbol macro name with _legend @@ -1348,13 +1632,15 @@ layout drawingconfig # sont dessinés, juste, définissez la macro appropriée. # Son nom doit être le nom de la macro symbol approprié avec le suffixe # _legend. + ######################################################## def l_u_bats_legend = l_u_bats(((.2,.2) -- (.8,.8)) inscale) enddef; - + ######################################################## # Definition of a stalagmite boss symbol # Définition du point stalagmite boss + ######################################################## def p_u_boss (expr pos,theta,sc,al)= T:=identity aligned al rotated theta scaled sc shifted pos; pickup PenD; @@ -1374,9 +1660,10 @@ layout drawingconfig %thdraw p withcolor; enddef; - + ######################################################## # Definition of a shell limestone symbol # Définition du point coquille fossile + ######################################################## def p_u_shell (expr pos,theta,sc,al)= T:=identity shifted pos; pickup PenB; @@ -1394,9 +1681,10 @@ layout drawingconfig enddef; initsymbol ("p_u_shell"); - + ######################################################## # Define Danger symbol # Définition du point Danger + ######################################################## def p_u_danger (expr P,R,S,A)= T:=identity aligned A rotated R scaled S shifted P; thfill (0,-u)--(u,0)--(0,u)--(0,.9u)--(.9u,0)--(0,-.9u)--cycle; @@ -1404,21 +1692,24 @@ layout drawingconfig thfill (.1u,-.45u)..(0,-.35u)..(-.1u,-.45u)..(0,-.55u)..cycle; thfill (0,-.2u)..(.1u,-.1u)--(.2u,.4u)..(0,.6u)..(-.2u,.4u)--(-.1u,-.1u)..cycle; enddef; + #initsymbol("p_entrance_MY"); #let p_entrance = p_entrance_MY; - + ######################################################## # Define dive line (u:ariane) in thin red # Définition de la ligne file d'Ariane en rouge fin + ######################################################## def l_u_ariane (expr Path) = T:=identity; pickup PenD; draw Path withcolor (100, 0, 0); enddef; - + ######################################################## # Definition of plankwalk # Définition d'une ligne de main courante + ######################################################## def l_u_plankwalk (expr P) = T:=identity; # by Dave Clucas cas := 0; @@ -1437,9 +1728,10 @@ layout drawingconfig %draw path withcolor (0.5, 0 ,0) enddef; - + ######################################################## # Definition of a line rail # Définition d'une ligne rail + ######################################################## def l_u_rail (expr P) = # by Andrew Aktinson T:=identity; @@ -1465,9 +1757,10 @@ layout drawingconfig endfor; enddef; - + ######################################################## # Change fig Flowstone, increase the number of arcs # Modifier le symbole flowstone en augmentant le nombr d'arc + ######################################################## def l_flowstone (expr p) = #draw p withpen PenC withcolor (0.0, 0.5, 1.0); T:=identity; @@ -1487,9 +1780,10 @@ layout drawingconfig endfor; enddef; - + ######################################################## # Point that represent a bird nest # Point pour représenter un nid d'oiseau + ######################################################## def p_u_nid (expr pos,theta,sc,al)= U:=(.4u,.2u); T:=identity aligned al rotated theta scaled sc shifted pos; @@ -1498,18 +1792,21 @@ layout drawingconfig thdraw (-.2u,.1u){dir -70}..{dir 70}(.2u,.1u) withcolor (0.53, 0.26, 0.11); enddef; - + ######################################################## # Artificial anchor point (From a post by Evaristo Quiroga) # Point ancrage artificiel (From a post by Evaristo Quiroga) + ######################################################## def p_u_anchor_artificial(expr pos,theta,sc,al) = T:=identity shifted pos; thdraw origin withpen pencircle scaled 0.25u withcolor (0.58, 0.44, 0.25); enddef; + initsymbol ("p_u_anchor_artificial"); - + ######################################################## # Natural anchor point (From a post by Evaristo Quiroga) # Point ancrage naturel (From a post by Evaristo Quiroga) + ######################################################## def p_u_anchor_natural(expr pos,theta,sc,al) = U:=(.2u,.2u); T:=identity aligned al rotated theta scaled sc shifted pos; @@ -1517,32 +1814,36 @@ layout drawingconfig enddef; initsymbol ("p_u_anchor_natural"); - + ######################################################## # Deviation line (by Tarquin 2019) # Ligne pour dessiner une déviation (D'après Tarquin 2019) + ######################################################## def l_u_deviation (expr P) = begingroup; - save ellipse; - T:=identity; - pickup PenC; - path ellipse; - ellipse:=fullcircle xscaled (.5u) yscaled (.25u) shifted (point (length P) of P); - thdraw P cutafter ellipse; - draw ellipse; - endgroup; + save ellipse; + T:=identity; + pickup PenC; + path ellipse; + ellipse:=fullcircle xscaled (.5u) yscaled (.25u) shifted (point (length P) of P); + thdraw P cutafter ellipse; + draw ellipse; + endgroup; enddef; + initsymbol("l_u_deviation"); def l_u_deviation_legend = l_u_deviation(((.1,.5)--(.8,.5)) inscale); enddef; - + ######################################################## # Climbing caver point (by Juraj Halama, 2020) # Climbing one has center where the rope should go on the harness... # Point pour dessiner un spéléo qui grimpe ou escalade (D'après Juraj Halama, 2020) # Le point correspond au centre du spéléo au niveau du harnais, qui doit donc être sur la corde + ######################################################## picture u_man_c_pic; + u_man_c_pic := image ( draw (0cm, -0cm) -- (-8cm, 27cm) -- (-36cm, 55cm) -- (-50cm, 99cm) withpen pencircle scaled 16cm; draw (27cm, 48cm) -- (0, 64cm) -- (-29cm, 61cm) -- (-38cm, 102cm) withpen pencircle scaled 16cm; @@ -1555,20 +1856,25 @@ layout drawingconfig T:=identity aligned A rotated R scaled S shifted P; thdraw u_man_c_pic scaled (0.01 / Scale); enddef; + initsymbol ("p_u_man_c"); + ######################################################## # The scale on the map and in the legend is matching just for 1:500... # L'échelle sur la carte et sur la légende correspond au 1:500... + ######################################################## def p_u_man_c_legend = draw u_man_c_pic scaled (u / 175cm) shifted ((.5, .5) inscale); enddef; - + ######################################################## # Walking caver point (by Juraj Halama, 2020) # Use "-align top" for proper alignment of the walking man when his point is on the groung. # Point pour dessiner un spéléo marchant (D'après Juraj Halama, 2020) # Utiliser l'option "-align top" pour un alignement correct quand le point est au sol + ######################################################## picture u_man_w_pic; + u_man_w_pic := image ( draw (0, 0) -- (7.5cm, 36cm) -- (0cm, 69cm) -- (9cm, 99cm) withpen pencircle scaled 16cm; draw (42cm, 9cm) -- (37.5cm, 42cm) -- (13.5cm, 69cm) -- (30cm, 102cm) withpen pencircle scaled 16cm; @@ -1582,17 +1888,21 @@ layout drawingconfig T:=identity aligned A rotated R scaled S shifted P; thdraw u_man_w_pic scaled (0.01 / Scale); enddef; + initsymbol ("p_u_man_w"); + ######################################################## # The scale on the map and in the legend is matching just for 1:500... # L'échelle sur la carte et sur la légende correspond au 1:500... + ######################################################## def p_u_man_w_legend = draw u_man_w_pic scaled (u / 175cm) shifted ((.5, .5) inscale); enddef; - + ######################################################## # Plan view symbol point (by Juraj Halama, 2020) # Point dessinant un symbole de "vue en plan" (D'après Juraj Halama, 2020) + ######################################################## def p_u_symbol_plan (expr pos,theta,sc,al) = U := (-3.25u, 3.25u); T := identity aligned al rotated theta scaled sc shifted pos; @@ -1606,9 +1916,10 @@ layout drawingconfig thdraw (0u, 0u) -- (0u, 2.31u) withcolor .5green; enddef; - + ######################################################## # Extended view symbol point (by Juraj Halama, 2020) # Point dessinant un symbole de "vue en coupe développée" (D'après Juraj Halama, 2020) + ######################################################## def p_u_symbol_extend (expr pos,theta,sc,al) = U := (-2.5u, 2.5u); T := identity aligned al rotated theta scaled sc shifted pos; @@ -1628,16 +1939,18 @@ layout drawingconfig thdraw (0u, 0u) -- (2.31u, 0u) withcolor .5green; enddef; - + ######################################################## # Change rope line color # Changer la couleur de la ligne rope (corde) + ######################################################## #symbol-colour line rope [58 44 25] - + ######################################################## # Area for galerie initiation # You will probably need to adapt the color to match the color of your galeries # Aire pour matérialiser le départ d'une galerie # A adapter en fonction de la couleur de vos galeries + ######################################################## def a_u_galerie(expr P) = T:=identity; ## jaune chamois (208, 192, 122) @@ -1657,20 +1970,22 @@ layout drawingconfig #thfill P withcolor (0.937,0;937,0.937) withalpha 0.5; enddef; - + ######################################################## # Make unsurveyed wall lines more light-weight and dashed # Rendre les parois non topographiées plus légères et en pointillés #Bruce Mutton 2010.06.20 for Therion 5.3.9 + ######################################################## def l_wall_unsurveyed (expr P) = T:=identity; - pickup PenC; - thdraw P dashed evenly scaled (0.5*optical_zoom); + pickup PenA; + thdraw P dashed evenly scaled (0.35*optical_zoom); enddef; - + ######################################################## # thin grey cave splays, yellow duplicates and dashed approximate legs # Pour modifier la couleur du squelette en fonction du type de visées # (splays, normal, duplicates, approximate...) + ######################################################## def l_survey_cave (expr P) = % always draws full centreline, rather than short stubs like default cave centrelines T:=identity; @@ -1693,8 +2008,7 @@ layout drawingconfig enddef; endcode - # Endcode for all the definition - + code tex-map \newtoks\thversiontitleB \thversiontitleB={Therion } @@ -1785,7 +2099,7 @@ endlayout layout scalebar_vert-Halama # Layout to define a vertical Scale bar (see Therion Wiki - Juraj Halama) - # distributed under the GNU General Public Licence + # distributed under the GNU General Public License # You need to place it with in your thconfig file: # code tex-map # \def\maplayout{ @@ -1793,7 +2107,7 @@ layout scalebar_vert-Halama # {\scalebar}} # endcode # Layout pour définir une barre d'échelle verticale (voir le wiki Therion - Jural Halama) - # distribué sous la licence GNU General Public Licence + # distribué sous la License GNU General Public License # Il faut l'appeler dans le fichier de configuration thconfig avec le bloc: # code tex-map # \def\maplayout{ @@ -1913,137 +2227,435 @@ layout headerl # This one affects maps only # Ceci ne touche que les maps (plans) code tex-map - - \def\loadpicture#1{\pdfximage{#1}\pdfrefximage\pdflastximage} - + \def\loadpicture #1{\pdfximage{#1}\pdfrefximage\pdflastximage} \legendcontent={% - \hsize=\legendwidth - \color[0 0 0]\the\legendtextcolor - \ifnortharrow\vbox to 0pt{\line{\hfil\northarrow}\vss}\fi - %print cave map name - \edef\tmp{\the\cavename} \ifx\tmp\empty \else - {\the\legendtextheadersize\the\cavename}\vskip0.5cm - \fi - %print comment - {\rightskip=0pt plus 3em\parskip=3bp - \edef\tmp{\the\comment} \ifx\tmp\empty \else - {\the\legendtextsize\the\comment} \par\medskip\vskip1cm - \fi} - %print scalebar - \ifscalebar\scalebar\vskip1cm\fi - %print entrances coordinates (Lat-Long/WGS84) if defined - \edef\tmp{\the\ECoordinates} \ifx\tmp\empty \else - {\the\legendtextsize\si\the\thcoords \the\ECoordinates\par} - \vskip0.5cm - \fi - - % start bruces addition - # % CS - \edef\tmp{\the\outcsname} \ifx\tmp\empty \else - %{\the\legendtextsize\si\the\thproj: \ss\the\outcsname\par} - %\fi - %\edef\tmp{\the\northdir} \ifx\tmp\empty \else - %{\the\legendtextsize\ss\the\northdir north } - %\fi - %\edef\tmp{\the\magdecl} \ifx\tmp\empty \else - %{\the\legendtextsize\ss\the\magdecl { deg.} \par} - %\fi - \vskip0.5cm - % end bruces addition - #%print comment - { - #\rightskip=0pt plus 3em\parskip=3bp - #\edef\tmp{\the\comment} \ifx\tmp\empty \else - # {\the\legendtextsize\the\comment} \par\medskip - #\fi - %print cavelength and depth - \everypar{\hangindent=2em\hangafter=1} - \edef\tmp{\the\cavelength} \ifx\tmp\empty \else - {\the\legendtextsize\si\the\cavelengthtitle: \ss\the\cavelength\par} - \fi - \edef\tmp{\the\cavedepth} \ifx\tmp\empty \else - {\the\legendtextsize\si\the\cavedepthtitle: \ss\the\cavedepth\par} - \fi - # % start bruces addition - ## % altitude - #\edef\tmp{\the\cavemaxz} \ifx\tmp\empty \else - # {\the\legendtextsize\si\the\depthrangetitle \ss\the\cavemaxz m to} - #\fi - #\edef\tmp{\the\caveminz} \ifx\tmp\empty \else - # {\the\legendtextsize\ss\the\caveminz m \par} %above mean sea level - #\fi - # % end bruces addition - - %print explorers names - \edef\tmp{\the\exploteam} \ifx\tmp\empty \else - {\the\legendtextsize\si\the\explotitle: \ss\the\exploteam\quad\si\the\explodate\par} - \fi - %print surveyors names - \edef\tmp{\the\topoteam} \ifx\tmp\empty \else - {\the\legendtextsize\si\the\topotitle: \ss\the\topoteam\quad\si\the\topodate\par} - \fi - %%print the guides - \edef\tmp{\the\guide} \ifx\tmp\empty \else - {\the\legendtextsize\si\the\thguide: \ss\the\guide\par} - \fi - %print cartographers names - \edef\tmp{\the\cartoteam} \ifx\tmp\empty \else - {\the\legendtextsize\si\the\cartotitle: \ss\the\cartoteam\quad\si\the\cartodate\par} - \fi - %print synthesys name !!! !!! with newtoks\synth \synth={Synth Name} in the thconfig - \edef\tmp{\the\synth} \ifx\tmp\empty \else - {\the\legendtextsize\si\the\thsynth: \ss\the\synth\par} - \fi - %print the club - \edef\tmp{\the\club} \ifx\tmp\empty \else - {\the\legendtextsize\si\the\thclub: \ss\the\club\par} - \fi - %%print the expedition - \edef\tmp{\the\expe} \ifx\tmp\empty \else - {\the\legendtextsize\si\the\thexpe: \ss\the\expe\par} - \fi - %%print the web page - \edef\tmp{\the\wpage} \ifx\tmp\empty \else - {\the\legendtextsize\si\the\thwpage: \ss\the\wpage\par} - \fi - %%print the survey's data web page - \edef\tmp{\the\datat} \ifx\tmp\empty \else - {\the\legendtextsize\si\the\thdatat: \ss\the\datat\par} - \fi - # % start bruces addition (compilation version and date modified to use built-in 5.3.15 variables) - \edef\tmp{\the\thversion} \ifx\tmp\empty \else %only write version and date if version is not emplty - {\the\legendtextsize\si\the\thversiontitleA: \ss\the\thversiontitleB \ss\the\thversion} - % \fi - % \edef\tmp{\the\currentdate} \ifx\tmp\empty \else - {\the\legendtextsize\si\the\datetitle \ss\the\currentdate\par} - \fi - - # % end bruces addition - %print copyrights - \edef\tmp{\the\copyrights} \ifx\tmp\empty \else - {\the\legendtextsize\ss\the\copyrights\par} - \fi - - \edef\tmp{\the\thanksto} \ifx\tmp\empty \else - \bigskip - {\the\legendtextsize\si\the\ththanksto: \ss\the\thanksto\par} - %\def\ththankstotitle{Nos remerciements : } - %{\everypar{\hangindent=7.2em\hangafter=1} - %\size[\thsizem]\si\ththankstotitle \ss\ththanksto\par} - \fi + \hsize=\legendwidth + \color[0 0 0]\the\legendtextcolor + \ifnortharrow\vbox to 0pt{\line{\hfil\northarrow}\vss}\fi +# %print cave map name + \edef\tmp{\the\cavename} \ifx\tmp\empty \else + {\the\legendtextheadersize\the\cavename}\vskip0.5cm + \fi +# %print comment + {\rightskip=0pt plus 3em\parskip=3bp + \edef\tmp{\the\comment} \ifx\tmp\empty \else + {\the\legendtextsize\the\comment} \par\medskip\vskip1cm + \fi} +# %print scalebar + \ifscalebar\scalebar\vskip1cm\fi + %print entrances coordinates (Lat-Long/WGS84) if defined + \edef\tmp{\the\ECoordinates} \ifx\tmp\empty \else + {\the\legendtextsize\si\the\thcoords \the\ECoordinates\par} + \vskip0.5cm + \fi + +# % start bruces addition +# % CS + \edef\tmp{\the\outcsname} \ifx\tmp\empty \else + %{\the\legendtextsize\si\the\thproj: \ss\the\outcsname\par} + %\fi + %\edef\tmp{\the\northdir} \ifx\tmp\empty \else + %{\the\legendtextsize\ss\the\northdir north } + %\fi + %\edef\tmp{\the\magdecl} \ifx\tmp\empty \else + %{\the\legendtextsize\ss\the\magdecl { deg.} \par} + %\fi + \vskip0.5cm +# % end bruces addition +#%print comment + { + #\rightskip=0pt plus 3em\parskip=3bp + #\edef\tmp{\the\comment} \ifx\tmp\empty \else + # {\the\legendtextsize\the\comment} \par\medskip + #\fi +# %print cavelength and depth + \everypar{\hangindent=2em\hangafter=1} + \edef\tmp{\the\cavelength} \ifx\tmp\empty \else + {\the\legendtextsize\si\the\cavelengthtitle: \ss\the\cavelength\par} + \fi + \edef\tmp{\the\cavedepth} \ifx\tmp\empty \else + {\the\legendtextsize\si\the\cavedepthtitle: \ss\the\cavedepth\par} + \fi +# % start bruces addition +## % altitude + #\edef\tmp{\the\cavemaxz} \ifx\tmp\empty \else + # {\the\legendtextsize\si\the\depthrangetitle \ss\the\cavemaxz m to} + #\fi + #\edef\tmp{\the\caveminz} \ifx\tmp\empty \else + # {\the\legendtextsize\ss\the\caveminz m \par} %above mean sea level + #\fi +# % end bruces addition + +# %print explorers names + \edef\tmp{\the\exploteam} \ifx\tmp\empty \else + {\the\legendtextsize\si\the\explotitle: \ss\the\exploteam\quad\si\the\explodate\par} + \fi + +# %print surveyors names + \edef\tmp{\the\topoteam} \ifx\tmp\empty \else + {\the\legendtextsize\si\the\topotitle: \ss\the\topoteam\quad\si\the\topodate\par} + \fi + +# %%print the guides + \edef\tmp{\the\guide} \ifx\tmp\empty \else + {\the\legendtextsize\si\the\thguide: \ss\the\guide\par} + \fi +# %print cartographers names + \edef\tmp{\the\cartoteam} \ifx\tmp\empty \else + {\the\legendtextsize\si\the\cartotitle: \ss\the\cartoteam\quad\si\the\cartodate\par} + \fi + +# %print the club + \edef\tmp{\the\club} \ifx\tmp\empty \else + {\the\legendtextsize\si\the\thclub: \ss\the\club\par} + \fi +# %%print the expedition + \edef\tmp{\the\expe} \ifx\tmp\empty \else + {\the\legendtextsize\si\the\thexpe: \ss\the\expe\par} + \fi +# %%print the web page + \edef\tmp{\the\wpage} \ifx\tmp\empty \else + {\the\legendtextsize\si\the\thwpage: \ss\the\wpage\par} + \fi +# %%print the survey's data web page + \edef\tmp{\the\datat} \ifx\tmp\empty \else + {\the\legendtextsize\si\the\thdatat: \ss\the\datat\par} + \fi +# %%print the survey's database web page + \edef\tmp{\the\database} \ifx\tmp\empty \else + {\the\legendtextsize\si\the\thdatabase: \ss\the\database\par} + \fi +# % start bruces addition (compilation version and date modified to use built-in 5.3.15 variables) + \edef\tmp{\the\thversion} \ifx\tmp\empty \else %only write version and date if version is not emplty + {\the\legendtextsize\si\the\thversiontitleA: \ss\the\thversiontitleB \ss\the\thversion} + % \fi + % \edef\tmp{\the\currentdate} \ifx\tmp\empty \else + {\the\legendtextsize\si\the\datetitle \ss\the\currentdate\par} + \fi +# % end bruces addition +# %print copyrights + \edef\tmp{\the\copyrights} \ifx\tmp\empty \else + {\the\legendtextsize\ss\the\copyrights\par} + \fi + \edef\tmp{\the\thanksto} \ifx\tmp\empty \else + \bigskip + {\the\legendtextsize\si\the\ththanksto: \ss\the\thanksto\par} + %\def\ththankstotitle{Nos remerciements : } + %{\everypar{\hangindent=7.2em\hangafter=1} + %\size[\thsizem]\si\ththankstotitle \ss\ththanksto\par} + \fi + } +# %print synthesys name !!! !!! with newtoks\synth \synth={Synth Name} in the thconfig + \vskip0.3cm + \edef\tmp{\the\synth} \ifx\tmp\empty \else + {\the\legendtextsize\si\the\thsynth: \ss\the\synth\par} + \fi + \formattedlegend + \color[0 0 0] } - \formattedlegend - \color[0 0 0] - } - % Add Logos - # \def\loadpicture#1{\pdfximage{#1}\pdfrefximage\pdflastximage} - # \def\maplayout{ - # \legendbox{0}{100}{NE}{\the\legendcontent} - # \legendbox{100}{100}{NW}{\loadpicture{D:/Logo-ARSIP-Synthese-Topo.jpg}} %%% pdf, png, jpg supported - # } +# % Add Logos + #\legendbox{50}{60}{NW}{\loadpicture{Logos/Logo_FFS_small.jpg}} + endcode + endlayout +###################################################################################################################################### +layout headerl_LT + # Layout to change the header (plan projection) + # This code is experimental redefinition of map header and based on the work of + # Bruce Mutton Therion 5.3.15 make use of new variables + # Layout pour modifier le cartouche (header) de la projection en plan + # Ce code de redéfinition est expérimental experimental et basé sur le travail de + # Bruce Mutton Therion 5.3.15 fait appel à de nouvelles variables + + # header without surveyors names + + copy scalebar_horiz + + # This one affects maps only + # Ceci ne touche que les maps (plans) + code tex-map + \def\loadpicture #1{\pdfximage{#1}\pdfrefximage\pdflastximage} + \legendcontent={% + \hsize=\legendwidth + \color[0 0 0]\the\legendtextcolor + \ifnortharrow\vbox to 0pt{\line{\hfil\northarrow}\vss}\fi +# %print cave map name + \edef\tmp{\the\cavename} \ifx\tmp\empty \else + {\the\legendtextheadersize\the\cavename}\vskip0.5cm + \fi +# %print comment + {\rightskip=0pt plus 3em\parskip=3bp + \edef\tmp{\the\comment} \ifx\tmp\empty \else + {\the\legendtextsize\the\comment} \par\medskip\vskip1cm + \fi} +# %print scalebar + \ifscalebar\scalebar\vskip1cm\fi + %print entrances coordinates (Lat-Long/WGS84) if defined + \edef\tmp{\the\ECoordinates} \ifx\tmp\empty \else + {\the\legendtextsize\si\the\thcoords \the\ECoordinates\par} + \vskip0.5cm + \fi + +# % start bruces addition +# % CS + \edef\tmp{\the\outcsname} \ifx\tmp\empty \else + %{\the\legendtextsize\si\the\thproj: \ss\the\outcsname\par} + %\fi + %\edef\tmp{\the\northdir} \ifx\tmp\empty \else + %{\the\legendtextsize\ss\the\northdir north } + %\fi + %\edef\tmp{\the\magdecl} \ifx\tmp\empty \else + %{\the\legendtextsize\ss\the\magdecl { deg.} \par} + %\fi + \vskip0.5cm +# % end bruces addition +#%print comment + { + #\rightskip=0pt plus 3em\parskip=3bp + #\edef\tmp{\the\comment} \ifx\tmp\empty \else + # {\the\legendtextsize\the\comment} \par\medskip + #\fi +# %print cavelength and depth + \everypar{\hangindent=2em\hangafter=1} + \edef\tmp{\the\cavelength} \ifx\tmp\empty \else + {\the\legendtextsize\si\the\cavelengthtitle: \ss\the\cavelength\par} + \fi + \edef\tmp{\the\cavedepth} \ifx\tmp\empty \else + {\the\legendtextsize\si\the\cavedepthtitle: \ss\the\cavedepth\par} + \fi +# % start bruces addition +## % altitude + #\edef\tmp{\the\cavemaxz} \ifx\tmp\empty \else + # {\the\legendtextsize\si\the\depthrangetitle \ss\the\cavemaxz m to} + #\fi + #\edef\tmp{\the\caveminz} \ifx\tmp\empty \else + # {\the\legendtextsize\ss\the\caveminz m \par} %above mean sea level + #\fi +# % end bruces addition + +# %print explorers names + \edef\tmp{\the\exploteam} \ifx\tmp\empty \else + {\the\legendtextsize\si\the\explotitle: \ss\the\exploteam\quad\si\the\explodate\par} + \fi + +# %print surveyors names + # \edef\tmp{\the\topoteam} \ifx\tmp\empty \else + # {\the\legendtextsize\si\the\topotitle: \ss\the\topoteam\quad\si\the\topodate\par} + # \fi + +# %%print the guides + \edef\tmp{\the\guide} \ifx\tmp\empty \else + {\the\legendtextsize\si\the\thguide: \ss\the\guide\par} + \fi +# %print cartographers names + \edef\tmp{\the\cartoteam} \ifx\tmp\empty \else + {\the\legendtextsize\si\the\cartotitle: \ss\the\cartoteam\quad\si\the\cartodate\par} + \fi + +# %print the club + \edef\tmp{\the\club} \ifx\tmp\empty \else + {\the\legendtextsize\si\the\thclub: \ss\the\club\par} + \fi +# %%print the expedition + \edef\tmp{\the\expe} \ifx\tmp\empty \else + {\the\legendtextsize\si\the\thexpe: \ss\the\expe\par} + \fi +# %%print the web page + \edef\tmp{\the\wpage} \ifx\tmp\empty \else + {\the\legendtextsize\si\the\thwpage: \ss\the\wpage\par} + \fi +# %%print the survey's data web page + \edef\tmp{\the\datat} \ifx\tmp\empty \else + {\the\legendtextsize\si\the\thdatat: \ss\the\datat\par} + \fi +# %%print the survey's database web page + \edef\tmp{\the\database} \ifx\tmp\empty \else + {\the\legendtextsize\si\the\thdatabase: \ss\the\database\par} + \fi +# % start bruces addition (compilation version and date modified to use built-in 5.3.15 variables) + \edef\tmp{\the\thversion} \ifx\tmp\empty \else %only write version and date if version is not emplty + {\the\legendtextsize\si\the\thversiontitleA: \ss\the\thversiontitleB \ss\the\thversion} + % \fi + % \edef\tmp{\the\currentdate} \ifx\tmp\empty \else + {\the\legendtextsize\si\the\datetitle \ss\the\currentdate\par} + \fi +# % end bruces addition +# %print copyrights + \edef\tmp{\the\copyrights} \ifx\tmp\empty \else + {\the\legendtextsize\ss\the\copyrights\par} + \fi + \edef\tmp{\the\thanksto} \ifx\tmp\empty \else + \bigskip + {\the\legendtextsize\si\the\ththanksto: \ss\the\thanksto\par} + %\def\ththankstotitle{Nos remerciements : } + %{\everypar{\hangindent=7.2em\hangafter=1} + %\size[\thsizem]\si\ththankstotitle \ss\ththanksto\par} + \fi + } +# %print synthesys name !!! !!! with newtoks\synth \synth={Synth Name} in the thconfig + \vskip0.3cm + \edef\tmp{\the\synth} \ifx\tmp\empty \else + {\the\legendtextsize\si\the\thsynth: \ss\the\synth\par} + \fi + \formattedlegend + \color[0 0 0] + } +# % Add Logos + #\legendbox{50}{60}{NW}{\loadpicture{Logos/Logo_FFS_small.jpg}} + + endcode + +endlayout + + + +###################################################################################################################################### +layout headerl_XXLT + # Layout to change the header (plan projection with minimun info) + + # Layout pour modifier le cartouche (header) de la projection en plan avec le minimund info + + + copy scalebar_horiz + + # This one affects maps only + # Ceci ne touche que les maps (plans) + code tex-map + \def\loadpicture #1{\pdfximage{#1}\pdfrefximage\pdflastximage} + \legendcontent={% + \hsize=\legendwidth + \color[0 0 0]\the\legendtextcolor + \ifnortharrow\vbox to 0pt{\line{\hfil\northarrow}\vss}\fi +# %print cave map name + \edef\tmp{\the\cavename} \ifx\tmp\empty \else + {\the\legendtextheadersize\the\cavename}\vskip0.5cm + \fi +# %print comment + {\rightskip=0pt plus 3em\parskip=3bp + \edef\tmp{\the\comment} \ifx\tmp\empty \else + {\the\legendtextsize\the\comment} \par\medskip\vskip1cm + \fi} +# %print scalebar + \ifscalebar\scalebar\vskip1cm\fi + %print entrances coordinates (Lat-Long/WGS84) if defined + \edef\tmp{\the\ECoordinates} \ifx\tmp\empty \else + {\the\legendtextsize\si\the\thcoords \the\ECoordinates\par} + \vskip0.5cm + \fi + +# % start bruces addition +# % CS + \edef\tmp{\the\outcsname} \ifx\tmp\empty \else + %{\the\legendtextsize\si\the\thproj: \ss\the\outcsname\par} + %\fi + %\edef\tmp{\the\northdir} \ifx\tmp\empty \else + %{\the\legendtextsize\ss\the\northdir north } + %\fi + %\edef\tmp{\the\magdecl} \ifx\tmp\empty \else + %{\the\legendtextsize\ss\the\magdecl { deg.} \par} + %\fi + \vskip0.5cm +# % end bruces addition +#%print comment + { + #\rightskip=0pt plus 3em\parskip=3bp + #\edef\tmp{\the\comment} \ifx\tmp\empty \else + # {\the\legendtextsize\the\comment} \par\medskip + #\fi +# %print cavelength and depth + # \everypar{\hangindent=2em\hangafter=1} + # \edef\tmp{\the\cavelength} \ifx\tmp\empty \else + # {\the\legendtextsize\si\the\cavelengthtitle: \ss\the\cavelength\par} + # \fi + # \edef\tmp{\the\cavedepth} \ifx\tmp\empty \else + # {\the\legendtextsize\si\the\cavedepthtitle: \ss\the\cavedepth\par} + # \fi +# % start bruces addition +## % altitude + #\edef\tmp{\the\cavemaxz} \ifx\tmp\empty \else + # {\the\legendtextsize\si\the\depthrangetitle \ss\the\cavemaxz m to} + #\fi + #\edef\tmp{\the\caveminz} \ifx\tmp\empty \else + # {\the\legendtextsize\ss\the\caveminz m \par} %above mean sea level + #\fi +# % end bruces addition + +# %print explorers names + # \edef\tmp{\the\exploteam} \ifx\tmp\empty \else + # {\the\legendtextsize\si\the\explotitle: \ss\the\exploteam\quad\si\the\explodate\par} + # \fi + +# %print surveyors names + # \edef\tmp{\the\topoteam} \ifx\tmp\empty \else + # {\the\legendtextsize\si\the\topotitle: \ss\the\topoteam\quad\si\the\topodate\par} + # \fi + +# %%print the guides + \edef\tmp{\the\guide} \ifx\tmp\empty \else + {\the\legendtextsize\si\the\thguide: \ss\the\guide\par} + \fi +# %print cartographers names + # \edef\tmp{\the\cartoteam} \ifx\tmp\empty \else + # {\the\legendtextsize\si\the\cartotitle: \ss\the\cartoteam\quad\si\the\cartodate\par} + # \fi + +# %print the club + \edef\tmp{\the\club} \ifx\tmp\empty \else + {\the\legendtextsize\si\the\thclub: \ss\the\club\par} + \fi +# %%print the expedition + \edef\tmp{\the\expe} \ifx\tmp\empty \else + {\the\legendtextsize\si\the\thexpe: \ss\the\expe\par} + \fi +# %%print the web page + \edef\tmp{\the\wpage} \ifx\tmp\empty \else + {\the\legendtextsize\si\the\thwpage: \ss\the\wpage\par} + \fi +# %%print the survey's data web page + \edef\tmp{\the\datat} \ifx\tmp\empty \else + {\the\legendtextsize\si\the\thdatat: \ss\the\datat\par} + \fi +# %%print the survey's database web page + \edef\tmp{\the\database} \ifx\tmp\empty \else + {\the\legendtextsize\si\the\thdatabase: \ss\the\database\par} + \fi +# % start bruces addition (compilation version and date modified to use built-in 5.3.15 variables) + # \edef\tmp{\the\thversion} \ifx\tmp\empty \else %only write version and date if version is not emplty + # {\the\legendtextsize\si\the\thversiontitleA: \ss\the\thversiontitleB \ss\the\thversion} + # % \fi + # % \edef\tmp{\the\currentdate} \ifx\tmp\empty \else + # {\the\legendtextsize\si\the\datetitle \ss\the\currentdate\par} + # \fi +# % end bruces addition +# %print copyrights + \edef\tmp{\the\copyrights} \ifx\tmp\empty \else + {\the\legendtextsize\ss\the\copyrights\par} + \fi + \edef\tmp{\the\thanksto} \ifx\tmp\empty \else + \bigskip + {\the\legendtextsize\si\the\ththanksto: \ss\the\thanksto\par} + %\def\ththankstotitle{Nos remerciements : } + %{\everypar{\hangindent=7.2em\hangafter=1} + %\size[\thsizem]\si\ththankstotitle \ss\ththanksto\par} + \fi + } +# %print synthesys name !!! !!! with newtoks\synth \synth={Synth Name} in the thconfig + \vskip0.3cm + \edef\tmp{\the\synth} \ifx\tmp\empty \else + {\the\legendtextsize\si\the\thsynth: \ss\the\synth\par} + \fi + \formattedlegend + \color[0 0 0] + } +# % Add Logos + #\legendbox{50}{60}{NW}{\loadpicture{Logos/Logo_FFS_small.jpg}} + + endcode + +endlayout + ###################################################################################################################################### layout header_coupe_vert-to-place @@ -2990,12 +3602,12 @@ layout northarrowMG endlayout - ####################################################################################################################################### - layout test +####################################################################################################################################### +layout test # A test layout to test you new symbols, configurations,... ;-) # Un layout de test pour tester vos nouveaux symboles, configurations,... ;-) - code metapost + code metapost def p_u_prof (expr P,R,S,A)= T:=identity aligned A rotated R scaled S shifted P; @@ -3055,9 +3667,9 @@ endlayout fi; enddef; - endcode + endcode - endlayout +endlayout ###################################################################################################################################### @@ -3134,7 +3746,7 @@ layout fonts_2000 code metapost #fonts_setup(,,,,); - fonts_setup(1,1,1,28,32); + fonts_setup(6, 8, 12, 16, 18); endcode endlayout @@ -3147,7 +3759,7 @@ layout fonts_1000 code metapost #fonts_setup(,,,,); - fonts_setup(8,14,18,20,25); + fonts_setup(10, 14, 20, 28, 32); endcode endlayout @@ -3159,7 +3771,7 @@ layout fonts_500 code metapost #fonts_setup(,,,,); - fonts_setup(6,10,12,14,18); + fonts_setup(6, 10, 12, 14, 18); endcode endlayout @@ -3185,22 +3797,3 @@ layout Survey_No_Scrap endlayout ###################################################################################################################################### -# NOK for test -layout logo_ARSIP - # If you want to change font size - # Si vous voulez changer la police - - code metapost - beginfig(1); - % Charger le logo - drawimage "Logo-ARSIP-Synthese-Topo.jpg" scaled 1 shifted (10, 10); - - % Exemple de dessin (ajouter vos éléments topographiques ici) - draw (0,0)--(100,0)--(100,100)--(0,100)--cycle withcolor .7white; - - % Ajouter une légende ou d'autres détails - label("Topographie avec logo", (50, 110)) withcolor black; - endfig; - endcode - -endlayout \ No newline at end of file diff --git a/Scripts/pyCreateTh/Template/template.thconfig b/Scripts/pyCreateTh/Template/template.thconfig index fcd07f6..0b87890 100644 --- a/Scripts/pyCreateTh/Template/template.thconfig +++ b/Scripts/pyCreateTh/Template/template.thconfig @@ -27,7 +27,7 @@ encoding utf-8 ############################################################################################### ## La ligne source spécifie le fichier ou sont les donnees topo ## jb.th". (Au fichier "jb.th" il faudra avoir une ligne -## "input "nomducavite.th2" pour specifier le fichier ou se trouvent +## "input "nomcavite.th2" pour spécifier le fichier ou se trouvent ## les donnees du dessin, comme ça, ce fichier thconfig appellera ## "jb.th" et a leur tour, "jb.th" appellera ## "jb-dessin.th2") @@ -44,7 +44,9 @@ input {configPath}config.thc ## Ici, on peut specifier des choses comme les symboles à utiliser (UIS, etc) ## ou imprimer des explications des symboles +############################################################################################### ## Début de la définition du layout "Layout-Plan" +############################################################################################### layout layout-Plan ## Call the config settings (Layout config inside the config.thc file) copy fonts_1000 @@ -158,24 +160,24 @@ layout layout-Plan overlap 2 cm code tex-map - \legendwidth=15cm - \legendtextsize={\size[12]} - \legendtextheadersize={\size[28]} %%% Taille du titre - \legendtextsectionsize={\size[14]} %%% Taille du titre - %\legendtextcolor={\color[0 0 110]} %# RGB values 0--100 + \legendwidth=15cm %%% Largeur cartouche + \legendtextsize={\size[12]} %%% Police principale + \legendtextheadersize={\size[28]} %%% Taille du titre + \legendtextsectionsize={\size[14]} %%% Taille des sous titres + %\legendtextcolor={\color[0 0 110]} %%% RGB values 0--100 % Output map title as determined by Therion is stored in caveName, défini par la une Map. % It will be empty if there are multiple maps selected for any one projection % AND there are multiple source surveys identified in the thconfig file % ie Therion can not infer a unique title from the input data given. % This code allows you to define an output map title {caveName} if it happens to be empty - \edef\temp{\the\caveName} % caveName from Therion - \edef\nostring{} % empty string - \ifx\temp\nostring % test if caveName is empty + \edef\temp{\the\cavename} %%% cavename from Therion + \edef\nostring{} %%% empty string + \ifx\temp\nostring %%% test if cavename is empty % if empty - reassign caveName to describe selected maps as a group - \else % if not empty keep the value set by therion, or assign an override caveName here + reassign cavename to describe selected maps as a group + \else %%% if not empty keep the value set by therion, or assign an override cavename here \fi - \caveName={{caveName}, Plan 1:{Scale}} % Note Alex : Bug avec certains fichiers ? + \cavename={{caveName}, Plan 1:{Scale}} %%% Note Alex : Bug avec certains fichiers ? \newtoks\club \club={{club}} %\newtoks\thanksto \thanksto={{thanksto}} \newtoks\wpage \wpage={{wpage}} @@ -185,9 +187,10 @@ layout layout-Plan endcode endlayout -## fin de la définition du layout +############################################################################################### ##debut de la definition du layout "layout-Extended" +############################################################################################### layout layout-Extended ## Call the config settings (Layout config inside the config.thc file) copy drawingconfig @@ -300,24 +303,24 @@ layout layout-Extended ## Modification du Titre de la topo code tex-map - \legendwidth=15cm - \legendtextsize={\size[12]} - \legendtextheadersize={\size[28]} %%% Taille du titre - \legendtextsectionsize={\size[14]} %%% Taille du titre - %\legendtextcolor={\color[0 0 110]} %# RGB values 0--100 + \legendwidth=15cm %%% Largeur cartouche + \legendtextsize={\size[12]} %%% Police principale + \legendtextheadersize={\size[28]} %%% Taille du titre + \legendtextsectionsize={\size[14]} %%% Taille des sous titres + %\legendtextcolor={\color[0 0 110]} %%% RGB values 0--100 % Output map title as determined by Therion is stored in caveName, défini par la une Map. % It will be empty if there are multiple maps selected for any one projection % AND there are multiple source surveys identified in the thconfig file % ie Therion can not infer a unique title from the input data given. % This code allows you to define an output map title {caveName} if it happens to be empty - \edef\temp{\the\caveName} % caveName from Therion - \edef\nostring{} % empty string - \ifx\temp\nostring % test if caveName is empty + \edef\temp{\the\cavename} %%% cavename from Therion + \edef\nostring{} %%% empty string + \ifx\temp\nostring %%% test if cavename is empty % if empty - reassign caveName to describe selected maps as a group - \else % if not empty keep the value set by therion, or assign an override caveName here + reassign cavename to describe selected maps as a group + \else %%% if not empty keep the value set by therion, or assign an override cavename here \fi - \caveName={{caveName}, Coupe développée 1:{Scale}} % Note Alex : Bug avec certains fichiers ? + \cavename={{caveName}, Coupe développée 1:{Scale}} %%% Note Alex : Bug avec certains fichiers ? \newtoks\club \club={{club}} %\newtoks\thanksto \thanksto={{thanksto}} \newtoks\wpage \wpage={{wpage}} @@ -327,9 +330,11 @@ layout layout-Extended endcode endlayout -## Fin de la definition du Layout + +############################################################################################### ## Début de la définition du Layout "layout-kml" +############################################################################################### layout layout-kml ## Définition du système de projection du plan cs EPSG:2154 @@ -341,7 +346,9 @@ layout layout-kml color map-fg [0 0 100] endlayout +############################################################################################### ## Début de la définition du Layout "xviexport" +############################################################################################### layout xviexport # cs UTM32 ## echelle à laquelle on veut dessiner la topo @@ -358,29 +365,29 @@ endlayout # 3-EXPORT ############################################################################################### - ## Export des xvi pour le dessin si besoin +## Export des xvi pour le dessin si besoin # export map -proj plan -layout xviexport -fmt xvi -o Data/{fileName}-Plan.xvi # export map -proj extended -layout xviexport -fmt xvi -o Data/{fileName}-Extended.xvi - ## Selection des Maps à exporter +## Selection des Maps à exporter # select MP-{fileName}-Plan-tot@{fileName} # select MC-{fileName}-Extended-tot@{fileName} - ## Export des fichiers pdf, plan et coupe. - ## ATTENTION, la topo étant énorme, il faut mettre l'option ne traçant pas la centerline ! +## Export des fichiers pdf, plan et coupe. +## ATTENTION, la topo étant énorme, il faut mettre l'option ne traçant pas la centerline ! # export map -projection plan -fmt pdf -layout layout-Plan -o Outputs/{fileName}-Plan.pdf # export map -projection extended -fmt pdf -layout layout-Extended -o Outputs/{fileName}-Extended.pdf - ## Export du fichier 3d pour Loch +## Export du fichier 3d pour Loch export model -enable all -o Outputs/{fileName}.lox # export model -enable all -o Outputs/{fileName}.kml # export model -enable all -o Outputs/{fileName}.plt - ## Export des fichiers ESRI +## Export des fichiers ESRI # export map -proj plan -fmt esri -o Outputs/{fileName} # export model -fmt esri -o Outputs/SHP/therion -enc UTF-8 - ## Autres exports +## Autres exports # export map -proj plan -fmt kml -o Outputs/{fileName}.kml -layout layout-kml # export model -fmt kml -o Outputs/{fileName}-model.kml -enable all # export model -enable all -o Outputs/{fileName}-3D.kml diff --git a/Scripts/pyCreateTh/config.ini b/Scripts/pyCreateTh/config.ini index 7960f3b..67cf23e 100644 --- a/Scripts/pyCreateTh/config.ini +++ b/Scripts/pyCreateTh/config.ini @@ -6,7 +6,7 @@ Author = Alexandre Pont Copyright1 = # Copyright (C) ARSIP 2025 Copyright2 = # This work is under the Creative Commons Attribution-NonCommercial-NoDerivatives License: Copyright3 = # -Copyright_Short = Licence CC by-nc-nd : http://creativecommons.org/licenses/by-nc-nd/4.0/ +Copyright_Short = License CC by-nc-nd : http://creativecommons.org/licenses/by-nc-nd/4.0/ map_comment = Massif de la Pierre Saint Martin - Larra club = ARSIP thanksto = Merci à tout le monde diff --git a/Scripts/pyCreateTh/pyCreateTh.py b/Scripts/pyCreateTh/pyCreateTh.py index 2c44330..74bc22c 100644 --- a/Scripts/pyCreateTh/pyCreateTh.py +++ b/Scripts/pyCreateTh/pyCreateTh.py @@ -38,7 +38,7 @@ En cours : """ -Version = "2025.07.04" +Version = "2025.08.27" ################################################################################################# ################################################################################################# @@ -2900,7 +2900,7 @@ if __name__ == u'__main__': args.file = select_file_tk_window() # print(f"Selected file : {args.file}") - output_log = splitext(abspath(args.file))[0]+".log" + output_log = splitext(abspath(args.file))[0] + ".log" log = setup_logger(output_log, debug_log) # log.debug("Ceci est un message de debug") @@ -3107,8 +3107,6 @@ if __name__ == u'__main__': if os.path.isfile(destination_file): os.remove(destination_file) - shutil.move(output_log, destination_path) - - - - \ No newline at end of file + if not args.update : + shutil.move(output_log, destination_path) +